granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 769e17c 57736cc)

author	Anatol Belski <ab@php.net>
	Thu, 5 Jan 2017 13:02:43 +0000 (14:02 +0100)
committer	Anatol Belski <ab@php.net>
	Thu, 5 Jan 2017 13:02:43 +0000 (14:02 +0100)
commit	34c1040e2218dfb54649c2bbd0ef958a5826454e
tree	46af8c49ed6e1fb7fb24a0615dbe4fb577804d5f	tree \| snapshot
parent	769e17ce9bc6b93790237622020ac3c08ceb1e18	commit \| diff
parent	57736cc937fc6dfdfb403293d7bf88b264e83e15	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"

sapi/apache2handler/sapi_apache2.c

Unnamed repository; edit this file 'description' to name the repository.