Skip to content

Commit 608f211

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
2 parents 76783a9 + 9d141f9 commit 608f211

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

ext/libxml/libxml.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -871,13 +871,14 @@ static PHP_RINIT_FUNCTION(libxml)
871871
xmlSetGenericErrorFunc(NULL, php_libxml_error_handler);
872872
xmlParserInputBufferCreateFilenameDefault(php_libxml_input_buffer_create_filename);
873873
xmlOutputBufferCreateFilenameDefault(php_libxml_output_buffer_create_filename);
874-
875-
/* Enable the entity loader by default. This ensures that
876-
* other threads/requests that might have disabled the loader
877-
* do not affect the current request.
878-
*/
879-
LIBXML(entity_loader_disabled) = 0;
880874
}
875+
876+
/* Enable the entity loader by default. This ensures that
877+
* other threads/requests that might have disabled the loader
878+
* do not affect the current request.
879+
*/
880+
LIBXML(entity_loader_disabled) = 0;
881+
881882
return SUCCESS;
882883
}
883884

0 commit comments

Comments
 (0)