delta/php-git.git/sapi, branch php-7.1.1 git.php.net: repository/php-src.git Merge branch 'PHP-7.0' into PHP-7.1 2017-01-05T13:02:43+00:00 Anatol Belski ab@php.net 2017-01-05T13:02:43+00:00 34c1040e2218dfb54649c2bbd0ef958a5826454e * PHP-7.0: Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0" 
* PHP-7.0:
  Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0" 2017-01-05T12:59:01+00:00 Anatol Belski ab@php.net 2017-01-05T12:59:01+00:00 57736cc937fc6dfdfb403293d7bf88b264e83e15 This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5. 
This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing
changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5.
Merge branch 'PHP-7.0' into PHP-7.1 2017-01-05T06:54:37+00:00 Joe Watkins krakjoe@php.net 2017-01-05T06:54:37+00:00 c370024c2c07eb047a77ed7f90a6cf921e0da6fb * PHP-7.0: Fix php-fpm.service.in 
* PHP-7.0:
  Fix php-fpm.service.in
Merge branch 'pull-request/1256' into PHP-7.0 2017-01-05T06:54:19+00:00 Joe Watkins krakjoe@php.net 2017-01-05T06:54:19+00:00 b037c434979fb0bd2ad1960b85a8aa2989fc09e6 * pull-request/1256: Fix php-fpm.service.in 
* pull-request/1256:
  Fix php-fpm.service.in
Update copyright headers to 2017 2017-01-04T17:23:42+00:00 Sammy Kaye Powers sammyk@sammykmedia.com 2017-01-04T17:23:42+00:00 dac6c639bb54e93fb24b82d25f74daaa12763512 






Update copyright headers to 2017
2017-01-04T17:14:55+00:00

Sammy Kaye Powers
sammyk@sammykmedia.com

2017-01-04T17:14:55+00:00

478f119ab9100dbd345a6db5287a0cfb5fda5bf3












Merge branch 'PHP-7.0' into PHP-7.1
2017-01-01T20:09:27+00:00

Nikita Popov
nikic@php.net

2017-01-01T20:09:27+00:00

a5027d43dde2f54cadce475aaba2ad09b2273fca












Flush stderr on win32 in cli_log_message
2017-01-01T20:09:02+00:00

Nikita Popov
nikic@php.net

2016-12-27T21:44:46+00:00

935b5cb11ed672c42b2a77e10be752702e474e7f

This allows us to unfork a bunch of tests for Windows.





This allows us to unfork a bunch of tests for Windows.







Merge branch 'PHP-7.0' into PHP-7.1
2016-12-29T07:56:26+00:00

Xinchen Hui
laruence@gmail.com

2016-12-29T07:56:26+00:00

716fa9c24d8acc0bf1284a93b06a1b2c841e5a9e

* PHP-7.0:
  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





* PHP-7.0:
  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







Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0
2016-12-29T07:46:47+00:00

Xinchen Hui
laruence@gmail.com

2016-12-29T07:46:47+00:00

a8931df672bb173ef81c10e4fc2a5de23789c935

* '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





* '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