]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Thu, 5 Jan 2017 13:04:30 +0000 (14:04 +0100)
committerAnatol Belski <ab@php.net>
Thu, 5 Jan 2017 13:04:30 +0000 (14:04 +0100)
* PHP-7.1:
  Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"

1  2 
sapi/apache2handler/sapi_apache2.c

Simple merge