From: Anatol Belski <ab@php.net>
Date: Thu, 1 Feb 2018 14:25:55 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.3RC1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88aeb104a2284d77ab7f7bb872611fd73c8308e6;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  [ci skip] Update NEWS
  Fix race conditions with Apache vhost vs. per dir config
---

88aeb104a2284d77ab7f7bb872611fd73c8308e6