[Pkg-php-commits] [php/debian-sid] Refresh patches (and remove upstream-merged) for upstream/5.3.6

Ondřej Surý ondrej at sury.org
Fri Mar 18 14:56:25 UTC 2011 

---
 debian/patches/002-static_openssl.patch            |    6 +-
 debian/patches/004-ldap_fix.patch                  |    4 +-
 debian/patches/006-debian_quirks.patch             |    9 +-
 debian/patches/013-force_getaddrinfo.patch         |    2 +-
 debian/patches/019-z_off_t_as_long.patch           |    4 +-
 debian/patches/029-php.ini_paranoid.patch          |    2 +-
 debian/patches/033-we_WANT_libtool.patch           |    4 +-
 debian/patches/036-fd_setsize_fix.patch            |    4 +-
 debian/patches/043-recode_size_t.patch             |    4 +-
 debian/patches/044-strtod_arm_fix.patch            |    8 +-
 debian/patches/045-exif_nesting_level.patch        |    6 +-
 debian/patches/047-zts_with_dl.patch               |    4 +-
 debian/patches/057-no_apache_installed.patch       |   16 +-
 debian/patches/100-recode_is_shared.patch          |    4 +-
 debian/patches/101-sqlite_is_shared.patch          |    4 +-
 debian/patches/108-64_bit_datetime.patch           |    2 +-
 debian/patches/115-autoconf_ftbfs.patch            |    2 +-
 debian/patches/configure-as-needed.patch           |    4 +-
 ...ash-with-entity-declarations-in-simplexml.patch |   41 -----
 .../fix-integer-overflow-in-SdnToJulian.patch      |   90 ----------
 ...sh-introduced-by-the-null-poisoning-patch.patch |   61 -------
 .../fix-memory-leak-inside-highlight_string.patch  |   64 -------
 ...-pgsql_stmt_execute-when-postgres-is-down.patch |   11 --
 ...x-segfault-when-node-is-NULL-in-simplexml.patch |   11 --
 ...lt-when-using-several-cloned-intl-objects.patch |  130 --------------
 ...php_mssql_get_column_content_without_type.patch |    6 +-
 debian/patches/libtool2.2.patch                    |    4 +-
 debian/patches/page_size_fixes.patch               |    4 +-
 debian/patches/series                              |    8 -
 debian/patches/suhosin.patch                       |  187 +++++++++----------
 30 files changed, 143 insertions(+), 563 deletions(-)
 delete mode 100644 debian/patches/fix-crash-with-entity-declarations-in-simplexml.patch
 delete mode 100644 debian/patches/fix-integer-overflow-in-SdnToJulian.patch
 delete mode 100644 debian/patches/fix-leak-and-possible-crash-introduced-by-the-null-poisoning-patch.patch
 delete mode 100644 debian/patches/fix-memory-leak-inside-highlight_string.patch
 delete mode 100644 debian/patches/fix-segfault-in-pgsql_stmt_execute-when-postgres-is-down.patch
 delete mode 100644 debian/patches/fix-segfault-when-node-is-NULL-in-simplexml.patch
 delete mode 100644 debian/patches/fix-segfault-when-using-several-cloned-intl-objects.patch

diff --git a/debian/patches/002-static_openssl.patch b/debian/patches/002-static_openssl.patch
index 7f73851..f479730 100644
--- a/debian/patches/002-static_openssl.patch
+++ b/debian/patches/002-static_openssl.patch
@@ -1,6 +1,6 @@
---- pkg-php.orig/acinclude.m4
-+++ pkg-php/acinclude.m4
-@@ -2373,9 +2373,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -2379,9 +2379,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
  
      PHP_ADD_INCLUDE($OPENSSL_INCDIR)
    
diff --git a/debian/patches/004-ldap_fix.patch b/debian/patches/004-ldap_fix.patch
index 6ab086f..a148afe 100644
--- a/debian/patches/004-ldap_fix.patch
+++ b/debian/patches/004-ldap_fix.patch
@@ -6,7 +6,7 @@ Last-Update: 2010-01-18
 
 --- a/ext/ldap/ldap.c
 +++ b/ext/ldap/ldap.c
-@@ -1211,7 +1211,7 @@ PHP_FUNCTION(ldap_explode_dn)
+@@ -1212,7 +1212,7 @@ PHP_FUNCTION(ldap_explode_dn)
  	}
  
  	i=0;
@@ -15,7 +15,7 @@ Last-Update: 2010-01-18
  	count = i;
  
  	array_init(return_value);
-@@ -1221,7 +1221,8 @@ PHP_FUNCTION(ldap_explode_dn)
+@@ -1222,7 +1222,8 @@ PHP_FUNCTION(ldap_explode_dn)
  		add_index_string(return_value, i, ldap_value[i], 1);
  	}
  
diff --git a/debian/patches/006-debian_quirks.patch b/debian/patches/006-debian_quirks.patch
index 0f998d4..f6e1e44 100644
--- a/debian/patches/006-debian_quirks.patch
+++ b/debian/patches/006-debian_quirks.patch
@@ -81,10 +81,11 @@ Last-Update: 2010-01-18
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -938,49 +938,6 @@ default_socket_timeout = 60
+@@ -937,54 +937,6 @@ default_socket_timeout = 60
+ ;
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
- ;
+-;
 -; Windows Extensions
 -; Note that ODBC support is built in, so no dll is needed for it.
 -; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
@@ -118,7 +119,11 @@ Last-Update: 2010-01-18
 -;extension=php_pgsql.dll
 -;extension=php_pspell.dll
 -;extension=php_shmop.dll
+-
+-; The MIBS data available in the PHP distribution must be installed. 
+-; See http://www.php.net/manual/en/snmp.installation.php 
 -;extension=php_snmp.dll
+-
 -;extension=php_soap.dll
 -;extension=php_sockets.dll
 -;extension=php_sqlite.dll
diff --git a/debian/patches/013-force_getaddrinfo.patch b/debian/patches/013-force_getaddrinfo.patch
index e64b3d0..2b1d662 100644
--- a/debian/patches/013-force_getaddrinfo.patch
+++ b/debian/patches/013-force_getaddrinfo.patch
@@ -7,7 +7,7 @@ Last-Update: 2010-01-18
 
 --- a/configure.in
 +++ b/configure.in
