diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-02-01 00:03:26 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-02-01 00:03:26 -0800 |
| commit | d893814b58f94e1d18345cd3de3428a01d2be8e8 (patch) | |
| tree | f0b9225e98c6910dde09dae2f7520356126c6601 | |
| parent | 0be7d000b4bcabcba62fffabdfad64c5cd28017d (diff) | |
| parent | 3a39f3ad70e18497493f2bd1db204fff26695889 (diff) | |
| download | php-git-d893814b58f94e1d18345cd3de3428a01d2be8e8.tar.gz | |
Merge branch 'pull-request/1019'
* pull-request/1019:
Fix typos
Fix bug #64938: libxml_disable_entity_loader setting is shared between threads
| -rw-r--r-- | ext/libxml/libxml.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index 1ed6e97e8d..e8e84fc7a5 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -860,6 +860,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 ensures that + * other threads/requests that might have disabled the loader + * do not affect the current request. + */ + LIBXML(entity_loader_disabled) = 0; } return SUCCESS; } |