diff -urNp -x '*.orig' php-7.0.33.org/ext/pdo/pdo.c php-7.0.33/ext/pdo/pdo.c --- php-7.0.33.org/ext/pdo/pdo.c 2018-12-04 18:23:01.000000000 +0100 +++ php-7.0.33/ext/pdo/pdo.c 2021-08-23 23:36:38.248768024 +0200 @@ -130,7 +130,7 @@ const zend_function_entry pdo_functions[ /* {{{ pdo_functions[] */ #if ZEND_MODULE_API_NO >= 20050922 static const zend_module_dep pdo_deps[] = { -#ifdef HAVE_SPL +#ifdef HAVE_SPL && !COMPILE_DL_SPL ZEND_MOD_REQUIRED("spl") #endif ZEND_MOD_END diff -urNp -x '*.orig' php-7.0.33.org/ext/phar/Makefile.frag php-7.0.33/ext/phar/Makefile.frag --- php-7.0.33.org/ext/phar/Makefile.frag 2018-12-04 18:22:51.000000000 +0100 +++ php-7.0.33/ext/phar/Makefile.frag 2021-08-23 23:36:38.248768024 +0200 @@ -9,7 +9,7 @@ PHP_PHARCMD_EXECUTABLE = ` \ $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ if test "x$(PHP_MODULES)" != "x"; then \ $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \ - for i in bz2 zlib phar; do \ + for i in pcre spl bz2 zlib phar; do \ if test -f "$(top_builddir)/modules/$$i.la"; then \ . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ fi; \ diff -urNp -x '*.orig' php-7.0.33.org/ext/spl/config.m4 php-7.0.33/ext/spl/config.m4 --- php-7.0.33.org/ext/spl/config.m4 2018-12-04 18:22:57.000000000 +0100 +++ php-7.0.33/ext/spl/config.m4 2021-08-23 23:36:38.245434647 +0200 @@ -2,6 +2,6 @@ dnl $Id$ dnl config.m4 for extension SPL AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) - PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h]) PHP_ADD_EXTENSION_DEP(spl, pcre, true) diff -urNp -x '*.orig' php-7.0.33.org/ext/spl/spl_iterators.c php-7.0.33/ext/spl/spl_iterators.c --- php-7.0.33.org/ext/spl/spl_iterators.c 2018-12-04 18:22:57.000000000 +0100 +++ php-7.0.33/ext/spl/spl_iterators.c 2021-08-23 23:36:38.245434647 +0200 @@ -60,7 +60,13 @@ PHPAPI zend_class_entry *spl_ce_EmptyIte PHPAPI zend_class_entry *spl_ce_AppendIterator; PHPAPI zend_class_entry *spl_ce_RegexIterator; PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator; +#if COMPILE_DL_SPL +#undef spl_ce_Countable +zend_class_entry *spl_ce_Countable; // real instance +extern PHPAPI zend_class_entry *spl_ce_Countable_p; // external one +#else PHPAPI zend_class_entry *spl_ce_Countable; +#endif PHPAPI zend_class_entry *spl_ce_RecursiveTreeIterator; ZEND_BEGIN_ARG_INFO(arginfo_recursive_it_void, 0) @@ -3791,6 +3797,10 @@ PHP_MINIT_FUNCTION(spl_iterators) REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator); REGISTER_SPL_ITERATOR(EmptyIterator); +#if COMPILE_DL_SPL + spl_ce_Countable_p = spl_ce_Countable; +#endif + REGISTER_SPL_SUB_CLASS_EX(RecursiveTreeIterator, RecursiveIteratorIterator, spl_RecursiveTreeIterator_new, spl_funcs_RecursiveTreeIterator); REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_CURRENT", RTIT_BYPASS_CURRENT); REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_KEY", RTIT_BYPASS_KEY); diff -urNp -x '*.orig' php-7.0.33.org/ext/spl/spl_iterators.h php-7.0.33/ext/spl/spl_iterators.h --- php-7.0.33.org/ext/spl/spl_iterators.h 2018-12-04 18:22:57.000000000 +0100 +++ php-7.0.33/ext/spl/spl_iterators.h 2021-08-23 23:36:38.245434647 +0200 @@ -51,7 +51,12 @@ extern PHPAPI zend_class_entry *spl_ce_E extern PHPAPI zend_class_entry *spl_ce_AppendIterator; extern PHPAPI zend_class_entry *spl_ce_RegexIterator; extern PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator; +#if COMPILE_DL_SPL +#define spl_ce_Countable spl_ce_Countable_p +extern PHPAPI zend_class_entry *spl_ce_Countable_p; +#else extern PHPAPI zend_class_entry *spl_ce_Countable; +#endif extern PHPAPI zend_class_entry *spl_ce_CallbackFilterIterator; extern PHPAPI zend_class_entry *spl_ce_RecursiveCallbackFilterIterator; diff -urNp -x '*.orig' php-7.0.33.org/ext/standard/array.c php-7.0.33/ext/standard/array.c --- php-7.0.33.org/ext/standard/array.c 2018-12-04 18:22:44.000000000 +0100 +++ php-7.0.33/ext/standard/array.c 2021-08-23 23:36:38.248768024 +0200 @@ -50,6 +50,9 @@ #ifdef HAVE_SPL #include "ext/spl/spl_array.h" #endif +#if COMPILE_DL_SPL +PHPAPI zend_class_entry *spl_ce_Countable_p = NULL; // external one +#endif /* {{{ defines */ #define EXTR_OVERWRITE 0