diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-02-01 00:08:46 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-02-01 00:09:04 -0800 |
| commit | 463611714c7a9a91ed190802ede60068593f8495 (patch) | |
| tree | abd8eee99cab7c95fd079ab52d9608724128490c | |
| parent | c5526291cedcb6b5c48d6f13cc7481f8eea9761a (diff) | |
| parent | de31324c221c1791b26350ba106cc26bad23ace9 (diff) | |
| download | php-git-463611714c7a9a91ed190802ede60068593f8495.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #64938: libxml_disable_entity_loader setting is shared between threads
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/libxml/libxml.c | 6 |
2 files changed, 10 insertions, 0 deletions
@@ -26,6 +26,10 @@ . 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) + - Opcache: . Fixed bug with try blocks being removed when extended_info opcode generation is turned on. (Laruence) diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index f8ccd82562..13028256eb 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -858,6 +858,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; } |