Commit ff444d9c authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Add -D DUMP_RUN_CFG option to dump some configuration items 

from the parsed (or default) config. This is useful for init scripts that
need to setup temporary directories and permissions, for example if those
temporary directories are located on a ram disk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180681 13f79535-47bb-0310-9956-ffa450edef68
parent 4e3b14c0

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ Changes with Apache 2.3.15 
     PR 51714. [Stefan Fritsch, Jim Jagielski, Ruediger Pluem, Eric Covener,

     <lowprio20 gmail.com>]



  *) core, unixd: Add -D DUMP_RUN_CFG option to dump some configuration items

     from the parsed (or default) config. This is useful for init scripts that

     need to setup temporary directories and permissions. [Stefan Fritsch]



  *) core, mod_actions, mod_asis: Downgrade error log messages which accompany

     a 404 request status from loglevel error to info. PR: 35768. [Stefan

     Fritsch]

include/ap_mmn.h

+2 −1
Original line number Diff line number Diff line
@@ -356,7 +356,8 @@ 
 *                         ap_realloc()

 * 20110724.9 (2.3.15-dev) add ap_varbuf_pdup() and ap_varbuf_regsub()

 * 20110724.10(2.3.15-dev) Export ap_max_mem_free

 * 20111009.0 (2.3.15-dev) Remove ap_proxy_removestr()

 * 20111009.0 (2.3.15-dev) Remove ap_proxy_removestr(),

 *                         add ap_unixd_config.group_name

 */



#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */

include/mpm_common.h

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ const char *ap_mpm_set_max_requests(cmd_parms *cmd, void *dummy, 
extern const char *ap_pid_fname;

const char *ap_mpm_set_pidfile(cmd_parms *cmd, void *dummy,

                               const char *arg);

void ap_mpm_dump_pidfile(apr_pool_t *p, apr_file_t *out);



/*

 * The directory that the server changes directory to dump core.

include/util_mutex.h

+2 −0
Original line number Diff line number Diff line
@@ -213,6 +213,8 @@ AP_DECLARE(apr_status_t) ap_proc_mutex_create(apr_proc_mutex_t **mutex, 
                                              apr_pool_t *pool,

                                              apr_int32_t options);



AP_CORE_DECLARE(void) ap_dump_mutexes(apr_pool_t *p, server_rec *s, apr_file_t *out);



#ifdef __cplusplus

}

#endif

modules/arch/unix/mod_unixd.c

+22 −1
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ unixd_set_group(cmd_parms *cmd, void *dummy, 
        return err;

    }



    ap_unixd_config.group_name = arg;

    ap_unixd_config.group_id = ap_gname2id(arg);



    return NULL;
@@ -289,6 +290,7 @@ unixd_pre_config(apr_pool_t *pconf, apr_pool_t *plog, 
    apr_finfo_t wrapper;

    ap_unixd_config.user_name = DEFAULT_USER;

    ap_unixd_config.user_id = ap_uname2id(DEFAULT_USER);

    ap_unixd_config.group_name = DEFAULT_GROUP;

    ap_unixd_config.group_id = ap_gname2id(DEFAULT_GROUP);



    ap_unixd_config.chroot_dir = NULL; /* none */
@@ -369,11 +371,30 @@ AP_DECLARE(int) ap_unixd_setup_child(void) 
    return 0;

}



static void unixd_dump_config(apr_pool_t *p, server_rec *s)

{

    apr_file_t *out = NULL;

    apr_uid_t uid = ap_unixd_config.user_id;

    apr_gid_t gid = ap_unixd_config.group_id;

    char *no_root = "";

    if (geteuid() != 0)

        no_root = " not_used";

    apr_file_open_stdout(&out, p);

    apr_file_printf(out, "User: name=\"%s\" id=%lu%s\n",

                    ap_unixd_config.user_name, (unsigned long)uid, no_root);

    apr_file_printf(out, "Group: name=\"%s\" id=%lu%s\n",

                    ap_unixd_config.group_name, (unsigned long)gid, no_root);

    if (ap_unixd_config.chroot_dir)

        apr_file_printf(out, "ChrootDir: \"%s\"%s\n",

                        ap_unixd_config.chroot_dir, no_root);

}



static void unixd_hooks(apr_pool_t *pool)

{

    ap_hook_pre_config(unixd_pre_config,

                       NULL, NULL, APR_HOOK_FIRST);



    ap_hook_test_config(unixd_dump_config,

                        NULL, NULL, APR_HOOK_FIRST);

    ap_hook_drop_privileges(unixd_drop_privileges,

                            NULL, NULL, APR_HOOK_MIDDLE);

}