core/util_script: relax alphanumeric filter of enviroment variable names

on Windows to allow '(' and ')' for passing PROGRAMFILES(X86) et.al.
unadulterated in 64 bit versions of Windows. PR 46751.

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

diff --git a/CHANGES b/CHANGES
index e58b23d7798ec2224f555ef4772e74ec7ff59968..1aaa79e5e27b963ec571d58f6d90094b6e179170 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) core/util_script: relax alphanumeric filter of enviroment variable names
+     on Windows to allow '(' and ')' for passing PROGRAMFILES(X86) et.al.
+     unadulterated in 64 bit versions of Windows. PR 46751.  
+     [John <john leineweb de>]
+
   *) mod_logio: Fix logging of %^FB (time to first byte) on the first request on
      an SSL connection.  PR 58454.  
      [Konstantin J. Chernov <k.j.chernov gmail.com>]

diff --git a/server/util_script.c b/server/util_script.c
index 14991cd0ff21ba1378f379309ef4f380c05a5c2a..4ec4bb58c0b4b017df7aaf7ee29ee133d7432362 100644 (file)
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -123,7 +123,11 @@ AP_DECLARE(char **) ap_create_environment(apr_pool_t *p, apr_table_t *t)
             *whack++ = '_';
         }
         while (*whack != '=') {
+#ifdef WIN32
+            if (!apr_isalnum(*whack) && *whack != '(' && *whack != ')') {
+#else
             if (!apr_isalnum(*whack)) {
+#endif
                 *whack = '_';
             }
             ++whack;