View | Details | Raw Unified | Return to bug 40651
Collapse All | Expand All

(-)server/log.c (-4 / +4 lines)
Lines 226-232 Link Here
226
}
226
}
227
227
228
static int log_child(apr_pool_t *p, const char *progname,
228
static int log_child(apr_pool_t *p, const char *progname,
229
                     apr_file_t **fpin)
229
                     apr_file_t **fpin, int dummy_stderr)
230
{
230
{
231
    /* Child process code for 'ErrorLog "|..."';
231
    /* Child process code for 'ErrorLog "|..."';
232
     * may want a common framework for this, since I expect it will
232
     * may want a common framework for this, since I expect it will
Lines 242-248 Link Here
242
        && ((rc = apr_procattr_io_set(procattr,
242
        && ((rc = apr_procattr_io_set(procattr,
243
                                      APR_FULL_BLOCK,
243
                                      APR_FULL_BLOCK,
244
                                      APR_NO_PIPE,
244
                                      APR_NO_PIPE,
245
                                      APR_NO_PIPE)) == APR_SUCCESS)
245
                                      dummy_stderr ? APR_FULL_BLOCK : APR_NO_PIPE)) == APR_SUCCESS)
246
        && ((rc = apr_procattr_error_check_set(procattr, 1)) == APR_SUCCESS)
246
        && ((rc = apr_procattr_error_check_set(procattr, 1)) == APR_SUCCESS)
247
        && ((rc = apr_procattr_child_errfn_set(procattr, log_child_errfn)) == APR_SUCCESS)) {
247
        && ((rc = apr_procattr_child_errfn_set(procattr, log_child_errfn)) == APR_SUCCESS)) {
248
        char **args;
248
        char **args;
Lines 275-281 Link Here
275
        apr_file_t *dummy = NULL;
275
        apr_file_t *dummy = NULL;
276
276
277
        /* This starts a new process... */
277
        /* This starts a new process... */
278
        rc = log_child (p, s->error_fname + 1, &dummy);
278
        rc = log_child (p, s->error_fname + 1, &dummy, 1);
279
        if (rc != APR_SUCCESS) {
279
        if (rc != APR_SUCCESS) {
280
            ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL,
280
            ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL,
281
                         "Couldn't start ErrorLog process");
281
                         "Couldn't start ErrorLog process");
Lines 955-961 Link Here
955
    apr_file_t *dummy = NULL;
955
    apr_file_t *dummy = NULL;
956
    int rc;
956
    int rc;
957
957
958
    rc = log_child(p, program, &dummy);
958
    rc = log_child(p, program, &dummy, 0);
959
    if (rc != APR_SUCCESS) {
959
    if (rc != APR_SUCCESS) {
960
        ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL,
960
        ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL,
961
                     "Couldn't start piped log process");
961
                     "Couldn't start piped log process");

Return to bug 40651