clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #64938: libxml_disable_entity_loader setting is shared between threads

Browse Source 
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.
This commit is contained in:
Martin Jansen 2015-01-22 20:58:15 +01:00
parent 1010b0ea4f
commit c1eb87ab1a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/libxml/libxml.c
View File

@ -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 ensure that
* other threads/requests that might have disable the loader
* do not affect the current request.
*/
LIBXML(entity_loader_disabled) = 0;
}
return SUCCESS;
}