summaryrefslogtreecommitdiff
path: root/ext/libxml/libxml.c
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2017-11-28 18:00:46 +0100
committerRemi Collet <remi@php.net>2017-11-28 18:00:46 +0100
commitb1afa21502006f17563fb8b390ed73a883036343 (patch)
treef88e54836053ea51b66a24f3d312881380689cd5 /ext/libxml/libxml.c
parentac5a5bceea99c179069413198cb6d65738b75bc5 (diff)
parent7c043fff531f853a93c438aa4c05312e863163b0 (diff)
downloadphp-git-b1afa21502006f17563fb8b390ed73a883036343.tar.gz
Merge branch 'PHP-7.2'
* PHP-7.2: NEWS NEWS NEWS Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM)
Diffstat (limited to 'ext/libxml/libxml.c')
-rw-r--r--ext/libxml/libxml.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index 86a0e7eb27..031edf5bbd 100644
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -848,7 +848,6 @@ static PHP_MINIT_FUNCTION(libxml)
if (sapi_module.name) {
static const char * const supported_sapis[] = {
"cgi-fcgi",
- "fpm-fcgi",
"litespeed",
NULL
};