]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Mon, 15 Sep 2014 11:31:26 +0000 (13:31 +0200)
committerRemi Collet <remi@php.net>
Mon, 15 Sep 2014 11:31:26 +0000 (13:31 +0200)
commit47bc380ecf2a222e7e0a41331f4b4a92a4c898ad
tree8e99022163ec8d33df5c8d24d1f207a371f8f7a8
parent7f0f04e606a81be30a962fefa4ee40ae03e836a5
parentad0b63cad4e372c6d063ec2d5df8782fd63de06a
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
sapi/fpm/fpm/fpm_main.c