Skip to content

Commit f601910

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: Wrap the normally lazy-initialized components in ZTS
2 parents 5a2084b + 6dcabd9 commit f601910

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

ext/libxml/libxml.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -931,11 +931,13 @@ PHP_LIBXML_API void php_libxml_initialize(void)
931931
ZEND_IGNORE_LEAKS_BEGIN();
932932

933933
xmlInitParser();
934-
#ifdef LIBXML_SCHEMAS_ENABLED
934+
#ifdef ZTS
935+
# ifdef LIBXML_SCHEMAS_ENABLED
935936
xmlSchemaInitTypes();
936-
#endif
937-
#ifdef LIBXML_RELAXNG_ENABLED
937+
# endif
938+
# ifdef LIBXML_RELAXNG_ENABLED
938939
xmlRelaxNGInitTypes();
940+
# endif
939941
#endif
940942
ZEND_IGNORE_LEAKS_END();
941943

0 commit comments

Comments
 (0)