Xinchen Hui a8931df672 Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0 ...

* 'bugfix_timeout_61471' of https://github.com/axot/php-src:
  define php_ap_map_http_request_error function for older httpd only
  add old versions of httpd support
  typo fixed
  bug fixed #61471 in apache2handler

2016-12-29 15:46:47 +08:00

..

apache2handler

define php_ap_map_http_request_error function for older httpd only

2016-12-29 16:07:05 +09:00

cgi

backport 59444347 and 3d7343f6

2016-09-08 17:46:53 +02:00

cli

Makes the sapi web server and curl tests more reliable

2016-12-27 21:52:05 +01:00

embed

Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE

2016-03-03 16:50:01 +01:00

fpm

Merge branch 'PHP-5.6' into PHP-7.0

2016-12-03 14:18:00 +01:00

litespeed

Merge branch 'PHP-5.6' into PHP-7.0

2016-09-19 10:49:26 -04:00

phpdbg

Fixed bug #73704 (phpdbg shows the wrong line in files with shebang)

2016-12-22 00:39:24 +01:00

tests

Merge branch 'PHP-5.6'

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