spl-shared.patch

   1 diff -urNp -x '*.orig' php-7.1.33.org/ext/pdo/pdo.c php-7.1.33/ext/pdo/pdo.c
   2 --- php-7.1.33.org/ext/pdo/pdo.c        2019-10-22 18:59:48.000000000 +0200
   3 +++ php-7.1.33/ext/pdo/pdo.c    2021-08-23 23:46:39.634688772 +0200
   4 @@ -117,7 +117,9 @@ const zend_function_entry pdo_functions[
   5
   6  /* {{{ pdo_functions[] */
   7  static const zend_module_dep pdo_deps[] = {
   8 +#ifdef HAVE_SPL && !COMPILE_DL_SPL
   9         ZEND_MOD_REQUIRED("spl")
  10 +#endif
  11         ZEND_MOD_END
  12  };
  13  /* }}} */
  14 diff -urNp -x '*.orig' php-7.1.33.org/ext/phar/Makefile.frag php-7.1.33/ext/phar/Makefile.frag
  15 --- php-7.1.33.org/ext/phar/Makefile.frag       2019-10-22 18:59:55.000000000 +0200
  16 +++ php-7.1.33/ext/phar/Makefile.frag   2021-08-23 23:46:39.634688772 +0200
  17 @@ -14,7 +14,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
  18                 $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
  19                 if test "x$(PHP_MODULES)" != "x"; then \
  20                 $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
  21 -               for i in bz2 zlib phar; do \
  22 +               for i in pcre spl bz2 zlib phar; do \
  23                         if test -f "$(top_builddir)/modules/$$i.la"; then \
  24                                 . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
  25                         fi; \
  26 diff -urNp -x '*.orig' php-7.1.33.org/ext/spl/config.m4 php-7.1.33/ext/spl/config.m4
  27 --- php-7.1.33.org/ext/spl/config.m4    2019-10-22 18:59:50.000000000 +0200
  28 +++ php-7.1.33/ext/spl/config.m4        2021-08-23 23:46:39.634688772 +0200
  29 @@ -2,6 +2,6 @@ dnl $Id$
  30  dnl config.m4 for extension SPL
  31
  32    AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support])
  33 -  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)
  34 +  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)
  35    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])
  36    PHP_ADD_EXTENSION_DEP(spl, pcre, true)
  37 diff -urNp -x '*.orig' php-7.1.33.org/ext/spl/spl_iterators.c php-7.1.33/ext/spl/spl_iterators.c
  38 --- php-7.1.33.org/ext/spl/spl_iterators.c      2019-10-22 18:59:51.000000000 +0200
  39 +++ php-7.1.33/ext/spl/spl_iterators.c  2021-08-23 23:46:39.634688772 +0200
  40 @@ -60,7 +60,13 @@ PHPAPI zend_class_entry *spl_ce_EmptyIte
  41  PHPAPI zend_class_entry *spl_ce_AppendIterator;
  42  PHPAPI zend_class_entry *spl_ce_RegexIterator;
  43  PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
  44 +#if COMPILE_DL_SPL
  45 +#undef spl_ce_Countable
  46 +zend_class_entry *spl_ce_Countable; // real instance
  47 +extern PHPAPI zend_class_entry *spl_ce_Countable_p; // external one
  48 +#else
  49  PHPAPI zend_class_entry *spl_ce_Countable;
  50 +#endif
  51  PHPAPI zend_class_entry *spl_ce_RecursiveTreeIterator;
  52
  53  ZEND_BEGIN_ARG_INFO(arginfo_recursive_it_void, 0)
  54 @@ -3804,6 +3810,10 @@ PHP_MINIT_FUNCTION(spl_iterators)
  55         REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator);
  56         REGISTER_SPL_ITERATOR(EmptyIterator);
  57
  58 +#if COMPILE_DL_SPL
  59 +       spl_ce_Countable_p = spl_ce_Countable;
  60 +#endif
  61 +
  62         REGISTER_SPL_SUB_CLASS_EX(RecursiveTreeIterator, RecursiveIteratorIterator, spl_RecursiveTreeIterator_new, spl_funcs_RecursiveTreeIterator);
  63         REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_CURRENT",      RTIT_BYPASS_CURRENT);
  64         REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_KEY",          RTIT_BYPASS_KEY);
  65 diff -urNp -x '*.orig' php-7.1.33.org/ext/spl/spl_iterators.h php-7.1.33/ext/spl/spl_iterators.h
  66 --- php-7.1.33.org/ext/spl/spl_iterators.h      2019-10-22 18:59:51.000000000 +0200
  67 +++ php-7.1.33/ext/spl/spl_iterators.h  2021-08-23 23:46:39.634688772 +0200
  68 @@ -51,7 +51,12 @@ extern PHPAPI zend_class_entry *spl_ce_E
  69  extern PHPAPI zend_class_entry *spl_ce_AppendIterator;
  70  extern PHPAPI zend_class_entry *spl_ce_RegexIterator;
  71  extern PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
  72 +#if COMPILE_DL_SPL
  73 +#define spl_ce_Countable spl_ce_Countable_p
  74 +extern PHPAPI zend_class_entry *spl_ce_Countable_p;
  75 +#else
  76  extern PHPAPI zend_class_entry *spl_ce_Countable;
  77 +#endif
  78  extern PHPAPI zend_class_entry *spl_ce_CallbackFilterIterator;
  79  extern PHPAPI zend_class_entry *spl_ce_RecursiveCallbackFilterIterator;
  80
  81 diff -urNp -x '*.orig' php-7.1.33.org/ext/standard/array.c php-7.1.33/ext/standard/array.c
  82 --- php-7.1.33.org/ext/standard/array.c 2019-10-22 18:59:57.000000000 +0200
  83 +++ php-7.1.33/ext/standard/array.c     2021-08-23 23:46:39.634688772 +0200
  84 @@ -50,6 +50,10 @@
  85  #include "zend_bitset.h"
  86  #include "ext/spl/spl_array.h"
  87
  88 +#if COMPILE_DL_SPL
  89 +PHPAPI zend_class_entry *spl_ce_Countable_p = NULL; // external one
  90 +#endif
  91 +
  92  /* {{{ defines */
  93  #define EXTR_OVERWRITE                 0
  94  #define EXTR_SKIP                              1