diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/libxml/libxml.c | 6 |
2 files changed, 10 insertions, 0 deletions
@@ -23,6 +23,10 @@ PHP NEWS . Fixed bug #68571 (core dump when webserver close the socket). (redfoxli069 at gmail dot com, Laruence) +- Libxml: + . Fixed bug #64938 (libxml_disable_entity_loader setting is shared + between threads). (Martin Jansen) + - OpenSSL: . Fixed bug #55618 (use case-insensitive cert name matching). (Daniel Lowrey) diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index 4b7a36a227..5f0da89cd3 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -857,6 +857,12 @@ 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 ensure that + * other threads/requests that might have disable the loader + * do not affect the current request. + */ + LIBXML(entity_loader_disabled) = 0; } return SUCCESS; } |