Joe Watkins 2e82ed9b73 Merge branch 'PHP-7.0' into PHP-7.1 ...

* PHP-7.0:
  Fixed bug 74913 redirecting incorrect include <sys/poll.h>

2017-07-17 06:51:47 +01:00

..

apache2handler

Merge branch 'PHP-7.0' into PHP-7.1

2017-03-28 13:13:24 +02: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-06-12 17:21:35 +08: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-05-09 11:01:52 +08:00

litespeed

Merge branch 'PHP-7.0' into PHP-7.1

2017-06-27 23:16:25 -04:00

phpdbg

Merge branch 'PHP-7.0' into PHP-7.1

2017-07-17 06:51:47 +01:00

tests

Merge branch 'PHP-5.6'

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