Commit e0393e97 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  As discussed on various channels, apply the following fix by lazy
  concensus for a platform specific bug fix.  Fixes PR 32730.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@153677 13f79535-47bb-0310-9956-ffa450edef68
parent 525c3fed

CHANGES

+4 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.54













  *) mod_win32: Ignore both PATH_INFO as well as PATH_TRANSLATED to avoid 













     hiccups from additional path information passed in non-utf-8 format.













     [Richard Donkin <rd9 donkin.org]



























Changes with Apache 2.0.53





























  *) Fix --with-apr=/usr and/or --with-apr-util=/usr.  PR 29740.

































STATUS



+0
−7






























Original line number
Diff line number
Diff line








@@ -134,13 +134,6 @@ PATCHES TO BACKPORT FROM TRUNK:













       PR: 32529















       +1: jorton





























    *) win32: Handle PATH_INFO -and- PATH_TRANSLATED as opaque byte-wise 













       data for cgi invocation, as handled for other variables originally 













       fixed in bug 9223, within modules/arch/win32/mod_win32.c.













       PR: 32730 Submitted by: Richard Donkin <rd9 donkin.org>













       svn rev 124556 + 151464













       +1: wrowe





























    *) several changes to improve logging of connection-oriented errors, including















       ap_log_cerror() API (needs minor bump in addition to changes below)















         http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.289&r2=1.291

































modules/arch/win32/mod_win32.c



+3
−1






























Original line number
Diff line number
Diff line








@@ -511,7 +511,9 @@ static apr_status_t ap_cgi_build_command(const char **cmd, const char ***argv,













                && (strncmp(elts[i].key, "HTTP_", 5) == 0















                 || strncmp(elts[i].key, "SERVER_", 7) == 0















                 || strncmp(elts[i].key, "REQUEST_", 8) == 0













                 || strcmp(elts[i].key, "QUERY_STRING") == 0)) {













                 || strcmp(elts[i].key, "QUERY_STRING") == 0













                 || strcmp(elts[i].key, "PATH_INFO") == 0













                 || strcmp(elts[i].key, "PATH_TRANSLATED") == 0)) {















            prep_string((const char**) &elts[i].val, r->pool);















        }















    }