diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-12-29 15:46:47 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-12-29 15:46:47 +0800 |
| commit | a8931df672bb173ef81c10e4fc2a5de23789c935 (patch) | |
| tree | a93f9e90aa292cbab3110cc7379385c5c6933e37 /ext/json/php_json_parser.h | |
| parent | f2f35a2b27d0074ab015b8a37d6563eec74147d5 (diff) | |
| parent | 587497e3a9f5d74442b35ad9d0bf5f67be142edc (diff) | |
| download | php-git-a8931df672bb173ef81c10e4fc2a5de23789c935.tar.gz | |
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
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions