mirror of
https://github.com/php/php-src.git
synced 2024-09-29 13:56:09 +00:00
Merge branch 'PHP-5.5'
* PHP-5.5: NEWS When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
This commit is contained in:
commit
bd77763889
@ -1098,7 +1098,7 @@ static void init_request_info(TSRMLS_D)
|
||||
|
||||
#define APACHE_PROXY_FCGI_PREFIX "proxy:fcgi://"
|
||||
/* Fix proxy URLs in SCRIPT_FILENAME generated by Apache mod_proxy_fcgi:
|
||||
* proxy:fcgi://localhost:9000/some-dir/info.php/test
|
||||
* proxy:fcgi://localhost:9000/some-dir/info.php/test?foo=bar
|
||||
* should be changed to:
|
||||
* /some-dir/info.php/test
|
||||
* See: http://bugs.php.net/bug.php?id=54152
|
||||
@ -1118,6 +1118,11 @@ static void init_request_info(TSRMLS_D)
|
||||
memmove(env_script_filename, p, strlen(p) + 1);
|
||||
apache_was_here = 1;
|
||||
}
|
||||
/* ignore query string if sent by Apache (RewriteRule) */
|
||||
p = strchr(env_script_filename, '?');
|
||||
if (p) {
|
||||
*p =0;
|
||||
}
|
||||
}
|
||||
|
||||
if (CGIG(fix_pathinfo)) {
|
||||
|
Loading…
Reference in New Issue
Block a user