diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-12 16:29:55 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-12 16:30:33 +0200 |
| commit | 9d141f98890847f6b239a5ce7f02801912202525 (patch) | |
| tree | d8c45cf2be8156a7a87f52fec6a2387323a58326 | |
| parent | fa65f5ecf5d0539f15a3048bf8c073f4c262baf1 (diff) | |
| parent | 4a91f66b8f528e6d09e2c7fa04d87e2dc981bd34 (diff) | |
| download | php-git-9d141f98890847f6b239a5ce7f02801912202525.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/libxml/libxml.c | 13 |
2 files changed, 11 insertions, 6 deletions
@@ -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; } |