]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 30 Apr 2013 07:02:59 +0000 (09:02 +0200)
committerRemi Collet <remi@php.net>
Tue, 30 Apr 2013 07:02:59 +0000 (09:02 +0200)
* PHP-5.4:
  When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.


Trivial merge