diff options
| author | Remi Collet <remi@php.net> | 2017-11-28 18:00:21 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-11-28 18:00:21 +0100 |
| commit | 9c8748316ad440588c09c285267132a5605be5e4 (patch) | |
| tree | 9031bb931c285af88cd8de8e901889541c2fe221 /ext/libxml | |
| parent | bd44a2cb05a88fcf0c2fa0ea948a81f4b7bdec79 (diff) | |
| parent | 2873316d1de9e82c5320bd363a5bf60ef3f25370 (diff) | |
| download | php-git-9c8748316ad440588c09c285267132a5605be5e4.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
NEWS
NEWS
Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM)
Diffstat (limited to 'ext/libxml')
| -rw-r--r-- | ext/libxml/libxml.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index d88860c4f3..bfc1224eaa 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 }; |