]> git.pld-linux.org Git - packages/php.git/commitdiff
This commit was manufactured by cvs2git to create branch 'PHP_5_2'.
authorcvs2git <feedback@pld-linux.org>
Sun, 13 Jun 2010 21:33:31 +0000 (21:33 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Cherrypick from master 2009-10-18 17:04:40 UTC Elan Ruusamäe <glen@pld-linux.org> '- pdo R spl; rel 7':
    extension-shared-optional-dep.patch -> 1.1
    php-branch.sh -> 1.5
    php-silent-session-cleanup.patch -> 1.1
    spl-shared.patch -> 1.3
Cherrypick from master 2010-06-07 19:36:29 UTC Elan Ruusamäe <glen@pld-linux.org> '- load pcre from system extension dir':
    fix-test-run.patch -> 1.6
    skip-tests.sh -> 1.4
Cherrypick from master 2009-08-18 10:22:20 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- rel 10; fix build with autoconf 2.64':
    php-m4-divert.patch -> 1.1
Cherrypick from master 2010-02-10 11:59:33 UTC Jan Rękorajski <baggins@pld-linux.org> '- added pdo_oci':
    dep-tests.sh -> 1.4
Cherrypick from master 2010-06-13 21:33:31 UTC Elan Ruusamäe <glen@pld-linux.org> '- fix ext/standard/tests/file/fileinode_variation3.phpt test':
    bug-52078-fileinode.patch -> 1.1

bug-52078-fileinode.patch [new file with mode: 0644]
dep-tests.sh [new file with mode: 0644]
extension-shared-optional-dep.patch [new file with mode: 0644]
fix-test-run.patch [new file with mode: 0644]
php-branch.sh [new file with mode: 0644]
php-m4-divert.patch [new file with mode: 0644]
php-silent-session-cleanup.patch [new file with mode: 0644]
skip-tests.sh [new file with mode: 0644]
spl-shared.patch [new file with mode: 0644]

diff --git a/bug-52078-fileinode.patch b/bug-52078-fileinode.patch
new file mode 100644 (file)
index 0000000..f83ce8f
--- /dev/null
@@ -0,0 +1,32 @@
+--- php-5.2.13/ext/standard/tests/file/fileinode_variation3.phpt~      2008-11-25 13:33:41.000000000 +0200
++++ php-5.2.13/ext/standard/tests/file/fileinode_variation3.phpt       2010-06-14 00:23:51.340272864 +0300
+@@ -57,15 +57,15 @@
+ --EXPECTF--
+ *** Testing fileinode() with different notations of file names ***
+ - Iteration 1 -
+-int(%d)
++int(%i)
+ - Iteration 2 -
+ Warning: fileinode(): stat failed for %s//fileinode_variation3/fileinode_variation3.tmp/ in %s on line %d
+ bool(false)
+ - Iteration 3 -
+-int(%d)
++int(%i)
+ - Iteration 4 -
+-int(%d)
++int(%i)
+ - Iteration 5 -
+ Warning: fileinode(): stat failed for %s//fileinode_variation3/*.tmp in %s on line %d
+@@ -75,8 +75,8 @@
+ Warning: fileinode(): stat failed for %s/fileinode_variation3/fileinode*.tmp in %s on line %d
+ bool(false)
+ - Iteration 7 -
+-int(%d)
++int(%i)
+ - Iteration 8 -
+-int(%d)
++int(%i)
+ *** Done ***
diff --git a/dep-tests.sh b/dep-tests.sh
new file mode 100644 (file)
index 0000000..de5f7e8
--- /dev/null
@@ -0,0 +1,50 @@
+#!/bin/sh
+# inter-dependencies checker.
+
+dep_spl="pcre simplexml"
+dep_filter='pcre'
+dep_eaccelerator='session'
+dep_mysqli="$dep_spl spl"
+dep_pdo="$dep_spl spl"
+dep_pdo_sqlite="$dep_pdo pdo"
+dep_pdo_pgsql="$dep_pdo pdo"
+dep_pdo_oci="$dep_pdo pdo"
+dep_pdo_odbc="$dep_pdo pdo"
+dep_pdo_firebird="$dep_pdo pdo"
+dep_pdo_dblib="$dep_pdo pdo"
+dep_pdo_mysql="$dep_pdo pdo"
+dep_simplexml="$dep_spl spl"
+dep_sqlite="$dep_pdo pdo"
+dep_wddx='xml'
+dep_xmlreader='dom'
+dep_xmlrpc='xml'
+dep_xsl='dom'
+
+php=${PHP:-$(php-config --php-binary)}
+ext_dir=${EXTENSION_DIR:-$(php-config --extension-dir)}
+conf_dir=${CONFIG_DIR:-$(php-config --sysconfdir)/conf.d $(php-config --sysconfdir)/cli.d}
+tmpini=$(mktemp)
+
+# poldek --sn ac-ready -u php-*
+for ext in $ext_dir/*.so; do
+       [ -f $ext ] || continue
+       ext=${ext##*/}; ext=${ext%.so}
+
+       deps=$(eval echo \$dep_$ext)
+       # add ext itself, if already not in list (spl case)
+       [[ $deps = *$ext* ]] || deps="$deps $ext"
+
+       echo -n "$ext (deps: ${deps# })..."
+
+       grep -rlE '^extension=('$(echo "${deps# }" | tr ' ' '|')').so$' $conf_dir | LC_CTYPE=C LC_ALL= sort | xargs cat > $tmpini
+       $php -n -d extension_dir=$ext_dir -c $tmpini -r "exit(extension_loaded('${ext}') ? 0 : 1);"
+       rc=$?
+       if [ $rc = 0 ]; then
+               echo OK
+       else
+               echo FAIL
+               echo "Failed config was:"
+               cat $tmpini
+       fi
+done
+rm -f $t
diff --git a/extension-shared-optional-dep.patch b/extension-shared-optional-dep.patch
new file mode 100644 (file)
index 0000000..be4597f
--- /dev/null
@@ -0,0 +1,11 @@
+--- php-5.2.11/acinclude.m4~   2009-09-21 22:31:13.000000000 +0300
++++ php-5.2.11/acinclude.m4    2009-09-21 22:32:11.001106977 +0300
+@@ -1019,7 +1019,7 @@
+   is_it_shared=$[PHP_]translit($2,a-z_-,A-Z__)[_SHARED]
+   is_it_enabled=$[PHP_]translit($2,a-z_-,A-Z__)
+   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
+-    AC_MSG_ERROR([
++    AC_MSG_WARN([
+ You've configured extension $1 to build statically, but it
+ depends on extension $2, which you've configured to build shared.
+ You either need to build $1 shared or build $2 statically for the
diff --git a/fix-test-run.patch b/fix-test-run.patch
new file mode 100644 (file)
index 0000000..2231d77
--- /dev/null
@@ -0,0 +1,51 @@
+--- php-5.3.2/configure.in~    2010-03-16 12:16:56.000000000 +0200
++++ php-5.3.2/configure.in     2010-03-16 16:13:24.926435546 +0200
+@@ -1224,6 +1224,11 @@
+ PHP_SUBST(PHP_CLI_OBJS)
+ PHP_SUBST(PHP_GLOBAL_OBJS)
++# shift so that pcre, spl, ... are loaded first
++PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,')
++PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/spl.la \),\2\1,')
++PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/pcre.la \),\2\1,')
++
+ PHP_SUBST(PHP_MODULES)
+ PHP_SUBST(PHP_ZEND_EX)
+--- php-5.3.2/Makefile.global  2010-03-16 16:31:36.972576955 +0200
++++ php-5.3.2/Makefile.global  2010-03-16 16:31:36.972576955 +0200
+@@ -77,7 +77,8 @@
+               done; \
+       fi
+-PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
++PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
++PHP_TEST_SHARED_SYSTEM_EXTENSIONS = pcre
+ PHP_TEST_SHARED_EXTENSIONS =  ` \
+       if test "x$(PHP_MODULES)" != "x"; then \
+               for i in $(PHP_MODULES)""; do \
+@@ -88,6 +89,12 @@
+               for i in $(PHP_ZEND_EX)""; do \
+                       . $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
+               done; \
++      fi; \
++      if test "x$(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)" != "x"; then \
++              for i in $(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)""; do \
++                      dlname=$$i.$(SHLIB_DL_SUFFIX_NAME); \
++                      $(top_srcdir)/build/shtool echo -n -- " -d extension=$(EXTENSION_DIR)/$$dlname"; \
++              done; \
+       fi`
+ PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
+@@ -320,7 +327,10 @@
+               TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
+               TEST_PHP_SRCDIR=$(top_srcdir) \
+               CC="$(CC)" \
+-                      $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
++                      $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
++                      -d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \
++                      $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
++                      -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
+       else \
+               echo "ERROR: Cannot run tests without CLI sapi."; \
+       fi
diff --git a/php-branch.sh b/php-branch.sh
new file mode 100644 (file)
index 0000000..e3b8ac7
--- /dev/null
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
+svn=http://svn.php.net/repository/php/php-src
+tag=php_5_2_11
+branch=PHP_5_2
+out=php-branch.diff
+
+d=$-
+filter() {
+       set -$d
+       # remove revno's for smaller diffs
+       sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,'
+}
+
+old=$svn/tags/$tag
+new=$svn/branches/$branch
+echo >&2 "Running diff: $old -> $new"
+LC_ALL=C svn diff --old=$old --new=$new | filter > $out.tmp
+
+if cmp -s $out{,.tmp}; then
+       echo >&2 "No new diffs..."
+       rm -f $out.tmp
+       exit 0
+fi
+mv -f $out{.tmp,}
diff --git a/php-m4-divert.patch b/php-m4-divert.patch
new file mode 100644 (file)
index 0000000..f73206f
--- /dev/null
@@ -0,0 +1,79 @@
+diff -ur php-5.2.10.org/configure.in php-5.2.10/configure.in
+--- php-5.2.10.org/configure.in        2009-06-17 14:22:41.000000000 +0200
++++ php-5.2.10/configure.in    2009-08-18 12:16:25.317640253 +0200
+@@ -1,7 +1,7 @@
+ ## $Id$ -*- autoconf -*-
+ dnl ## Process this file with autoconf to produce a configure script.
+-divert(1)
++divert(1001)
+ dnl ## Diversion 1 is the autoconf + automake setup phase. We also
+ dnl ## set the PHP version, deal with platform-specific compile
+@@ -263,7 +263,7 @@
+ sinclude(TSRM/tsrm.m4)
+-divert(2)
++divert(1002)
+ dnl ## Diversion 2 is where we set PHP-specific options and come up
+ dnl ## with reasonable default values for them. We check for pthreads here
+@@ -302,7 +302,7 @@
+   PTHREADS_FLAGS
+ fi
+-divert(3)
++divert(1003)
+ dnl ## In diversion 3 we check for compile-time options to the PHP
+ dnl ## core and how to deal with different system dependencies.
+@@ -661,7 +661,7 @@
+   PHP_CRYPT_R_STYLE
+ fi
+-divert(4)
++divert(1004)
+ dnl ## In diversion 4 we check user-configurable general settings.
+@@ -902,7 +902,7 @@
+   AC_MSG_RESULT([using system default])
+ fi
+-divert(5)
++divert(1005)
+ dnl ## In diversion 5 we check which extensions should be compiled.
+ dnl ## All of these are normally in the extension directories.
+diff -ur php-5.2.10.org/ext/standard/config.m4 php-5.2.10/ext/standard/config.m4
+--- php-5.2.10.org/ext/standard/config.m4      2007-07-11 13:56:03.000000000 +0200
++++ php-5.2.10/ext/standard/config.m4  2009-08-18 12:16:25.317640253 +0200
+@@ -1,6 +1,6 @@
+ dnl $Id$ -*- autoconf -*-
+-divert(3)dnl
++divert(1003)dnl
+ dnl
+ dnl Check if flush should be called explicitly after buffered io
+@@ -205,7 +205,7 @@
+ AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
+ AC_FUNC_FNMATCH       
+-divert(5)dnl
++divert(1005)dnl
+ dnl
+ dnl Check for regex library type
+diff -ur php-5.2.10.org/scripts/phpize.m4 php-5.2.10/scripts/phpize.m4
+--- php-5.2.10.org/scripts/phpize.m4   2009-06-02 21:54:22.000000000 +0200
++++ php-5.2.10/scripts/phpize.m4       2009-08-18 12:16:25.317640253 +0200
+@@ -1,6 +1,6 @@
+ dnl This file becomes configure.in for self-contained extensions.
+-divert(1)
++divert(1001)
+ AC_PREREQ(2.13)
+ AC_INIT(config.m4)
diff --git a/php-silent-session-cleanup.patch b/php-silent-session-cleanup.patch
new file mode 100644 (file)
index 0000000..5833736
--- /dev/null
@@ -0,0 +1,10 @@
+--- php-5.3.0/ext/session/mod_files.c~ 2009-05-18 18:10:09.000000000 +0200
++++ php-5.3.0/ext/session/mod_files.c  2009-08-07 08:41:53.029357590 +0200
+@@ -217,7 +217,6 @@
+       dir = opendir(dirname);
+       if (!dir) {
+-              php_error_docref(NULL TSRMLS_CC, E_NOTICE, "ps_files_cleanup_dir: opendir(%s) failed: %s (%d)", dirname, strerror(errno), errno);
+               return (0);
+       }
diff --git a/skip-tests.sh b/skip-tests.sh
new file mode 100644 (file)
index 0000000..4fa2017
--- /dev/null
@@ -0,0 +1,208 @@
+# easter_date()
+mv ext/calendar/tests/easter_date.phpt{,.skip}
+# unixtojd()
+mv ext/calendar/tests/unixtojd.phpt{,.skip}
+# Test DateTime::modify() function : usage variation - Passing unexpected values to first argument $modify.
+mv ext/date/tests/DateTime_modify_variation1.phpt{,.skip}
+# Bug #50392 date_create_from_format enforces 6 digits for 'u' format character
+mv ext/date/tests/bug50392.phpt{,.skip}
+# Test date_modify() function : usage variation - Passing unexpected values to second argument $format.
+mv ext/date/tests/date_modify_variation2.phpt{,.skip}
+# Bug #48555 (ImageFTBBox() differs from previous versions for texts with new lines)
+mv ext/gd/tests/bug48555.phpt{,.skip}
+# Feature Request #50283 (allow base in gmp_strval to use full range: 2 to 62, and -2 to -36)
+mv ext/gmp/tests/bug50283.phpt{,.skip}
+# InterBase: connect, close and pconnect
+mv ext/interbase/tests/002.phpt{,.skip}
+# InterBase: misc sql types (may take a while)
+mv ext/interbase/tests/003.phpt{,.skip}
+# InterBase: BLOB test
+mv ext/interbase/tests/004.phpt{,.skip}
+# InterBase: transactions
+mv ext/interbase/tests/005.phpt{,.skip}
+# InterBase: binding (may take a while)
+mv ext/interbase/tests/006.phpt{,.skip}
+# InterBase: array handling
+mv ext/interbase/tests/007.phpt{,.skip}
+# InterBase: event handling
+mv ext/interbase/tests/008.phpt{,.skip}
+# Bug #45373 (php crash on query with errors in params)
+mv ext/interbase/tests/bug45373.phpt{,.skip}
+# Bug #45575 (Segfault with invalid non-string as event handler callback)
+mv ext/interbase/tests/bug45575.phpt{,.skip}
+# Bug #46247 (ibase_set_event_handler() is allowing to pass callback without event)
+mv ext/interbase/tests/bug46247.phpt{,.skip}
+# Bug #46543 (ibase_trans() memory leaks when using wrong parameters)
+mv ext/interbase/tests/bug46543.phpt{,.skip}
+# ibase_affected_rows(): Basic test
+mv ext/interbase/tests/ibase_affected_rows_001.phpt{,.skip}
+# ibase_close(): Basic test
+mv ext/interbase/tests/ibase_close_001.phpt{,.skip}
+# ibase_drop_db(): Basic test
+mv ext/interbase/tests/ibase_drop_db_001.phpt{,.skip}
+# ibase_errmsg(): Basic test
+mv ext/interbase/tests/ibase_errmsg_001.phpt{,.skip}
+# ibase_free_query(): Basic test
+mv ext/interbase/tests/ibase_free_query_001.phpt{,.skip}
+# ibase_num_fields(): Basic test
+mv ext/interbase/tests/ibase_num_fields_001.phpt{,.skip}
+# ibase_num_params(): Basic test
+mv ext/interbase/tests/ibase_num_params_001.phpt{,.skip}
+# ibase_param_info(): Basic test
+mv ext/interbase/tests/ibase_param_info_001.phpt{,.skip}
+# ibase_rollback(): Basic test
+mv ext/interbase/tests/ibase_rollback_001.phpt{,.skip}
+# ibase_trans(): Basic test
+mv ext/interbase/tests/ibase_trans_001.phpt{,.skip}
+# ibase_trans(): Basic operations
+mv ext/interbase/tests/ibase_trans_002.phpt{,.skip}
+# get_locale()
+mv ext/intl/tests/collator_get_locale.phpt{,.skip}
+# collator_get_sort_key()
+mv ext/intl/tests/collator_get_sort_key.phpt{,.skip}
+# datefmt_localtime_code()
+mv ext/intl/tests/dateformat_localtime.phpt{,.skip}
+# datefmt_parse_code()
+mv ext/intl/tests/dateformat_parse.phpt{,.skip}
+# datefmt_parse_localtime() with parse pos
+mv ext/intl/tests/dateformat_parse_localtime_parsepos.phpt{,.skip}
+# datefmt_parse_timestamp_code()  with parse pos
+mv ext/intl/tests/dateformat_parse_timestamp_parsepos.phpt{,.skip}
+# datefmt_set_timezone_id_code()
+mv ext/intl/tests/dateformat_set_timezone_id.phpt{,.skip}
+# numfmt_format()
+mv ext/intl/tests/formatter_format.phpt{,.skip}
+# numfmt_format_currency()
+mv ext/intl/tests/formatter_format_currency.phpt{,.skip}
+# numfmt_get/set_symbol()
+mv ext/intl/tests/formatter_get_set_symbol.phpt{,.skip}
+# numfmt_parse_currency()
+mv ext/intl/tests/formatter_parse_currency.phpt{,.skip}
+# locale_get_display_language()
+mv ext/intl/tests/locale_get_display_language.phpt{,.skip}
+# locale_get_display_name()
+mv ext/intl/tests/locale_get_display_name.phpt{,.skip}
+# locale_get_display_region()
+mv ext/intl/tests/locale_get_display_region.phpt{,.skip}
+# locale_get_display_script()
+mv ext/intl/tests/locale_get_display_script.phpt{,.skip}
+# locale_get_display_variant()
+mv ext/intl/tests/locale_get_display_variant.phpt{,.skip}
+# ldap_sasl_bind() - Basic anonymous binding
+mv ext/ldap/tests/ldap_sasl_bind_basic.phpt{,.skip}
+# mysql connect
+mv ext/mysql/tests/001.phpt{,.skip}
+# mysql_connect()
+mv ext/mysql/tests/mysql_connect.phpt{,.skip}
+# mysql_[p]connect() - max_links/max_persistent
+mv ext/mysql/tests/mysql_max_links.phpt{,.skip}
+# mysql_[p]connect() - safe_mode
+mv ext/mysql/tests/mysql_sql_safe_mode.phpt{,.skip}
+# mysqli_connect()
+mv ext/mysqli/tests/mysqli_connect.phpt{,.skip}
+# new mysqli()
+mv ext/mysqli/tests/mysqli_connect_oo.phpt{,.skip}
+# new mysqli()
+mv ext/mysqli/tests/mysqli_connect_oo_defaults.phpt{,.skip}
+# pcntl_exec()
+mv ext/pcntl/tests/pcntl_exec.phpt{,.skip}
+# pcntl_exec() 2
+mv ext/pcntl/tests/pcntl_exec_2.phpt{,.skip}
+# PDO_Firebird: connect/disconnect
+mv ext/pdo_firebird/tests/connect.phpt{,.skip}
+# PDO_Firebird: DDL/transactions
+mv ext/pdo_firebird/tests/ddl.phpt{,.skip}
+# PDO_Firebird: prepare/execute/binding
+mv ext/pdo_firebird/tests/execute.phpt{,.skip}
+# MySQL PDO->__construct(), options
+mv ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt{,.skip}
+# MySQL PDO class interface
+mv ext/pdo_mysql/tests/pdo_mysql_interface.phpt{,.skip}
+# PDO ODBC "long" columns
+mv ext/pdo_odbc/tests/long_columns.phpt{,.skip}
+# PDO SQLite Feature Request #42589 (getColumnMeta() should also return table name)
+mv ext/pdo_sqlite/tests/bug_42589.phpt{,.skip}
+# Test posix_getgrgid() function : basic functionality
+mv ext/posix/tests/posix_getgrgid_basic.phpt{,.skip}
+# SOAP Server 9: setclass and setpersistence(SOAP_PERSISTENCE_SESSION)
+mv ext/soap/tests/server009.phpt{,.skip}
+# ext/sockets - socket_strerror - basic test
+mv ext/sockets/tests/socket_strerror.phpt{,.skip}
+# Bug #38759 (sqlite2 empty query causes segfault)
+mv ext/sqlite/tests/bug38759.phpt{,.skip}
+# sqlite, session storage test
+mv ext/sqlite/tests/sqlite_session_001.phpt{,.skip}
+# sqlite, session destroy test
+mv ext/sqlite/tests/sqlite_session_002.phpt{,.skip}
+# SQLite3::loadExtension with empty extension test
+mv ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt{,.skip}
+# SQLite3::loadExtension with disabled extensions
+mv ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt{,.skip}
+# SQLite3::loadExtension test with wrong parameter type
+mv ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt{,.skip}
+# Test filetype() function: Check character type
+mv ext/standard/tests/file/filetype_variation2.phpt{,.skip}
+# realpath_cache_size() and realpath_cache_get()
+mv ext/standard/tests/file/realpath_cache.phpt{,.skip}
+# proc_open
+mv ext/standard/tests/general_functions/proc_open02.phpt{,.skip}
+# Test Blowfish crypt() with invalid rounds
+mv ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt{,.skip}
+# htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15)
+mv ext/standard/tests/strings/htmlentities02.phpt{,.skip}
+# htmlentities() test 4 (setlocale / ja_JP.EUC-JP)
+mv ext/standard/tests/strings/htmlentities04.phpt{,.skip}
+# htmlentities() test 10 (default_charset / cp1252)
+mv ext/standard/tests/strings/htmlentities10.phpt{,.skip}
+# htmlentities() test 11 (default_charset / ISO-8859-15)
+mv ext/standard/tests/strings/htmlentities11.phpt{,.skip}
+# htmlentities() test 13 (default_charset / EUC-JP)
+mv ext/standard/tests/strings/htmlentities13.phpt{,.skip}
+# htmlentities() test 15 (setlocale / KOI8-R)
+mv ext/standard/tests/strings/htmlentities15.phpt{,.skip}
+# htmlentities() / html_entity_decode() #8592 - #9002 table test
+mv ext/standard/tests/strings/htmlentities17.phpt{,.skip}
+# Test setlocale() function : usage variations - Setting all available locales in the platform
+mv ext/standard/tests/strings/setlocale_variation2.phpt{,.skip}
+# wddx session serializer handler (serialize)
+mv ext/wddx/tests/004.phpt{,.skip}
+# wddx session serializer handler (deserialize)
+mv ext/wddx/tests/005.phpt{,.skip}
+# Bug #35447 (xml_parse_into_struct() chokes on the UTF-8 BOM)
+mv ext/xml/tests/bug35447.phpt{,.skip}
+# XML Parser test: concat character data and set empty handlers
+mv ext/xml/tests/xml011.phpt{,.skip}
+# xmlrpc_encode_request() and various arguments
+mv ext/xmlrpc/tests/002.phpt{,.skip}
+# Bug #40576 (double values are truncated to 6 decimal digits when encoding)
+mv ext/xmlrpc/tests/bug40576.phpt{,.skip}
+# Bug #42189 (xmlrpc_get_type() crashes PHP on invalid dates)
+mv ext/xmlrpc/tests/bug42189.phpt{,.skip}
+# Bug #44996 (xmlrpc_decode() ignores time zone on iso8601.datetime)
+mv ext/xmlrpc/tests/bug44996.phpt{,.skip}
+# Bug #45226 (xmlrpc_set_type() segfaults with valid ISO8601 date string)
+mv ext/xmlrpc/tests/bug45226.phpt{,.skip}
+# Bug #45556 (Return value from callback isn't freed)
+mv ext/xmlrpc/tests/bug45556.phpt{,.skip}
+# Test 10: EXSLT Support
+mv ext/xsl/tests/xslt010.phpt{,.skip}
+# Check xsltprocessor::registerPHPFunctions and a non-string function in xsl
+mv ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt{,.skip}
+# Check xsltprocessor::registerPHPFunctions and a undefined php function
+mv ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt{,.skip}
+# show information about extension
+mv sapi/cli/tests/006.phpt{,.skip}
+# CLI -a and readline
+mv sapi/cli/tests/016.phpt{,.skip}
+# CLI php -m
+mv sapi/cli/tests/018.phpt{,.skip}
+# Test open_basedir configuration
+mv tests/security/open_basedir_fileinode.phpt{,.skip}
+# Test fileinode() function: Variations
+mv ext/standard/tests/file/fileinode_variation.phpt{,.skip}
+# Test lstat() and stat() functions: usage variations - dir/file name stored in object
+mv ext/standard/tests/file/lstat_stat_variation18.phpt{,.skip}
+# Test lstat() and stat() functions: usage variations - dir/file names in array
+mv ext/standard/tests/file/lstat_stat_variation19.phpt{,.skip}
+# Test fileinode() function: usage variations - diff. path notations
+mv ext/standard/tests/file/fileinode_variation3.phpt{,.skip}
diff --git a/spl-shared.patch b/spl-shared.patch
new file mode 100644 (file)
index 0000000..8e19446
--- /dev/null
@@ -0,0 +1,76 @@
+--- php-5.2.11/ext/spl/config.m4~      2006-12-04 20:01:53.000000000 +0200
++++ php-5.2.11/ext/spl/config.m4       2009-09-23 16:07:37.775732678 +0300
+@@ -26,7 +26,7 @@
+   CPPFLAGS=$old_CPPFLAGS
+   AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed])
+   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_sxe.c spl_exceptions.c spl_observer.c, no)
++  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c, $ext_shared)
+   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_sxe.h])
+   PHP_ADD_EXTENSION_DEP(spl, pcre, true)
+ fi
+--- php-5.2.11/ext/spl/spl_iterators.c~        2009-09-23 17:57:06.000000000 +0300
++++ php-5.2.11/ext/spl/spl_iterators.c 2009-09-23 17:57:09.025079005 +0300
+@@ -57,7 +57,13 @@
+ 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
+ zend_function_entry spl_funcs_RecursiveIterator[] = {
+       SPL_ABSTRACT_ME(RecursiveIterator, hasChildren,  NULL)
+@@ -2950,6 +2956,10 @@
+       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
++
+       return SUCCESS;
+ }
+ /* }}} */
+--- php-5.2.11/ext/spl/spl_iterators.h 2009-09-23 17:57:59.898412166 +0300
++++ php-5.2.11/ext/spl/spl_iterators.h 2009-09-23 18:04:45.518458679 +0300
+@@ -50,7 +50,12 @@
+ 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
+ PHP_MINIT_FUNCTION(spl_iterators);
+--- php-5.2.11/ext/standard/array.c~   2009-08-14 09:18:47.000000000 +0300
++++ php-5.2.11/ext/standard/array.c    2009-09-24 16:40:24.630430291 +0300
+@@ -48,6 +48,9 @@
+ #include "php_smart_str.h"
+ #ifdef HAVE_SPL
+ #include "ext/spl/spl_array.h"
++#if COMPILE_DL_SPL
++PHPAPI zend_class_entry *spl_ce_Countable_p = NULL; // external one
++#endif
+ #endif
+ /* {{{ defines */
+--- php-5.2.11/ext/pdo/pdo.c~  2009-07-20 01:46:03.000000000 +0300
++++ php-5.2.11/ext/pdo/pdo.c   2009-10-14 13:33:30.397508159 +0300
+@@ -127,7 +127,7 @@
+ /* {{{ pdo_functions[] */
+ #if ZEND_MODULE_API_NO >= 20050922
+ static zend_module_dep pdo_deps[] = {
+-#ifdef HAVE_SPL
++#ifdef HAVE_SPL && !COMPILE_DL_SPL
+       ZEND_MOD_REQUIRED("spl")
+ #endif
+       {NULL, NULL, NULL}
This page took 0.094868 seconds and 4 git commands to generate.