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

This reverts commit a8931df672, reversing
changes made to f2f35a2b27.

(cherry picked from commit 57736cc937)

Something went wrong, so the revert didn't land in master.
Cherry-picking extra therefore.

2017-01-15 17:18:00 +01:00

..

apache2handler

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

2017-01-15 17:18:00 +01:00

cgi

Merge branch 'PHP-7.1'

2017-01-12 22:08:20 +01:00

cli

Merge branch 'PHP-7.1'

2017-01-13 06:45:31 +00:00

embed

Update copyright headers to 2017

2017-01-04 11:23:42 -06:00

fpm

Merge branch 'PHP-7.1'

2017-01-13 06:45:31 +00:00

litespeed

Merge branch 'PHP-7.1'

2017-01-08 21:05:36 +00:00

phpdbg

Update copyright headers to 2017

2017-01-04 11:23:42 -06:00

tests

Merge branch 'PHP-5.6'

2015-08-11 01:42:25 +02:00