]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 769e17c 57736cc)
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Thu, 5 Jan 2017 13:02:43 +0000 (14:02 +0100)
committerAnatol Belski <ab@php.net>
Thu, 5 Jan 2017 13:02:43 +0000 (14:02 +0100)
* PHP-7.0:
  Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"

1  2 
sapi/apache2handler/sapi_apache2.c patch | diff1 | diff2 | blob | history

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