From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 17 Sep 2019 12:44:40 +0000 (+0300)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50527aa49b6c656a1d21ca2ae7c12166b876382d;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed CLI/CGI/FPM build, when they are built together with Apache SAPI
---

50527aa49b6c656a1d21ca2ae7c12166b876382d