diff options
| author | Martin Jansen <martin@divbyzero.net> | 2015-01-22 20:58:15 +0100 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-02-01 00:08:35 -0800 |
| commit | de31324c221c1791b26350ba106cc26bad23ace9 (patch) | |
| tree | c458fba805801325a2e00c04ed97035ea7816a61 | |
| parent | e5e251b02309d046680e9190cfc688fab4e5670e (diff) | |
| download | php-git-de31324c221c1791b26350ba106cc26bad23ace9.tar.gz | |
Fix bug #64938: libxml_disable_entity_loader setting is shared between threads
The availability of entity loading is stored in a module global which
previously was only initialized in the GINIT constructor. This had the
effect that disabling the entity loader in one request caused
subsequent requests hitting the same Apache child process to also have
the loader disabled.
With this change the loader is explicitely enabled in the request init
phase.
| -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; } |