summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--ext/libxml/libxml.c13
2 files changed, 11 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 59e80108ff..baa07085da 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,10 @@ PHP NEWS
. Fixed #69044 (discrepency between time and microtime). (krakjoe)
. Updated timelib to 2018.02. (Derick)
+- Libxml:
+ . Fixed bug #78279 (libxml_disable_entity_loader settings is shared between
+ requests (cgi-fcgi)). (Nikita)
+
- LiteSpeed:
. Updated to LiteSpeed SAPI V7.4.3 (increased response header count limit from
100 to 1000, added crash handler to cleanly shutdown PHP request, added
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index 3c1c8c3c84..b0b94b7c3a 100644
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -877,13 +877,14 @@ static PHP_RINIT_FUNCTION(libxml)
xmlSetGenericErrorFunc(NULL, php_libxml_error_handler);
xmlParserInputBufferCreateFilenameDefault(php_libxml_input_buffer_create_filename);
xmlOutputBufferCreateFilenameDefault(php_libxml_output_buffer_create_filename);
-
- /* Enable the entity loader by default. This ensures that
- * other threads/requests that might have disabled the loader
- * do not affect the current request.
- */
- LIBXML(entity_loader_disabled) = 0;
}
+
+ /* Enable the entity loader by default. This ensures that
+ * other threads/requests that might have disabled the loader
+ * do not affect the current request.
+ */
+ LIBXML(entity_loader_disabled) = 0;
+
return SUCCESS;
}