httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r965679 - in /httpd/httpd/trunk: CHANGES server/util_script.c
Date Mon, 19 Jul 2010 23:40:26 GMT
Author: niq
Date: Mon Jul 19 23:40:25 2010
New Revision: 965679

URL: http://svn.apache.org/viewvc?rev=965679&view=rev
Log:
Enable SetEnv to set PATH
PR 43906

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/util_script.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=965679&r1=965678&r2=965679&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Jul 19 23:40:25 2010
@@ -29,6 +29,9 @@ Changes with Apache 2.3.7
   *) mod_include: recognise "text/html; parameters" as text/html
      PR 49616 [Andrey Chernov <ache nagual.pp.ru>]
 
+  *) CGI vars: allow PATH to be set by SetEnv, consistent with LD_LIBRARY_PATH
+     PR 43906 [Nick Kew]
+
 Changes with Apache 2.3.6
 
   *) SECURITY: CVE-2009-3555 (cve.mitre.org)

Modified: httpd/httpd/trunk/server/util_script.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_script.c?rev=965679&r1=965678&r2=965679&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_script.c (original)
+++ httpd/httpd/trunk/server/util_script.c Mon Jul 19 23:40:25 2010
@@ -182,7 +182,11 @@ AP_DECLARE(void) ap_add_common_vars(requ
         }
     }
 
-    if (!(env_path = getenv("PATH"))) {
+    env_path = apr_table_get(r->subprocess_env, "PATH");
+    if (env_path == NULL) {
+        env_path = getenv("PATH");
+    }
+    if (env_path == NULL) {
         env_path = DEFAULT_PATH;
     }
     apr_table_addn(e, "PATH", apr_pstrdup(r->pool, env_path));



Mime
View raw message