Commit a73ab2b7 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Merge r1705217 from trunk: 

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.

Submitted by: gsmith
Reviewed by: jailletc36, sf, ylavic



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1737360 13f79535-47bb-0310-9956-ffa450edef68
parent 43fdb727

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,11 @@ 


Changes with Apache 2.4.20



  *) 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_http2: incrementing keepalives on each request started so that logging

     %k gives increasing numbers per master http2 connection. 

     New documented variables in env, usable in custom log formats: H2_PUSH,

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -113,13 +113,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) 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.

     trunk patch: http://svn.apache.org/r1705217

     2.4.x patch: trunk patch works

     +1: jailletc36, sf, ylavic



  *) Synch 2.4.x with trunk - merge some multi-line log messages in MPMs (+ one style 

     adjustment in mpm_netware.c, merged accidendly)

     Trunk patch: http://svn.apache.org/r1731929

server/util_script.c

+4 −0
Original line number Diff line number Diff line
@@ -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;