com php-src: Merge branch 'PHP-5.5' into PHP-5.6: sapi/fpm/fpm/ fpm_main.c
| From: | Remi Collet | Date: | Mon, 15 Sep 2014 11:31:26 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: sapi/fpm/fpm/ fpm_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81647@lists.php.net to get a copy of this message | ||
Commit: 47bc380ecf2a222e7e0a41331f4b4a92a4c898ad
Author: Remi Collet <remi@php.net> Mon, 15 Sep 2014 13:31:26 +0200
Parents: 7f0f04e606a81be30a962fefa4ee40ae03e836a5 ad0b63cad4e372c6d063ec2d5df8782fd63de06a
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=47bc380ecf2a222e7e0a41331f4b4a92a4c898ad
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
Bugs:
https://bugs.php.net/65641
Changed paths:
MM sapi/fpm/fpm/fpm_main.c
Diff: