Pass environment variables through to piped loggers, resolving

a regression since 1.3.

Submitted by:	  Ken Coar, Jeff Trawick

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

diff --git a/CHANGES b/CHANGES
index 0d430eb170aa7af2db97b2443b00831b50d8d04e..1e62eb5090211b537ba85d8035ab1a5e4b050475 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Pass environment variables through to piped loggers, resolving
+     a regression since 1.3.  [Ken Coar, Jeff Trawick]
+
   *) Enable the option to support anonymous shared memory in mod_ldap.
      This makes the cache work on Linux again. [Graham Leggett]
 

diff --git a/server/log.c b/server/log.c
index fcef37aa643ed44bfb03262d8662fe8055edee57..301b8fcdccb0d69c234621dcd653935ac4662eed 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -197,6 +197,8 @@ static int log_child(apr_pool_t *p, const char *progname,
     apr_proc_t *procnew;
 
     if (((rc = apr_procattr_create(&procattr, p)) == APR_SUCCESS)
+        && ((rc == apr_procattr_cmdtype_set(procattr,
+                                            APR_PROGRAM_ENV)) == APR_SUCCESS)
         && ((rc = apr_procattr_io_set(procattr,
                                       APR_FULL_BLOCK,
                                       APR_NO_PIPE,
@@ -722,6 +724,8 @@ static int piped_log_spawn(piped_log *pl)
     apr_status_t status;
 
     if (((status = apr_procattr_create(&procattr, pl->p)) != APR_SUCCESS) ||
+        ((status = apr_procattr_cmdtype_set(procattr,
+                                            APR_PROGRAM_ENV)) != APR_SUCCESS) || 
         ((status = apr_procattr_child_in_set(procattr,
                                              ap_piped_log_read_fd(pl),
                                              ap_piped_log_write_fd(pl)))