Commit f7e9b9f0 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Well the wrappers work out well... nice to be able to put off committing
  these API changes until the evening ;)


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

modules/cache/mod_file_cache.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static void cache_the_file(cmd_parms *cmd, const char *filename, int mmap) 
                     "mod_file_cache: unable to open(%s, O_RDONLY), skipping", fspec);

	return;

    }

    apr_file_set_inherit(fd);

    apr_file_inherit_set(fd);



    /* WooHoo, we have a file to put in the cache */

    new_file = apr_pcalloc(cmd->pool, sizeof(a_file));

modules/loggers/mod_log_config.c

+1 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ static config_log_state *open_config_log(server_rec *s, apr_pool_t *p, 
                         "could not open transfer log file %s.", fname);

            exit(1);

        }

        apr_file_set_inherit(cls->log_fd);

        apr_file_inherit_set(cls->log_fd);

    }

#ifdef BUFFERED_LOGS

    cls->outcnt = 0;

modules/mappers/mod_rewrite.c

+1 −1
Original line number Diff line number Diff line
@@ -3183,7 +3183,7 @@ static void open_rewritelog(server_rec *s, apr_pool_t *p) 
                         "file %s", fname);

            exit(1);

        }

        apr_file_set_inherit(conf->rewritelogfp);

        apr_file_inherit_set(conf->rewritelogfp);

    }

    return;

}

server/log.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static void open_error_log(server_rec *s, apr_pool_t *p) 
            exit(1);

        }



        apr_file_set_inherit(s->error_log);

        apr_file_inherit_set(s->error_log);

    }

}

server/mpm_common.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ void ap_wait_or_timeout(apr_exit_why_e *status, int *exitcode, apr_proc_t *ret, 
int ap_process_child_status(apr_proc_t *pid, apr_exit_why_e why, int status)

{

    int signum = status;

    const char *sigdesc = apr_signal_get_description(signum);

    const char *sigdesc = apr_signal_description_get(signum);



    /* Child died... if it died due to a fatal error,

     * we should simply bail out.  The caller needs to