Skip to content

Commit 6dcabd9

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Wrap the normally lazy-initialized components in ZTS
2 parents 595b746 + f3cb9a8 commit 6dcabd9

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
@@ -932,11 +932,13 @@ PHP_LIBXML_API void php_libxml_initialize(void)
932932
ZEND_IGNORE_LEAKS_BEGIN();
933933

934934
xmlInitParser();
935-
#ifdef LIBXML_SCHEMAS_ENABLED
935+
#ifdef ZTS
936+
# ifdef LIBXML_SCHEMAS_ENABLED
936937
xmlSchemaInitTypes();
937-
#endif
938-
#ifdef LIBXML_RELAXNG_ENABLED
938+
# endif
939+
# ifdef LIBXML_RELAXNG_ENABLED
939940
xmlRelaxNGInitTypes();
941+
# endif
940942
#endif
941943
ZEND_IGNORE_LEAKS_END();
942944

0 commit comments

Comments
 (0)