Commit a845a9f2 authored by Bill Stoddard's avatar Bill Stoddard
Browse files

Do not start piped log processes during the config file 

preflight.  This change also circumvents a problem on
Windows where the rotatelog processes created during preflight
was not getting cleaned up properly.


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

CHANGES

+6 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.18-dev

  *) Do not start piped log processes during the config file 

     preflight.  This change also circumvents a problem on 

     Windows where the rotatelog processes created during preflight

     was not getting cleaned up properly.

     [Bill Stoddard]



  *) add "Request Phase Participation" info to mod_info

     [Doug MacEachern]

modules/loggers/mod_log_config.c

+12 −0
Original line number Diff line number Diff line
@@ -1013,6 +1013,18 @@ static config_log_state *open_config_log(server_rec *s, apr_pool_t *p, 
                                         apr_array_header_t *default_format)

{

    apr_status_t status;

    void *data;

    const char *userdata_key = "open_config_log";



    /* Skip opening the log the first time through. It's really

     * good to avoid starting the piped log process during preflight.

     */

    apr_pool_userdata_get(&data, userdata_key, s->process->pool);

    if (!data) {

        apr_pool_userdata_set((const void *)1, userdata_key,

                         apr_pool_cleanup_null, s->process->pool);

        return cls;

    }



    if (cls->log_fd != NULL) {

        return cls;             /* virtual config shared w/main server */