Skip to content

Commit 4a91f66

Browse files
committed
Fixed bug #78279
Even if we don't initialize the callback on every request, we should still reset our globals to default values...
1 parent 22ed362 commit 4a91f66

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ PHP NEWS
2020
- Date:
2121
. Fixed #69044 (discrepency between time and microtime). (krakjoe)
2222

23+
- Libxml:
24+
. Fixed bug #78279 (libxml_disable_entity_loader settings is shared between
25+
requests (cgi-fcgi)). (Nikita)
26+
2327
- LiteSpeed:
2428
. Updated to LiteSpeed SAPI V7.4.3 (increased response header count limit from
2529
100 to 1000, added crash handler to cleanly shutdown PHP request, added

ext/libxml/libxml.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -879,13 +879,14 @@ static PHP_RINIT_FUNCTION(libxml)
879879
xmlSetGenericErrorFunc(NULL, php_libxml_error_handler);
880880
xmlParserInputBufferCreateFilenameDefault(php_libxml_input_buffer_create_filename);
881881
xmlOutputBufferCreateFilenameDefault(php_libxml_output_buffer_create_filename);
882-
883-
/* Enable the entity loader by default. This ensures that
884-
* other threads/requests that might have disabled the loader
885-
* do not affect the current request.
886-
*/
887-
LIBXML(entity_loader_disabled) = 0;
888882
}
883+
884+
/* Enable the entity loader by default. This ensures that
885+
* other threads/requests that might have disabled the loader
886+
* do not affect the current request.
887+
*/
888+
LIBXML(entity_loader_disabled) = 0;
889+
889890
return SUCCESS;
890891
}
891892

0 commit comments

Comments
 (0)