diff options
| author | Remi Collet <remi@php.net> | 2017-11-28 17:59:36 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-11-28 17:59:36 +0100 |
| commit | 40f2668230378de89e185ef82c01df695a0fbd0e (patch) | |
| tree | 309f3278fe975730cfa3113e271898c8d1c3c1e0 | |
| parent | 2b071028973782ed87e7038e56d47e9897be804a (diff) | |
| parent | 26656684eacfaf386fcecc461ab49b9b6086c635 (diff) | |
| download | php-git-40f2668230378de89e185ef82c01df695a0fbd0e.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
NEWS
Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM)
| -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 a029b9f477..da30004f36 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 }; |