From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 29 Dec 2016 07:56:38 +0000 (+0800)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~733
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40727d7ce90cbd0a878216c2f666660565934bdc;p=php

Merge branch 'PHP-7.1'

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

40727d7ce90cbd0a878216c2f666660565934bdc