]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d82bd36 a8931df)
Merge branch 'PHP-7.0' into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Thu, 29 Dec 2016 07:56:26 +0000 (15:56 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 29 Dec 2016 07:56:26 +0000 (15:56 +0800)
* 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

1  2 
sapi/apache2handler/sapi_apache2.c patch | diff1 | diff2 | blob | history

diff --cc sapi/apache2handler/sapi_apache2.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.