]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit86aa8d25236b71830c35901646041f627519e9aa
treeec0881f1d4887e4de8901f06ae2a23d2bdd3c476tree | snapshot
parent91351d4bf55d9937186739e528330e287d7bbc84commit | diff
parent844e2e81f56fca1f49c73df4e15866cd1ba37f30commit | diff
Merge branch 'PHP-5.6'

* 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"
sapi/fpm/fpm/fpm_main.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.