From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 29 Dec 2016 07:56:26 +0000 (+0800)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=716fa9c24d8acc0bf1284a93b06a1b2c841e5a9e;p=php

Merge branch 'PHP-7.0' into PHP-7.1

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

716fa9c24d8acc0bf1284a93b06a1b2c841e5a9e