]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91351d4 844e2e8)
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Tue, 12 Aug 2014 12:48:48 +0000 (14:48 +0200)
committerFerenc Kovacs <tyrael@php.net>
Tue, 12 Aug 2014 12:48:48 +0000 (14:48 +0200)
* PHP-5.6:
  NEWS entry for e6d93a1 / d73d44c
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
  Revert "Merge branch 'pull-request/694' into PHP-5.6"

1  2 
sapi/fpm/fpm/fpm_main.c patch | diff1 | diff2 | blob | history

diff --cc sapi/fpm/fpm/fpm_main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.