-@@ -615,50 +615,50 @@ AC_CACHE_CHECK([for nanosleep], ac_cv_fu
+@@ -615,50 +615,50 @@ PHP_CHECK_FUNC_LIB(nanosleep, rt)
  
  dnl Check for getaddrinfo, should be a better way, but...
  dnl Also check for working getaddrinfo
diff --git a/debian/patches/019-z_off_t_as_long.patch b/debian/patches/019-z_off_t_as_long.patch
index 38876b1..3fde316 100644
--- a/debian/patches/019-z_off_t_as_long.patch
+++ b/debian/patches/019-z_off_t_as_long.patch
@@ -8,7 +8,7 @@ Forwarded: no
 Last-Update: 2010-01-18
 
 --- /dev/null
-+++ pkg-php/ext/zlib/zconf.h
++++ b/ext/zlib/zconf.h
 @@ -0,0 +1,326 @@
 +/* zconf.h -- configuration of the zlib compression library
 + * Copyright (C) 1995-2003 Jean-loup Gailly.
@@ -337,7 +337,7 @@ Last-Update: 2010-01-18
 +
 +#endif /* ZCONF_H */
 --- /dev/null
-+++ pkg-php/ext/zlib/zlib.h
++++ b/ext/zlib/zlib.h
 @@ -0,0 +1,1200 @@
 +/* zlib.h -- interface of the 'zlib' general purpose compression library
 +  version 1.2.1.1, January 9th, 2004
diff --git a/debian/patches/029-php.ini_paranoid.patch b/debian/patches/029-php.ini_paranoid.patch
index e21d071..be7b677 100644
--- a/debian/patches/029-php.ini_paranoid.patch
+++ b/debian/patches/029-php.ini_paranoid.patch
@@ -4,7 +4,7 @@ Forwarded: no
 Last-Update: 2010-01-18
 
 --- /dev/null
-+++ pkg-php/php.ini-paranoid
++++ b/php.ini-paranoid
 @@ -0,0 +1,1504 @@
 +[PHP]
 +
diff --git a/debian/patches/033-we_WANT_libtool.patch b/debian/patches/033-we_WANT_libtool.patch
index a280a58..fe1b16f 100644
--- a/debian/patches/033-we_WANT_libtool.patch
+++ b/debian/patches/033-we_WANT_libtool.patch
@@ -11,8 +11,8 @@ Origin: vendor
 Forwarded: no
 Last-Update: 2010-01-18
 
---- pkg-php.orig/build/build2.mk
-+++ pkg-php/build/build2.mk
+--- a/build/build2.mk
++++ b/build/build2.mk
 @@ -52,7 +52,8 @@ $(TOUCH_FILES):
  
  aclocal.m4: configure.in acinclude.m4
diff --git a/debian/patches/036-fd_setsize_fix.patch b/debian/patches/036-fd_setsize_fix.patch
index 7283126..a72bd24 100644
--- a/debian/patches/036-fd_setsize_fix.patch
+++ b/debian/patches/036-fd_setsize_fix.patch
@@ -15,10 +15,10 @@ Last-Update: 2010-01-18
  		if (php_sock->bsd_socket > *max_fd) {
 --- a/ext/standard/streamsfuncs.c
 +++ b/ext/standard/streamsfuncs.c
-@@ -628,6 +628,8 @@ static int stream_array_to_fd_set(zval *
+@@ -635,6 +635,8 @@ static int stream_array_to_fd_set(zval *
  		 * is not displayed.
  		 * */
- 		if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&this_fd, 1) && this_fd >= 0) {
+ 		if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&this_fd, 1) && this_fd != -1) {
 +			if (this_fd > FD_SETSIZE)
 +				continue;
  
diff --git a/debian/patches/043-recode_size_t.patch b/debian/patches/043-recode_size_t.patch
index 41e4047..f03b845 100644
--- a/debian/patches/043-recode_size_t.patch
+++ b/debian/patches/043-recode_size_t.patch
@@ -4,8 +4,8 @@ Bug-Debian: http://bugs.debian.org/294986, http://bugs.debian.org/459020
 Forwarded: no
 Last-Update: 2010-01-18
 
---- pkg-php.orig/ext/recode/recode.c
-+++ pkg-php/ext/recode/recode.c
+--- a/ext/recode/recode.c
++++ b/ext/recode/recode.c
 @@ -149,7 +149,7 @@ PHP_FUNCTION(recode_string)
  	int req_len, str_len;
  	char *req, *str;
diff --git a/debian/patches/044-strtod_arm_fix.patch b/debian/patches/044-strtod_arm_fix.patch
index 81669d3..53ba9cb 100644
--- a/debian/patches/044-strtod_arm_fix.patch
+++ b/debian/patches/044-strtod_arm_fix.patch
@@ -1,5 +1,5 @@
---- pkg-php.orig/Zend/zend_strtod.c
-+++ pkg-php/Zend/zend_strtod.c
+--- a/Zend/zend_strtod.c
++++ b/Zend/zend_strtod.c
 @@ -152,14 +152,25 @@ typedef unsigned long int uint32_t;
  #define IEEE_LITTLE_ENDIAN
  #endif
@@ -33,7 +33,7 @@
  #endif
  
  #ifdef __vax__
-@@ -266,8 +277,7 @@ BEGIN_EXTERN_C()
+@@ -267,8 +278,7 @@ BEGIN_EXTERN_C()
  
  #if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) + defined(VAX) + \
  		    defined(IBM) != 1
@@ -43,7 +43,7 @@
  #endif
  
  	typedef union {
-@@ -287,7 +297,7 @@ BEGIN_EXTERN_C()
+@@ -288,7 +298,7 @@ BEGIN_EXTERN_C()
   * An alternative that might be better on some machines is
   * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
   */
diff --git a/debian/patches/045-exif_nesting_level.patch b/debian/patches/045-exif_nesting_level.patch
index 4cb20e6..fec69a1 100644
--- a/debian/patches/045-exif_nesting_level.patch
+++ b/debian/patches/045-exif_nesting_level.patch
@@ -3,9 +3,9 @@ Origin: vendor
 Forwarded: no
 Last-Update: 2010-01-18
 
---- pkg-php.orig/ext/exif/exif.c
-+++ pkg-php/ext/exif/exif.c
-@@ -99,7 +99,7 @@ typedef unsigned char uchar;
+--- a/ext/exif/exif.c
++++ b/ext/exif/exif.c
+@@ -109,7 +109,7 @@ typedef unsigned char uchar;
  
  #define EFREE_IF(ptr)	if (ptr) efree(ptr)
  
diff --git a/debian/patches/047-zts_with_dl.patch b/debian/patches/047-zts_with_dl.patch
index 6efca32..7717039 100644
--- a/debian/patches/047-zts_with_dl.patch
+++ b/debian/patches/047-zts_with_dl.patch
@@ -1,5 +1,5 @@
---- pkg-php.orig/ext/standard/dl.c
-+++ pkg-php/ext/standard/dl.c
+--- a/ext/standard/dl.c
++++ b/ext/standard/dl.c
 @@ -77,12 +77,7 @@ PHPAPI PHP_FUNCTION(dl)
  		(strcmp(sapi_module.name, "cli") != 0) &&
  		(strncmp(sapi_module.name, "embed", 5) != 0)
diff --git a/debian/patches/057-no_apache_installed.patch b/debian/patches/057-no_apache_installed.patch
index 6937e0c..6d9ea15 100644
--- a/debian/patches/057-no_apache_installed.patch
+++ b/debian/patches/057-no_apache_installed.patch
@@ -3,8 +3,8 @@ Origin: vendor
 Forwarded: no
 Last-Update: 2010-01-18
 
---- pkg-php.orig/sapi/apache2handler/config.m4
-+++ pkg-php/sapi/apache2handler/config.m4
+--- a/sapi/apache2handler/config.m4
++++ b/sapi/apache2handler/config.m4
 @@ -59,13 +59,13 @@ if test "$PHP_APXS2" != "no"; then
  
    APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
@@ -26,8 +26,8 @@ Last-Update: 2010-01-18
  
    APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
    if test -z `$APXS -q SYSCONFDIR`; then
---- pkg-php.orig/sapi/apache/config.m4
-+++ pkg-php/sapi/apache/config.m4
+--- a/sapi/apache/config.m4
++++ b/sapi/apache/config.m4
 @@ -56,11 +56,11 @@ if test "$PHP_APXS" != "no"; then
    APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
    APACHE_INCLUDE=-I$APXS_INCLUDEDIR
@@ -45,8 +45,8 @@ Last-Update: 2010-01-18
  
    for flag in $APXS_CFLAGS; do
      case $flag in
---- pkg-php.orig/sapi/apache2filter/config.m4
-+++ pkg-php/sapi/apache2filter/config.m4
+--- a/sapi/apache2filter/config.m4
++++ b/sapi/apache2filter/config.m4
 @@ -60,13 +60,13 @@ if test "$PHP_APXS2FILTER" != "no"; then
  
    APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
@@ -68,8 +68,8 @@ Last-Update: 2010-01-18
  
    APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
    if test -z `$APXS -q SYSCONFDIR`; then
---- pkg-php.orig/sapi/apache_hooks/config.m4
-+++ pkg-php/sapi/apache_hooks/config.m4
+--- a/sapi/apache_hooks/config.m4
++++ b/sapi/apache_hooks/config.m4
 @@ -57,11 +57,11 @@ if test "$PHP_APACHE_HOOKS" != "no"; the
    APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
    APACHE_INCLUDE=-I$APXS_INCLUDEDIR
diff --git a/debian/patches/100-recode_is_shared.patch b/debian/patches/100-recode_is_shared.patch
index f459d8c..a91302c 100644
--- a/debian/patches/100-recode_is_shared.patch
+++ b/debian/patches/100-recode_is_shared.patch
@@ -4,8 +4,8 @@ Origin: vendor
 Forwarded: no
 Last-Update: 2010-01-18
 
---- pkg-php.orig/ext/recode/config9.m4
-+++ pkg-php/ext/recode/config9.m4
+--- a/ext/recode/config9.m4
++++ b/ext/recode/config9.m4
 @@ -13,6 +13,6 @@ if test "$PHP_RECODE" != "no"; then
    fi
  
diff --git a/debian/patches/101-sqlite_is_shared.patch b/debian/patches/101-sqlite_is_shared.patch
index d9db8c0..62f497e 100644
--- a/debian/patches/101-sqlite_is_shared.patch
+++ b/debian/patches/101-sqlite_is_shared.patch
@@ -1,5 +1,5 @@
---- pkg-php.orig/ext/sqlite/config.m4
-+++ pkg-php/ext/sqlite/config.m4
+--- a/ext/sqlite/config.m4
++++ b/ext/sqlite/config.m4
 @@ -84,7 +84,7 @@ if test "$PHP_SQLITE" != "no"; then
      ])
      SQLITE_MODULE_TYPE=external
diff --git a/debian/patches/108-64_bit_datetime.patch b/debian/patches/108-64_bit_datetime.patch
index 28e8d9a..b61e13a 100644
--- a/debian/patches/108-64_bit_datetime.patch
+++ b/debian/patches/108-64_bit_datetime.patch
@@ -2,7 +2,7 @@
 +++ b/ext/standard/datetime.c
 @@ -20,6 +20,9 @@
  
- /* $Id: datetime.c 293036 2010-01-03 09:23:27Z sebastian $ */
+ /* $Id: datetime.c 306939 2011-01-01 02:19:59Z felipe $ */
  
 +#define _XOPEN_SOURCE	/* needed to get strptime() declared */
 +#define _BSD_SOURCE		/* needed to get ulong declared */
diff --git a/debian/patches/115-autoconf_ftbfs.patch b/debian/patches/115-autoconf_ftbfs.patch
index f345e0a..8bd7016 100644
--- a/debian/patches/115-autoconf_ftbfs.patch
+++ b/debian/patches/115-autoconf_ftbfs.patch
@@ -1,7 +1,7 @@
 --- a/configure.in
 +++ b/configure.in
 @@ -1,7 +1,7 @@
