php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  Fix not thread safe RelaxNG invocations in ZTS builds
  Fix not thread safe xmlSchemaParse calls in ZTS builds
This commit is contained in:
Niels Dossche
2025-10-14 22:01:04 +02:00
parent f60134a3c9 595b746c2c
commit 5a2084bc16
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/libxml/libxml.c
View File

@@ -40,6 +40,7 @@
#ifdef LIBXML_SCHEMAS_ENABLED
#include <libxml/relaxng.h>
#include <libxml/xmlschemas.h>
#include <libxml/xmlschemastypes.h>
#endif
#include "php_libxml.h"
@@ -928,7 +929,14 @@ PHP_LIBXML_API void php_libxml_initialize(void)
if (!php_libxml_initialized) {
/* we should be the only one's to ever init!! */
ZEND_IGNORE_LEAKS_BEGIN();
xmlInitParser();
#ifdef LIBXML_SCHEMAS_ENABLED
xmlSchemaInitTypes();
#endif
#ifdef LIBXML_RELAXNG_ENABLED
xmlRelaxNGInitTypes();
#endif
ZEND_IGNORE_LEAKS_END();
php_libxml_default_entity_loader = xmlGetExternalEntityLoader();