Joe Watkins 19363de12f Merge branch 'PHP-7.0' into PHP-7.1 ...

* PHP-7.0:
  Increase wait time for tests involving sockets to improve Travis relability

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

..

apache2handler

Merge branch 'PHP-7.0' into PHP-7.1

2017-01-05 14:02:43 +01:00

cgi

Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo()

2017-01-12 22:06:03 +01:00

cli

Merge branch 'PHP-7.0' into PHP-7.1

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

embed

Update copyright headers to 2017

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

fpm

Merge branch 'PHP-7.0' into PHP-7.1

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

litespeed

Merge branch 'PHP-7.0' into PHP-7.1

2017-01-08 21:05:24 +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