- ## $Id: configure.in 307133 2011-01-05 16:35:33Z johannes $ -*- autoconf -*-
+ ## $Id: configure.in 309329 2011-03-17 07:48:29Z johannes $ -*- autoconf -*-
  dnl ## Process this file with autoconf to produce a configure script.
  
 -divert(1)
diff --git a/debian/patches/configure-as-needed.patch b/debian/patches/configure-as-needed.patch
index 8203fed..092349c 100644
--- a/debian/patches/configure-as-needed.patch
+++ b/debian/patches/configure-as-needed.patch
@@ -25,7 +25,7 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/676672
    [
 --- a/acinclude.m4
 +++ b/acinclude.m4
-@@ -2395,6 +2395,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+@@ -2396,6 +2396,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
      ])
      LIBS=$old_LIBS
      PHP_ADD_LIBRARY(ssl,,$1)
@@ -35,7 +35,7 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/676672
    fi
 --- a/aclocal.m4
 +++ b/aclocal.m4
-@@ -2397,6 +2397,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+@@ -2398,6 +2398,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
      ])
      LIBS=$old_LIBS
      PHP_ADD_LIBRARY(ssl,,$1)
diff --git a/debian/patches/fix-crash-with-entity-declarations-in-simplexml.patch b/debian/patches/fix-crash-with-entity-declarations-in-simplexml.patch
deleted file mode 100644
index c6cb42c..0000000
--- a/debian/patches/fix-crash-with-entity-declarations-in-simplexml.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/ext/simplexml/simplexml.c
-+++ b/ext/simplexml/simplexml.c
-@@ -1099,22 +1099,24 @@ static HashTable * sxe_get_prop_hash(zva
- 		if (sxe->iter.type == SXE_ITER_ELEMENT) {
- 			node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
- 		}
--		attr = node ? (xmlAttrPtr)node->properties : NULL;
--		zattr = NULL;
--		test = sxe->iter.name && sxe->iter.type == SXE_ITER_ATTRLIST;
--		while (attr) {
--			if ((!test || !xmlStrcmp(attr->name, sxe->iter.name)) && match_ns(sxe, (xmlNodePtr)attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
--				MAKE_STD_ZVAL(value);
--				ZVAL_STRING(value, sxe_xmlNodeListGetString((xmlDocPtr) sxe->document->ptr, attr->children, 1), 0);
--				namelen = xmlStrlen(attr->name) + 1;
--				if (!zattr) {
--					MAKE_STD_ZVAL(zattr);
--					array_init(zattr);
--					sxe_properties_add(rv, "@attributes", sizeof("@attributes"), zattr TSRMLS_CC);
-+		if (node->tpye != XML_ENTITY_DECL) {
-+			attr = node ? (xmlAttrPtr)node->properties : NULL;
-+			zattr = NULL;
-+			test = sxe->iter.name && sxe->iter.type == SXE_ITER_ATTRLIST;
-+			while (attr) {
-+				if ((!test || !xmlStrcmp(attr->name, sxe->iter.name)) && match_ns(sxe, (xmlNodePtr)attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
-+					MAKE_STD_ZVAL(value);
-+					ZVAL_STRING(value, sxe_xmlNodeListGetString((xmlDocPtr) sxe->document->ptr, attr->children, 1), 0);
-+					namelen = xmlStrlen(attr->name) + 1;
-+					if (!zattr) {
-+						MAKE_STD_ZVAL(zattr);
-+						array_init(zattr);
-+						sxe_properties_add(rv, "@attributes", sizeof("@attributes"), zattr TSRMLS_CC);
-+					}
-+					add_assoc_zval_ex(zattr, (char*)attr->name, namelen, value);
- 				}
--				add_assoc_zval_ex(zattr, (char*)attr->name, namelen, value);
-+				attr = attr->next;
- 			}
--			attr = attr->next;
- 		}
- 	}
- 
diff --git a/debian/patches/fix-integer-overflow-in-SdnToJulian.patch b/debian/patches/fix-integer-overflow-in-SdnToJulian.patch
deleted file mode 100644
index 6f1510a..0000000
--- a/debian/patches/fix-integer-overflow-in-SdnToJulian.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- /dev/null
-+++ b/ext/calendar/tests/bug53574.phpt
-@@ -0,0 +1,35 @@
-+--TEST--
-+Bug #53574 (Integer overflow in SdnToJulian; leads to segfault)
-+--SKIPIF--
-+<?php include 'skipif.inc'; ?>
-+--FILE--
-+<?php
-+if (PHP_INT_MAX == 0x7FFFFFFF) {
-+	$x = 882858043;
-+} else {
-+	$x = 3315881921229094912;
-+}
-+
-+var_dump(cal_from_jd($x, CAL_JULIAN));
-+--EXPECT--
-+array(9) {
-+  ["date"]=>
-+  string(5) "0/0/0"
-+  ["month"]=>
-+  int(0)
-+  ["day"]=>
-+  int(0)
-+  ["year"]=>
-+  int(0)
-+  ["dow"]=>
-+  int(3)
-+  ["abbrevdayname"]=>
-+  string(3) "Wed"
-+  ["dayname"]=>
-+  string(9) "Wednesday"
-+  ["abbrevmonth"]=>
-+  string(0) ""
-+  ["monthname"]=>
-+  string(0) ""
-+}
-+
---- a/ext/calendar/julian.c
-+++ b/ext/calendar/julian.c
-@@ -146,6 +146,7 @@
-  **************************************************************************/
- 
- #include "sdncal.h"
-+#include <limits.h>
- 
- #define JULIAN_SDN_OFFSET         32083
- #define DAYS_PER_5_MONTHS  153
-@@ -164,15 +165,22 @@ void SdnToJulian(
- 	int dayOfYear;
- 
- 	if (sdn <= 0) {
--		*pYear = 0;
--		*pMonth = 0;
--		*pDay = 0;
--		return;
-+		goto fail;
- 	}
--	temp = (sdn + JULIAN_SDN_OFFSET) * 4 - 1;
-+	/* Check for overflow */
-+	if (sdn > (LONG_MAX - JULIAN_SDN_OFFSET * 4 + 1) / 4 || sdn < LONG_MIN / 4) {
-+		goto fail;
-+	}
-+	temp = sdn * 4 + (JULIAN_SDN_OFFSET * 4 - 1);
- 
- 	/* Calculate the year and day of year (1 <= dayOfYear <= 366). */
--	year = temp / DAYS_PER_4_YEARS;
-+	{
-+		long yearl = temp / DAYS_PER_4_YEARS;
-+		if (yearl > INT_MAX || yearl < INT_MIN) {
-+			goto fail;
-+		}
-+		year = (int) yearl;
-+	}
- 	dayOfYear = (temp % DAYS_PER_4_YEARS) / 4 + 1;
- 
- 	/* Calculate the month and day of month. */
-@@ -196,6 +204,12 @@ void SdnToJulian(
- 	*pYear = year;
- 	*pMonth = month;
- 	*pDay = day;
-+	return;
-+
-+fail:
-+	*pYear = 0;
-+	*pMonth = 0;
-+	*pDay = 0;
- }
- 
- long int JulianToSdn(
diff --git a/debian/patches/fix-leak-and-possible-crash-introduced-by-the-null-poisoning-patch.patch b/debian/patches/fix-leak-and-possible-crash-introduced-by-the-null-poisoning-patch.patch
deleted file mode 100644
index 6f7c414..0000000
--- a/debian/patches/fix-leak-and-possible-crash-introduced-by-the-null-poisoning-patch.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/ext/sqlite/sqlite.c
-+++ b/ext/sqlite/sqlite.c
-@@ -1641,8 +1641,10 @@ PHP_FUNCTION(sqlite_open)
- 	}
- 
- 	if (strlen(filename) != filename_len) {
-+		zend_restore_error_handling(&error_handling TSRMLS_CC);
- 		RETURN_FALSE;
- 	}
-+
- 	if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
- 		/* resolve the fully-qualified path name to use as the hash key */
- 		if (!(fullpath = expand_filepath(filename, NULL TSRMLS_CC))) {
-@@ -1697,6 +1699,7 @@ PHP_FUNCTION(sqlite_factory)
- 	}
- 
- 	if (strlen(filename) != filename_len) {
-+		zend_restore_error_handling(&error_handling TSRMLS_CC);
- 		RETURN_FALSE;
- 	}
- 
---- /dev/null
-+++ b/ext/soap/tests/error_handler.phpt
-@@ -0,0 +1,17 @@
-+--TEST--
-+Bug #46760 (SoapClient doRequest fails when proxy is used)
-+--SKIPIF--
-+<?php require_once('skipif.inc'); 
-+if (!extension_loaded('sqlite')) die('skip squilite extension not available');
-+?>
-+--FILE--
-+<?php
-+echo "blllllllllaaaaaaa\n";
-+$var475 = sqlite_factory("\x00");
-+$var147 = use_soap_error_handler();
-+$var477 = flock(false,false);dump($client->_proxy_port);
-+
-+echo "OK";
-+?>
-+--EXPECT--
-+OK
---- a/ext/xsl/xsltprocessor.c
-+++ b/ext/xsl/xsltprocessor.c
-@@ -643,6 +643,7 @@ PHP_FUNCTION(xsl_xsltprocessor_transform
- 	ret = -1;
- 	if (newdocp) {
- 		if (strlen(uri) != uri_len) {
-+			xmlFreeDoc(newdocp);
- 			RETURN_FALSE;
- 		}
- 		ret = xsltSaveResultToFilename(uri, newdocp, sheetp, 0);
---- a/ext/pspell/pspell.c
-+++ b/ext/pspell/pspell.c
-@@ -403,6 +403,7 @@ static PHP_FUNCTION(pspell_new_personal)
- #endif
- 
- 	if (strlen(personal) != personal_len) {
-+		delete_pspell_config(config);
- 		RETURN_FALSE;
- 	}
- 
diff --git a/debian/patches/fix-memory-leak-inside-highlight_string.patch b/debian/patches/fix-memory-leak-inside-highlight_string.patch
deleted file mode 100644
index bbed854..0000000
--- a/debian/patches/fix-memory-leak-inside-highlight_string.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/Zend/zend_language_scanner.c
-+++ b/Zend/zend_language_scanner.c
-@@ -228,6 +228,12 @@ ZEND_API void zend_restore_lexical_state
- 	SCNG(script_encoding) = lex_state->script_encoding;
- 	SCNG(internal_encoding) = lex_state->internal_encoding;
- #endif /* ZEND_MULTIBYTE */
-+
-+	if (CG(heredoc)) {
-+		efree(CG(heredoc));
-+		CG(heredoc) = NULL;
-+		CG(heredoc_len) = 0;
-+	}
- }
- 
- ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle TSRMLS_DC)
---- a/Zend/zend_language_scanner.l
-+++ b/Zend/zend_language_scanner.l
-@@ -227,6 +227,12 @@ ZEND_API void zend_restore_lexical_state
- 	SCNG(script_encoding) = lex_state->script_encoding;
- 	SCNG(internal_encoding) = lex_state->internal_encoding;
- #endif /* ZEND_MULTIBYTE */
-+
-+	if (CG(heredoc)) {
-+		efree(CG(heredoc));
-+		CG(heredoc) = NULL;
-+		CG(heredoc_len) = 0;
-+	}
- }
- 
- ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle TSRMLS_DC)
---- /dev/null
-+++ b/Zend/tests/bug53629.phpt
-@@ -0,0 +1,31 @@
-+--TEST--
-+Bug #53629 (memory leak inside highlight_string())
-+--FILE--
-+<?php
-+
-+$str = '
-+<?php
-+class foo {
-+    public $bar = <<<EOT
-+bar
-+    EOT;
-+}
-+?>
-+';
-+$str2 = '
-+<?php
-+var_dump(array(<<<EOD
-+foobar!
-+EOD
-+));
-+?>
-+';
-+
-+highlight_string($str, true);
-+highlight_string($str2, true);
-+
-+
-+echo "Done\n";
-+?>
-+--EXPECT--
-+Done
diff --git a/debian/patches/fix-segfault-in-pgsql_stmt_execute-when-postgres-is-down.patch b/debian/patches/fix-segfault-in-pgsql_stmt_execute-when-postgres-is-down.patch
deleted file mode 100644
index 7b424c5..0000000
--- a/debian/patches/fix-segfault-in-pgsql_stmt_execute-when-postgres-is-down.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ext/pdo_pgsql/pgsql_statement.c
-+++ b/ext/pdo_pgsql/pgsql_statement.c
-@@ -184,7 +184,7 @@ stmt_retry:
- 					 * chance to DEALLOCATE the prepared statements it has created. so, if we hit a 42P05 we 
- 					 * deallocate it and retry ONCE (thies 2005.12.15)
- 					 */
--					if (!strcmp(sqlstate, "42P05")) {
-+					if (sqlstate && !strcmp(sqlstate, "42P05")) {
- 						char buf[100]; /* stmt_name == "pdo_crsr_%08x" */
- 						PGresult *res;
- 						snprintf(buf, sizeof(buf), "DEALLOCATE %s", S->stmt_name);
diff --git a/debian/patches/fix-segfault-when-node-is-NULL-in-simplexml.patch b/debian/patches/fix-segfault-when-node-is-NULL-in-simplexml.patch
deleted file mode 100644
index c21ae52..0000000
--- a/debian/patches/fix-segfault-when-node-is-NULL-in-simplexml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ext/simplexml/simplexml.c
-+++ b/ext/simplexml/simplexml.c
-@@ -1099,7 +1099,7 @@ static HashTable * sxe_get_prop_hash(zva
- 		if (sxe->iter.type == SXE_ITER_ELEMENT) {
- 			node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
- 		}
--		if (node->tpye != XML_ENTITY_DECL) {
-+		if (!node || node->type != XML_ENTITY_DECL) {
- 			attr = node ? (xmlAttrPtr)node->properties : NULL;
- 			zattr = NULL;
- 			test = sxe->iter.name && sxe->iter.type == SXE_ITER_ATTRLIST;
diff --git a/debian/patches/fix-segfault-when-using-several-cloned-intl-objects.patch b/debian/patches/fix-segfault-when-using-several-cloned-intl-objects.patch
deleted file mode 100644
index 0f02991..0000000
--- a/debian/patches/fix-segfault-when-using-several-cloned-intl-objects.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- a/ext/intl/collator/collator_class.c
-+++ b/ext/intl/collator/collator_class.c
-@@ -29,6 +29,7 @@
- #include <unicode/ucol.h>
- 
- zend_class_entry *Collator_ce_ptr = NULL;
-+static zend_object_handlers Collator_handlers;
- 
- /*
-  * Auxiliary functions needed by objects of 'Collator' class
-@@ -73,7 +74,7 @@ zend_object_value Collator_object_create
- 		(zend_objects_free_object_storage_t)Collator_objects_free,
- 		NULL TSRMLS_CC );
- 
--	retval.handlers = zend_get_std_object_handlers();
-+	retval.handlers = &Collator_handlers;
- 
- 	return retval;
- }
-@@ -142,6 +143,10 @@ void collator_register_Collator_class( T
- 	ce.create_object = Collator_object_create;
- 	Collator_ce_ptr = zend_register_internal_class( &ce TSRMLS_CC );
- 
-+	memcpy(&Collator_handlers, zend_get_std_object_handlers(),
-+		sizeof Collator_handlers);
-+	Collator_handlers.clone_obj = NULL;
-+
- 	/* Declare 'Collator' class properties. */
- 	if( !Collator_ce_ptr )
- 	{
---- a/ext/intl/resourcebundle/resourcebundle_class.c
-+++ b/ext/intl/resourcebundle/resourcebundle_class.c
-@@ -420,6 +420,7 @@ void resourcebundle_register_class( TSRM
- 	}
- 
- 	ResourceBundle_object_handlers = std_object_handlers;
-+	ResourceBundle_object_handlers.clone_obj	  = NULL;
- 	ResourceBundle_object_handlers.read_dimension = resourcebundle_array_get;
- 	ResourceBundle_object_handlers.count_elements = resourcebundle_array_count;
- }
---- a/ext/intl/dateformat/dateformat_class.c
-+++ b/ext/intl/dateformat/dateformat_class.c
-@@ -24,6 +24,7 @@
- #include "dateformat_attr.h"
- 
- zend_class_entry *IntlDateFormatter_ce_ptr = NULL;
-+static zend_object_handlers IntlDateFormatter_handlers;
- 
- /*
-  * Auxiliary functions needed by objects of 'IntlDateFormatter' class
-@@ -73,7 +74,7 @@ zend_object_value IntlDateFormatter_obje
- 		(zend_objects_free_object_storage_t)IntlDateFormatter_object_free,
- 		NULL TSRMLS_CC );
- 
--	retval.handlers = zend_get_std_object_handlers();
-+	retval.handlers = &IntlDateFormatter_handlers;
- 
- 	return retval;
- }
-@@ -161,6 +162,10 @@ void dateformat_register_IntlDateFormatt
- 	ce.create_object = IntlDateFormatter_object_create;
- 	IntlDateFormatter_ce_ptr = zend_register_internal_class( &ce TSRMLS_CC );
- 
-+	memcpy(&IntlDateFormatter_handlers, zend_get_std_object_handlers(),
-+		sizeof IntlDateFormatter_handlers);
-+	IntlDateFormatter_handlers.clone_obj = NULL;
-+
- 	/* Declare 'IntlDateFormatter' class properties. */
- 	if( !IntlDateFormatter_ce_ptr )
- 	{
---- a/ext/intl/msgformat/msgformat_class.c
-+++ b/ext/intl/msgformat/msgformat_class.c
-@@ -25,6 +25,7 @@
- #include "msgformat_attr.h"
- 
- zend_class_entry *MessageFormatter_ce_ptr = NULL;
-+static zend_object_handlers MessageFormatter_handlers;
- 
- /*
-  * Auxiliary functions needed by objects of 'MessageFormatter' class
-@@ -66,7 +67,7 @@ zend_object_value MessageFormatter_objec
- 		(zend_objects_free_object_storage_t)MessageFormatter_object_free,
- 		NULL TSRMLS_CC );
- 
--	retval.handlers = zend_get_std_object_handlers();
-+	retval.handlers = &MessageFormatter_handlers;
- 
- 	return retval;
- }
-@@ -135,6 +136,10 @@ void msgformat_register_class( TSRMLS_D
- 	ce.create_object = MessageFormatter_object_create;
- 	MessageFormatter_ce_ptr = zend_register_internal_class( &ce TSRMLS_CC );
- 
-+	memcpy(&MessageFormatter_handlers, zend_get_std_object_handlers(),
-+		sizeof MessageFormatter_handlers);
-+	MessageFormatter_handlers.clone_obj = NULL;
-+
- 	/* Declare 'MessageFormatter' class properties. */
- 	if( !MessageFormatter_ce_ptr )
- 	{
---- a/ext/intl/formatter/formatter_class.c
-+++ b/ext/intl/formatter/formatter_class.c
-@@ -25,6 +25,7 @@
- #include "formatter_attr.h"
- 
- zend_class_entry *NumberFormatter_ce_ptr = NULL;
-+static zend_object_handlers NumberFormatter_handlers;
- 
- /*
-  * Auxiliary functions needed by objects of 'NumberFormatter' class
-@@ -69,7 +70,7 @@ zend_object_value NumberFormatter_object
- 		(zend_objects_free_object_storage_t)NumberFormatter_object_free,
- 		NULL TSRMLS_CC );
- 
--	retval.handlers = zend_get_std_object_handlers();
-+	retval.handlers = &NumberFormatter_handlers;
- 
- 	return retval;
- }
-@@ -171,6 +172,10 @@ void formatter_register_class( TSRMLS_D
- 	ce.create_object = NumberFormatter_object_create;
- 	NumberFormatter_ce_ptr = zend_register_internal_class( &ce TSRMLS_CC );
- 
-+	memcpy(&NumberFormatter_handlers, zend_get_std_object_handlers(),
-+		sizeof NumberFormatter_handlers);
-+	NumberFormatter_handlers.clone_obj = NULL;
-+
- 	/* Declare 'NumberFormatter' class properties. */
- 	if( !NumberFormatter_ce_ptr )
- 	{
diff --git a/debian/patches/fix_crash_in__php_mssql_get_column_content_without_type.patch b/debian/patches/fix_crash_in__php_mssql_get_column_content_without_type.patch
index 4d199af..c3930fe 100644
--- a/debian/patches/fix_crash_in__php_mssql_get_column_content_without_type.patch
+++ b/debian/patches/fix_crash_in__php_mssql_get_column_content_without_type.patch
@@ -1,8 +1,8 @@
 --- a/ext/mssql/php_mssql.c
 +++ b/ext/mssql/php_mssql.c
-@@ -1091,6 +1091,14 @@ static void php_mssql_get_column_content
- 		unsigned char *res_buf;
- 		int res_length = dbdatlen(mssql_ptr->link, offset);
+@@ -1099,6 +1099,14 @@ static void php_mssql_get_column_content
+ 			return;
+ 		}
  
 +		if (res_length == 0) {
 +			ZVAL_NULL(result);
diff --git a/debian/patches/libtool2.2.patch b/debian/patches/libtool2.2.patch
index f471b20..ecda872 100644
--- a/debian/patches/libtool2.2.patch
+++ b/debian/patches/libtool2.2.patch
@@ -1,5 +1,5 @@
---- pkg-php.orig/scripts/phpize.in
-+++ pkg-php/scripts/phpize.in
+--- a/scripts/phpize.in
++++ b/scripts/phpize.in
 @@ -5,10 +5,16 @@ prefix='@prefix@'
  exec_prefix="`eval echo @exec_prefix@`"
  phpdir="$prefix/lib/php5/build"
diff --git a/debian/patches/page_size_fixes.patch b/debian/patches/page_size_fixes.patch
index 4513a64..24f5422 100644
--- a/debian/patches/page_size_fixes.patch
+++ b/debian/patches/page_size_fixes.patch
@@ -75,7 +75,7 @@ Last-Update: 2010-02-17
  /* }}} */
  
  PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) = php_register_internal_extensions;
-@@ -1192,6 +1194,17 @@ PHPAPI int php_stream_open_for_zend_ex(c
+@@ -1194,6 +1196,17 @@ PHPAPI int php_stream_open_for_zend_ex(c
  	char *p;
  	size_t len, mapped_len;
  	php_stream *stream = php_stream_open_wrapper((char *)filename, "rb", mode, &handle->opened_path);
@@ -93,7 +93,7 @@ Last-Update: 2010-02-17
  
  	if (stream) {
  		handle->filename = (char*)filename;
-@@ -1204,7 +1217,7 @@ PHPAPI int php_stream_open_for_zend_ex(c
+@@ -1206,7 +1219,7 @@ PHPAPI int php_stream_open_for_zend_ex(c
  		memset(&handle->handle.stream.mmap, 0, sizeof(handle->handle.stream.mmap));
  		len = php_zend_stream_fsizer(stream TSRMLS_CC);
  		if (len != 0
diff --git a/debian/patches/series b/debian/patches/series
index d97bb4f..4301c57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,14 +50,6 @@ session_save_path.patch
 php-fpm-man-section-and-cleanup.patch
 fpm-config.patch
 fix_crash_in__php_mssql_get_column_content_without_type.patch
-bug53070.patch
-fix-crash-with-entity-declarations-in-simplexml.patch
-fix-integer-overflow-in-SdnToJulian.patch
-fix-leak-and-possible-crash-introduced-by-the-null-poisoning-patch.patch
-fix-memory-leak-inside-highlight_string.patch
-fix-segfault-in-pgsql_stmt_execute-when-postgres-is-down.patch
-fix-segfault-when-node-is-NULL-in-simplexml.patch
-fix-segfault-when-using-several-cloned-intl-objects.patch
 php-fpm-sysconfdir.patch
 configure-as-needed.patch
 lp564920-fix-big-files.patch
diff --git a/debian/patches/suhosin.patch b/debian/patches/suhosin.patch
index 7ea1ba2..9b960ef 100644
--- a/debian/patches/suhosin.patch
+++ b/debian/patches/suhosin.patch
@@ -154,9 +154,9 @@ the following modifications have been made:
  
  ZEND_API void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
  
-@@ -771,6 +774,16 @@ ZEND_API void zend_save_error_handling(z
- ZEND_API void zend_replace_error_handling(zend_error_handling_t error_handling, zend_class_entry *exception_class, zend_error_handling *current TSRMLS_DC);
- ZEND_API void zend_restore_error_handling(zend_error_handling *saved TSRMLS_DC);
+@@ -774,6 +777,16 @@ ZEND_API void zend_restore_error_handlin
+ #define DEBUG_BACKTRACE_PROVIDE_OBJECT (1<<0)
+ #define DEBUG_BACKTRACE_IGNORE_ARGS    (1<<1)
  
 +#if SUHOSIN_PATCH
 +#include "suhosin_globals.h"
@@ -173,15 +173,6 @@ the following modifications have been made:
  /*
 --- a/Zend/zend_alloc.c
 +++ b/Zend/zend_alloc.c
-@@ -18,7 +18,7 @@
-    +----------------------------------------------------------------------+
- */
- 
--/* $Id: zend_alloc.c 301262 2010-07-14 10:27:08Z dmitry $ */
-+/* $Id: zend_alloc.c 294518 2010-02-04 09:48:02Z pajoye $ */
- 
- #include "zend.h"
- #include "zend_alloc.h"
 @@ -32,6 +32,10 @@
  # include <unistd.h>
  #endif
@@ -218,7 +209,7 @@ the following modifications have been made:
  static zend_mm_storage* zend_mm_mem_dummy_init(void *params)
  {
  	return malloc(sizeof(zend_mm_storage));
-@@ -328,13 +336,28 @@ static const zend_mm_mem_handlers mem_ha
+@@ -332,13 +340,28 @@ static const zend_mm_mem_handlers mem_ha
  #define	MEM_BLOCK_GUARD  0x2A8FCC84
  #define	MEM_BLOCK_LEAK   0x6C5E8F2D
  
@@ -249,7 +240,7 @@ the following modifications have been made:
  } zend_mm_block_info;
  
  #if ZEND_DEBUG
-@@ -408,7 +431,7 @@ typedef struct _zend_mm_free_block {
+@@ -412,7 +435,7 @@ typedef struct _zend_mm_free_block {
  # define ZEND_MM_CACHE_STAT 0
  #endif
  
@@ -258,7 +249,7 @@ the following modifications have been made:
  	int                 use_zend_alloc;
  	void               *(*_malloc)(size_t);
  	void                (*_free)(void*);
-@@ -443,6 +466,9 @@ struct _zend_mm_heap {
+@@ -447,6 +470,9 @@ struct _zend_mm_heap {
  		int miss;
  	} cache_stat[ZEND_MM_NUM_BUCKETS+1];
  #endif
@@ -268,7 +259,7 @@ the following modifications have been made:
  };
  
  #define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \
-@@ -516,18 +542,31 @@ static unsigned int _zend_mm_cookie = 0;
+@@ -520,18 +546,31 @@ static unsigned int _zend_mm_cookie = 0;
  /* optimized access */
  #define ZEND_MM_FREE_BLOCK_SIZE(b)		(b)->info._size
  
@@ -303,7 +294,7 @@ the following modifications have been made:
  
  #define ZEND_MM_BUCKET_INDEX(true_size)		((true_size>>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2))
  
-@@ -589,6 +628,44 @@ static unsigned int _zend_mm_cookie = 0;
+@@ -593,6 +632,44 @@ static unsigned int _zend_mm_cookie = 0;
  
  #endif
  
@@ -348,7 +339,7 @@ the following modifications have been made:
  
  #if ZEND_MM_HEAP_PROTECTION
  
-@@ -711,7 +788,7 @@ static inline unsigned int zend_mm_low_b
+@@ -715,7 +792,7 @@ static inline unsigned int zend_mm_low_b
  #endif
  }
  
@@ -357,7 +348,7 @@ the following modifications have been made:
  {
  	zend_mm_free_block *prev, *next;
  
-@@ -721,14 +798,14 @@ static inline void zend_mm_add_to_rest_l
+@@ -725,14 +802,14 @@ static inline void zend_mm_add_to_rest_l
  		mm_block->parent = NULL;
  	}
  
@@ -378,7 +369,7 @@ the following modifications have been made:
  {
  	size_t size;
  	size_t index;
-@@ -745,7 +822,7 @@ static inline void zend_mm_add_to_free_l
+@@ -749,7 +826,7 @@ static inline void zend_mm_add_to_free_l
  		if (!*p) {
  			*p = mm_block;
  			mm_block->parent = p;
@@ -387,7 +378,7 @@ the following modifications have been made:
  			heap->large_free_bitmap |= (ZEND_MM_LONG_CONST(1) << index);
  		} else {
  			size_t m;
-@@ -758,15 +835,15 @@ static inline void zend_mm_add_to_free_l
+@@ -762,15 +839,15 @@ static inline void zend_mm_add_to_free_l
  					if (!*p) {
  						*p = mm_block;
  						mm_block->parent = p;
@@ -408,7 +399,7 @@ the following modifications have been made:
  					mm_block->parent = NULL;
  					break;
  				}
-@@ -778,27 +855,33 @@ static inline void zend_mm_add_to_free_l
+@@ -782,27 +859,33 @@ static inline void zend_mm_add_to_free_l
  		index = ZEND_MM_BUCKET_INDEX(size);
  
  		prev = ZEND_MM_SMALL_FREE_BUCKET(heap, index);
@@ -450,7 +441,7 @@ the following modifications have been made:
  #if ZEND_MM_SAFE_UNLINKING
  		if (UNEXPECTED(next != mm_block)) {
  			zend_mm_panic("zend_mm_heap corrupted");
-@@ -837,14 +920,21 @@ subst_block:
+@@ -841,14 +924,21 @@ subst_block:
  		}
  	} else {
  
@@ -475,7 +466,7 @@ the following modifications have been made:
  
  		if (EXPECTED(ZEND_MM_SMALL_SIZE(ZEND_MM_FREE_BLOCK_SIZE(mm_block)))) {
  			if (EXPECTED(prev == next)) {
-@@ -860,7 +950,7 @@ subst_block:
+@@ -864,7 +954,7 @@ subst_block:
  	}
  }
  
@@ -484,7 +475,7 @@ the following modifications have been made:
  {
  	zend_mm_free_block* p;
  	int i;
-@@ -878,12 +968,19 @@ static inline void zend_mm_init(zend_mm_
+@@ -882,12 +972,19 @@ static inline void zend_mm_init(zend_mm_
  #endif
  	p = ZEND_MM_SMALL_FREE_BUCKET(heap, 0);
  	for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
@@ -507,7 +498,7 @@ the following modifications have been made:
  }
  
  static void zend_mm_del_segment(zend_mm_heap *heap, zend_mm_segment *segment)
-@@ -904,12 +1001,13 @@ static void zend_mm_free_cache(zend_mm_h
+@@ -908,12 +1005,13 @@ static void zend_mm_free_cache(zend_mm_h
  	int i;
  
  	for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
@@ -523,7 +514,7 @@ the following modifications have been made:
  				zend_mm_block *next_block = ZEND_MM_NEXT_BLOCK(mm_block);
  
  				heap->cached -= size;
-@@ -1005,14 +1103,20 @@ static void zend_mm_random(unsigned char
+@@ -1009,14 +1107,20 @@ static void zend_mm_random(unsigned char
  /* }}} */
  #endif
  
@@ -545,7 +536,7 @@ the following modifications have been made:
  
  #if 0
  	int i;
-@@ -1046,6 +1150,12 @@ ZEND_API zend_mm_heap *zend_mm_startup_e
+@@ -1050,6 +1154,12 @@ ZEND_API zend_mm_heap *zend_mm_startup_e
  	}
  #endif
  
@@ -558,7 +549,7 @@ the following modifications have been made:
  	if (zend_mm_low_bit(block_size) != zend_mm_high_bit(block_size)) {
  		fprintf(stderr, "'block_size' must be a power of two\n");
  /* See http://support.microsoft.com/kb/190351 */
-@@ -1087,12 +1197,12 @@ ZEND_API zend_mm_heap *zend_mm_startup_e
+@@ -1097,12 +1207,12 @@ ZEND_API zend_mm_heap *zend_mm_startup_e
  	heap->reserve = NULL;
  	heap->reserve_size = reserve_size;
  	if (reserve_size > 0) {
@@ -573,7 +564,7 @@ the following modifications have been made:
  
  		*mm_heap = *heap;
  
-@@ -1100,22 +1210,22 @@ ZEND_API zend_mm_heap *zend_mm_startup_e
+@@ -1110,22 +1220,22 @@ ZEND_API zend_mm_heap *zend_mm_startup_e
  		orig = ZEND_MM_SMALL_FREE_BUCKET(heap, 0);
  		for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
  			q = p;
@@ -603,7 +594,7 @@ the following modifications have been made:
  
  		free(heap);
  		heap = mm_heap;
-@@ -1123,7 +1233,11 @@ ZEND_API zend_mm_heap *zend_mm_startup_e
+@@ -1133,7 +1243,11 @@ ZEND_API zend_mm_heap *zend_mm_startup_e
  	return heap;
  }
  
@@ -616,7 +607,7 @@ the following modifications have been made:
  {
  	int i;
  	size_t seg_size;
-@@ -1193,6 +1307,27 @@ ZEND_API zend_mm_heap *zend_mm_startup(v
+@@ -1203,6 +1317,27 @@ ZEND_API zend_mm_heap *zend_mm_startup(v
  	return heap;
  }
  
@@ -644,7 +635,7 @@ the following modifications have been made:
  #if ZEND_DEBUG
  static long zend_mm_find_leaks(zend_mm_segment *segment, zend_mm_block *b)
  {
-@@ -1561,7 +1696,11 @@ static int zend_mm_check_heap(zend_mm_he
+@@ -1571,7 +1706,11 @@ static int zend_mm_check_heap(zend_mm_he
  }
  #endif
  
@@ -657,7 +648,7 @@ the following modifications have been made:
  {
  	zend_mm_storage *storage;
  	zend_mm_segment *segment;
-@@ -1571,7 +1710,7 @@ ZEND_API void zend_mm_shutdown(zend_mm_h
+@@ -1581,7 +1720,7 @@ ZEND_API void zend_mm_shutdown(zend_mm_h
  	if (heap->reserve) {
  #if ZEND_DEBUG
  		if (!silent) {
@@ -666,7 +657,7 @@ the following modifications have been made:
  		}
  #endif
  		heap->reserve = NULL;
-@@ -1654,12 +1793,23 @@ ZEND_API void zend_mm_shutdown(zend_mm_h
+@@ -1664,12 +1803,23 @@ ZEND_API void zend_mm_shutdown(zend_mm_h
  		heap->size = 0;
  		heap->peak = 0;
  		if (heap->reserve_size) {
@@ -691,7 +682,7 @@ the following modifications have been made:
  static void zend_mm_safe_error(zend_mm_heap *heap,
  	const char *format,
  	size_t limit,
-@@ -1670,7 +1820,11 @@ static void zend_mm_safe_error(zend_mm_h
+@@ -1680,7 +1830,11 @@ static void zend_mm_safe_error(zend_mm_h
  	size_t size)
  {
  	if (heap->reserve) {
@@ -703,7 +694,7 @@ the following modifications have been made:
  		heap->reserve = NULL;
  	}
  	if (heap->overflow == 0) {
-@@ -1745,7 +1899,7 @@ static zend_mm_free_block *zend_mm_searc
+@@ -1755,7 +1909,7 @@ static zend_mm_free_block *zend_mm_searc
  		p = heap->large_free_buckets[index];
  		for (m = true_size << (ZEND_MM_NUM_BUCKETS - index); ; m <<= 1) {
  			if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) {
@@ -712,7 +703,7 @@ the following modifications have been made:
  			} else if (ZEND_MM_FREE_BLOCK_SIZE(p) >= true_size &&
  			           ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) {
  				best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
-@@ -1769,7 +1923,7 @@ static zend_mm_free_block *zend_mm_searc
+@@ -1779,7 +1933,7 @@ static zend_mm_free_block *zend_mm_searc
  
  		for (p = rst; p; p = p->child[p->child[0] != NULL]) {
  			if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) {
@@ -721,7 +712,7 @@ the following modifications have been made:
  			} else if (ZEND_MM_FREE_BLOCK_SIZE(p) > true_size &&
  			           ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) {
  				best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
-@@ -1778,7 +1932,7 @@ static zend_mm_free_block *zend_mm_searc
+@@ -1788,7 +1942,7 @@ static zend_mm_free_block *zend_mm_searc
  		}
  
  		if (best_fit) {
@@ -730,7 +721,7 @@ the following modifications have been made:
  		}
  		bitmap = bitmap >> 1;
  		if (!bitmap) {
-@@ -1794,9 +1948,12 @@ static zend_mm_free_block *zend_mm_searc
+@@ -1804,9 +1958,12 @@ static zend_mm_free_block *zend_mm_searc
  			best_fit = p;
  		}
  	}
@@ -744,7 +735,7 @@ the following modifications have been made:
  static void *_zend_mm_alloc_int(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
  {
  	zend_mm_free_block *best_fit;
-@@ -1806,7 +1963,7 @@ static void *_zend_mm_alloc_int(zend_mm_
+@@ -1816,7 +1973,7 @@ static void *_zend_mm_alloc_int(zend_mm_
  	size_t segment_size;
  	zend_mm_segment *segment;
  	int keep_rest = 0;
@@ -753,7 +744,7 @@ the following modifications have been made:
  	if (EXPECTED(ZEND_MM_SMALL_SIZE(true_size))) {
  		size_t index = ZEND_MM_BUCKET_INDEX(true_size);
  		size_t bitmap;
-@@ -1821,9 +1978,14 @@ static void *_zend_mm_alloc_int(zend_mm_
+@@ -1831,9 +1988,14 @@ static void *_zend_mm_alloc_int(zend_mm_
  			heap->cache_stat[index].count--;
  			heap->cache_stat[index].hit++;
  #endif
@@ -769,7 +760,7 @@ the following modifications have been made:
  			ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
  			ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
  			return ZEND_MM_DATA_OF(best_fit);
-@@ -1837,7 +1999,7 @@ static void *_zend_mm_alloc_int(zend_mm_
+@@ -1847,7 +2009,7 @@ static void *_zend_mm_alloc_int(zend_mm_
  		if (bitmap) {
  			/* Found some "small" free block that can be used */
  			index += zend_mm_low_bit(bitmap);
@@ -778,7 +769,7 @@ the following modifications have been made:
  #if ZEND_MM_CACHE_STAT
  			heap->cache_stat[ZEND_MM_NUM_BUCKETS].hit++;
  #endif
-@@ -1852,7 +2014,7 @@ static void *_zend_mm_alloc_int(zend_mm_
+@@ -1862,7 +2024,7 @@ static void *_zend_mm_alloc_int(zend_mm_
  	best_fit = zend_mm_search_large_block(heap, true_size);
  
  	if (!best_fit && heap->real_size >= heap->limit - heap->block_size) {
@@ -787,7 +778,7 @@ the following modifications have been made:
  		size_t best_size = -1;
  
  		while (p != ZEND_MM_REST_BUCKET(heap)) {
-@@ -1864,7 +2026,7 @@ static void *_zend_mm_alloc_int(zend_mm_
+@@ -1874,7 +2036,7 @@ static void *_zend_mm_alloc_int(zend_mm_
  				best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
  				best_fit = p;
  			}
@@ -796,7 +787,7 @@ the following modifications have been made:
  		}
  	}
  
-@@ -1963,13 +2125,19 @@ zend_mm_finished_searching_for_block:
+@@ -1973,13 +2135,19 @@ zend_mm_finished_searching_for_block:
  
  	ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1);
  
@@ -817,7 +808,7 @@ the following modifications have been made:
  	return ZEND_MM_DATA_OF(best_fit);
  }
  
-@@ -1986,19 +2154,26 @@ static void _zend_mm_free_int(zend_mm_he
+@@ -1996,19 +2164,26 @@ static void _zend_mm_free_int(zend_mm_he
  
  	mm_block = ZEND_MM_HEADER_OF(p);
  	size = ZEND_MM_BLOCK_SIZE(mm_block);
@@ -846,7 +837,7 @@ the following modifications have been made:
  		heap->cached += size;
  		ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED);
  #if ZEND_MM_CACHE_STAT
-@@ -2034,6 +2209,9 @@ static void _zend_mm_free_int(zend_mm_he
+@@ -2044,6 +2219,9 @@ static void _zend_mm_free_int(zend_mm_he
  	HANDLE_UNBLOCK_INTERRUPTIONS();
  }
  
@@ -856,7 +847,7 @@ the following modifications have been made:
  static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
  {
  	zend_mm_block *mm_block = ZEND_MM_HEADER_OF(p);
-@@ -2043,11 +2221,18 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2053,11 +2231,18 @@ static void *_zend_mm_realloc_int(zend_m
  	void *ptr;
  
  	if (UNEXPECTED(!p) || !ZEND_MM_VALID_PTR(p)) {
@@ -875,7 +866,7 @@ the following modifications have been made:
  	ZEND_MM_CHECK_PROTECTION(mm_block);
  
  	if (UNEXPECTED(true_size < size)) {
-@@ -2079,6 +2264,11 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2089,6 +2274,11 @@ static void *_zend_mm_realloc_int(zend_m
  			HANDLE_UNBLOCK_INTERRUPTIONS();
  		}
  		ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0);
@@ -887,7 +878,7 @@ the following modifications have been made:
  		return p;
  	}
  
-@@ -2094,17 +2284,22 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2104,17 +2294,22 @@ static void *_zend_mm_realloc_int(zend_m
  			heap->cache_stat[index].count--;
  			heap->cache_stat[index].hit++;
  #endif
@@ -914,7 +905,7 @@ the following modifications have been made:
  #endif
  
  			heap->cached -= true_size - orig_size;
-@@ -2113,14 +2308,13 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2123,14 +2318,13 @@ static void *_zend_mm_realloc_int(zend_m
  			cache = &heap->cache[index];
  
  			((zend_mm_free_block*)mm_block)->prev_free_block = *cache;
@@ -930,7 +921,7 @@ the following modifications have been made:
  			return ptr;
  		}
  	}
-@@ -2163,6 +2357,11 @@ static void *_zend_mm_realloc_int(zend_m
+@@ -2173,6 +2367,11 @@ static void *_zend_mm_realloc_int(zend_m
  				heap->peak = heap->size;
  			}
  			HANDLE_UNBLOCK_INTERRUPTIONS();
@@ -942,7 +933,7 @@ the following modifications have been made:
  			return p;
  		} else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) &&
  				   ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(next_block, ZEND_MM_FREE_BLOCK_SIZE(next_block)))) {
-@@ -2265,38 +2464,90 @@ out_of_memory:
+@@ -2275,38 +2474,90 @@ out_of_memory:
  		}
  
  		HANDLE_UNBLOCK_INTERRUPTIONS();
@@ -1037,7 +1028,7 @@ the following modifications have been made:
  	if (!ZEND_MM_VALID_PTR(p)) {
  		return 0;
  	}
-@@ -2309,6 +2560,8 @@ ZEND_API size_t _zend_mm_block_size(zend
+@@ -2319,6 +2570,8 @@ ZEND_API size_t _zend_mm_block_size(zend
  #endif
  }
  
@@ -1046,7 +1037,7 @@ the following modifications have been made:
  /**********************/
  /* Allocation Manager */
  /**********************/
-@@ -2325,6 +2578,7 @@ static int alloc_globals_id;
+@@ -2335,6 +2588,7 @@ static int alloc_globals_id;
  static zend_alloc_globals alloc_globals;
  #endif
  
@@ -1054,7 +1045,7 @@ the following modifications have been made:
  ZEND_API int is_zend_mm(TSRMLS_D)
  {
  	return AG(mm_heap)->use_zend_alloc;
-@@ -2337,7 +2591,13 @@ ZEND_API void *_emalloc(size_t size ZEND
+@@ -2347,7 +2601,13 @@ ZEND_API void *_emalloc(size_t size ZEND
  	if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
  		return AG(mm_heap)->_malloc(size);
  	}
@@ -1068,7 +1059,7 @@ the following modifications have been made:
  }
  
  ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
-@@ -2348,7 +2608,13 @@ ZEND_API void _efree(void *ptr ZEND_FILE
+@@ -2358,7 +2618,13 @@ ZEND_API void _efree(void *ptr ZEND_FILE
  		AG(mm_heap)->_free(ptr);
  		return;
  	}
@@ -1083,7 +1074,7 @@ the following modifications have been made:
  }
  
  ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
-@@ -2358,7 +2624,13 @@ ZEND_API void *_erealloc(void *ptr, size
+@@ -2368,7 +2634,13 @@ ZEND_API void *_erealloc(void *ptr, size
  	if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
  		return AG(mm_heap)->_realloc(ptr, size);
  	}
@@ -1097,7 +1088,7 @@ the following modifications have been made:
  }
  
  ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
-@@ -2366,8 +2638,15 @@ ZEND_API size_t _zend_mem_block_size(voi
+@@ -2376,8 +2648,15 @@ ZEND_API size_t _zend_mem_block_size(voi
  	if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
  		return 0;
  	}
@@ -1114,7 +1105,7 @@ the following modifications have been made:
  
  #if defined(__GNUC__) && defined(i386)
  
-@@ -2438,7 +2717,7 @@ static inline size_t safe_address(size_t
+@@ -2448,7 +2727,7 @@ static inline size_t safe_address(size_t
  }
  #endif
  
@@ -1123,7 +1114,7 @@ the following modifications have been made:
  ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
  {
  	return emalloc_rel(safe_address(nmemb, size, offset));
-@@ -2551,6 +2830,7 @@ ZEND_API void shutdown_memory_manager(in
+@@ -2561,6 +2840,7 @@ ZEND_API void shutdown_memory_manager(in
  {
  	zend_mm_shutdown(AG(mm_heap), full_shutdown, silent TSRMLS_CC);
  }
@@ -1131,7 +1122,7 @@ the following modifications have been made:
  
  static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)
  {
-@@ -2575,6 +2855,7 @@ static void alloc_globals_dtor(zend_allo
+@@ -2585,6 +2865,7 @@ static void alloc_globals_dtor(zend_allo
  }
  #endif
  
@@ -1139,7 +1130,7 @@ the following modifications have been made:
  ZEND_API void start_memory_manager(TSRMLS_D)
  {
  #ifdef ZTS
-@@ -2639,6 +2920,7 @@ ZEND_API void _full_mem_check(int silent
+@@ -2649,6 +2930,7 @@ ZEND_API void _full_mem_check(int silent
  	zend_debug_alloc_output("------------------------------------------------\n");
  }
  #endif
@@ -3758,10 +3749,10 @@ the following modifications have been made:
  /* BEGIN: OPCODES */
 --- a/Zend/zend_constants.c
 +++ b/Zend/zend_constants.c
-@@ -113,6 +113,76 @@ void zend_register_standard_constants(TS
- 
- 	REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS);
+@@ -115,6 +115,76 @@ void zend_register_standard_constants(TS
  
+ 	REGISTER_MAIN_LONG_CONSTANT("DEBUG_BACKTRACE_PROVIDE_OBJECT", DEBUG_BACKTRACE_PROVIDE_OBJECT, CONST_PERSISTENT | CONST_CS);
+ 	REGISTER_MAIN_LONG_CONSTANT("DEBUG_BACKTRACE_IGNORE_ARGS", DEBUG_BACKTRACE_IGNORE_ARGS, CONST_PERSISTENT | CONST_CS);
 +#if SUHOSIN_PATCH
 +	REGISTER_MAIN_LONG_CONSTANT("S_MEMORY", S_MEMORY, CONST_PERSISTENT | CONST_CS);
 +	REGISTER_MAIN_LONG_CONSTANT("S_VARS", S_VARS, CONST_PERSISTENT | CONST_CS);
@@ -3861,7 +3852,7 @@ the following modifications have been made:
 --- a/Zend/zend_hash.c
 +++ b/Zend/zend_hash.c
 @@ -20,6 +20,7 @@
- /* $Id: zend_hash.c 303364 2010-09-14 14:26:37Z johannes $ */
+ /* $Id: zend_hash.c 306939 2011-01-01 02:19:59Z felipe $ */
  
  #include "zend.h"
 +#include "zend_compile.h"
@@ -4609,7 +4600,7 @@ the following modifications have been made:
  
  #if !HAVE_UNISTD_H || (!defined(_SC_PAGESIZE) && !defined(_SC_PAGE_SIZE))
  # if HAVE_SYS_MMAN_H
-@@ -490,7 +493,7 @@ PHP_INI_BEGIN()
+@@ -492,7 +495,7 @@ PHP_INI_BEGIN()
  	STD_PHP_INI_ENTRY("extension_dir",			PHP_EXTENSION_DIR,		PHP_INI_SYSTEM,		OnUpdateStringUnempty,	extension_dir,			php_core_globals,	core_globals)
  	STD_PHP_INI_ENTRY("include_path",			PHP_INCLUDE_PATH,		PHP_INI_ALL,		OnUpdateStringUnempty,	include_path,			php_core_globals,	core_globals)
  	PHP_INI_ENTRY("max_execution_time",			"30",		PHP_INI_ALL,			OnUpdateTimeout)
@@ -4618,7 +4609,7 @@ the following modifications have been made:
  	STD_PHP_INI_ENTRY("safe_mode_exec_dir",		PHP_SAFE_MODE_EXEC_DIR,	PHP_INI_SYSTEM,		OnUpdateString,			safe_mode_exec_dir,		php_core_globals,	core_globals)
  
  	STD_PHP_INI_BOOLEAN("file_uploads",			"1",		PHP_INI_SYSTEM,		OnUpdateBool,			file_uploads,			php_core_globals,	core_globals)
-@@ -1791,6 +1794,10 @@ void dummy_invalid_parameter_handler(
+@@ -1794,6 +1797,10 @@ void dummy_invalid_parameter_handler(
  }
  #endif
  
@@ -4629,7 +4620,7 @@ the following modifications have been made:
  /* {{{ php_module_startup
   */
  int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_modules, uint num_additional_modules)
-@@ -1835,6 +1842,10 @@ int php_module_startup(sapi_module_struc
+@@ -1838,6 +1845,10 @@ int php_module_startup(sapi_module_struc
  	tsrm_ls = ts_resource(0);
  #endif
  
@@ -4640,7 +4631,7 @@ the following modifications have been made:
  	module_shutdown = 0;
  	module_startup = 1;
  	sapi_initialize_empty_request(TSRMLS_C);
-@@ -1954,7 +1965,11 @@ int php_module_startup(sapi_module_struc
+@@ -1957,7 +1968,11 @@ int php_module_startup(sapi_module_struc
  	REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_SCAN_DIR", PHP_CONFIG_FILE_SCAN_DIR, sizeof(PHP_CONFIG_FILE_SCAN_DIR)-1, CONST_PERSISTENT | CONST_CS);
  	REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS);
  	REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1, CONST_PERSISTENT | CONST_CS);
@@ -5611,17 +5602,17 @@ the following modifications have been made:
  							}
 +#if SUHOSIN_PATCH
  #if ZEND_DEBUG
--							php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+							php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+-							php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++							php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
  #else
--							php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+							php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+-							php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++							php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
 +#endif
 +#else
 +  #if ZEND_DEBUG
-+  							php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++  							php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
 +  #else
-+  							php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++  							php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
 +  #endif
  #endif
  							php_request_shutdown((void *) 0);
@@ -5632,55 +5623,55 @@ the following modifications have been made:
  				}
  
  				request_started = 1;
--				php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2010 The PHP Group\n%s",
+-				php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2011 The PHP Group\n%s",
 +				php_printf("PHP %s "
 +#if SUHOSIN_PATCH
 +                                "with Suhosin-Patch "
 +#endif
-+				        "(%s) (built: %s %s) %s\nCopyright (c) 1997-2009 The PHP Group\n%s",
++				        "(%s) (built: %s %s) %s\nCopyright (c) 1997-2011 The PHP Group\n%s",
  					PHP_VERSION, sapi_module.name, __DATE__, __TIME__,
  #if ZEND_DEBUG && defined(HAVE_GCOV)
  					"(DEBUG GCOV)",
 --- a/sapi/litespeed/lsapi_main.c
 +++ b/sapi/litespeed/lsapi_main.c
-@@ -545,11 +545,19 @@ static int cli_main( int argc, char * ar
- 				break;
- 			case 'v':
- 				if (php_request_startup(TSRMLS_C) != FAILURE) {
+@@ -710,10 +710,18 @@ static int cli_main( int argc, char * ar
+                 break;
+             case 'v':
+                 if (php_request_startup(TSRMLS_C) != FAILURE) {
 +#if SUHOSIN_PATCH
+ #if ZEND_DEBUG
+-                    php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++					php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ #else
+-                    php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++					php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++#endif
++#else
 +#if ZEND_DEBUG
-+					php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++                    php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
 +#else
-+					php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++                    php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
 +#endif
-+#else
- #if ZEND_DEBUG
- 					php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
- #else
- 					php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
  #endif
-+#endif
  #ifdef PHP_OUTPUT_NEWAPI
                      php_output_end_all(TSRMLS_C);
- #else
 --- a/sapi/milter/php_milter.c
 +++ b/sapi/milter/php_milter.c
 @@ -1111,7 +1111,11 @@ int main(int argc, char *argv[])
  				}
  				SG(headers_sent) = 1;
  				SG(request_info).no_headers = 1;
--				php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
 +#if SUHOSIN_PATCH
-+				php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++				php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
 +#else
-+				php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ 				php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
 +#endif
  				php_end_ob_buffers(1 TSRMLS_CC);
  				exit(1);
  				break;
 --- a/win32/build/config.w32
 +++ b/win32/build/config.w32
-@@ -325,7 +325,7 @@ ADD_SOURCES("Zend", "zend_language_parse
+@@ -328,7 +328,7 @@ ADD_SOURCES("Zend", "zend_language_parse
  	zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
  	zend_object_handlers.c zend_objects_API.c \
  	zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c \
@@ -5689,7 +5680,7 @@ the following modifications have been made:
  
  if (VCVERS == 1200) {
  	AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);
-@@ -380,6 +380,7 @@ if (PHP_ZEND_MULTIBYTE == "yes") {
+@@ -385,6 +385,7 @@ if (PHP_ZEND_MULTIBYTE == "yes") {
   
  AC_DEFINE('HAVE_USLEEP', 1);
  AC_DEFINE('HAVE_STRCOLL', 1);
-- 
1.7.1

More information about the Pkg-php-commits mailing list