diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-12 16:29:18 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-12 16:29:18 +0200 |
| commit | 4a91f66b8f528e6d09e2c7fa04d87e2dc981bd34 (patch) | |
| tree | cbfe27f2b453e95a1b8e45089712dc85d82e0bad | |
| parent | 22ed362810c1b3a5ecb54ebd1d50d804c7fc3159 (diff) | |
| download | php-git-4a91f66b8f528e6d09e2c7fa04d87e2dc981bd34.tar.gz | |
Fixed bug #78279
Even if we don't initialize the callback on every request, we
should still reset our globals to default values...
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/libxml/libxml.c | 13 |
2 files changed, 11 insertions, 6 deletions
@@ -20,6 +20,10 @@ PHP NEWS - Date: . Fixed #69044 (discrepency between time and microtime). (krakjoe) +- 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 068b3a248d..c871cb89bd 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -879,13 +879,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; } |