]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Sun, 29 Jun 2014 23:03:29 +0000 (01:03 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sun, 29 Jun 2014 23:03:29 +0000 (01:03 +0200)
commitc73e1f80f55cfdf9204e9d6e9e462284f5412a82
treee064097751b2d89d3785e08b2167ee9eecf84128
parentee6bab61ebee3dad68a10ad5c5167636c03da599
parent19e5852ad8dd38480f008e82ae2dbbdd9e0ac11c
Merge branch 'PHP-5.6'

* PHP-5.6:
  adding NEWS entry for the fix for bug #65641
  Fix SetHandler proxy:fcgi:// incompatibilities
sapi/fpm/fpm/fpm_main.c