PHP 5.6.0RC1

10 files changed, 18 insertions, 504 deletions

diff --git a/failed b/failed
index 6102a6a..7bbc6a5 100644
--- a/failed
+++ b/failed
@@ -1,56 +1,52 @@
 =====================================================================
-	FC20 i386 - June 10
+	FC20 i386 - June 19 - 5.6.0RC1
 =====================================================================
-2 FAILED TEST SUMMARY
+1 FAILED TEST SUMMARY
 ---------------------------------------------------------------------
-Bug #41523 (strtotime('0000-00-00 00:00:00') is parsed as 1999-11-30) (32 bit) [ext/date/tests/bug41523.phpt]
 Bug #64146 (serialize incorrectly saving objects when they are cloned) [ext/standard/tests/serialize/bug64146.phpt]
 =====================================================================
-	FC20 x86_64 - June 10
+	FC20 x86_64 - June 19 - 5.6.0RC1
 =====================================================================
 0 FAILED TEST SUMMARY
 ---------------------------------------------------------------------
 =====================================================================
-	FC19 i386
+	FC19 i386 - June 19 - 5.6.0RC1
 =====================================================================
-2 FAILED TEST SUMMARY
+1 FAILED TEST SUMMARY
 ---------------------------------------------------------------------
-Bug #41523 (strtotime('0000-00-00 00:00:00') is parsed as 1999-11-30) (32 bit) [ext/date/tests/bug41523.phpt]
 Bug #64146 (serialize incorrectly saving objects when they are cloned) [ext/standard/tests/serialize/bug64146.phpt]
 =====================================================================
-	FC19 x86_64  - June 10
+	FC19 x86_64 - June 19 - 5.6.0RC1
 =====================================================================
 0 FAILED TEST SUMMARY
 ---------------------------------------------------------------------
 =====================================================================
-	EL7 x86_64 - June 10
+	EL7 x86_64 - June 19 - 5.6.0RC1
 =====================================================================
 0 FAILED TEST SUMMARY
 ---------------------------------------------------------------------
 =====================================================================
-	EL6 i386 - June 10
+	EL6 i386 - June 19 - 5.6.0RC1
 =====================================================================
-2 FAILED TEST SUMMARY
+1 FAILED TEST SUMMARY
 ---------------------------------------------------------------------
-Bug #41523 (strtotime('0000-00-00 00:00:00') is parsed as 1999-11-30) (32 bit) [ext/date/tests/bug41523.phpt]
 Bug #64146 (serialize incorrectly saving objects when they are cloned) [ext/standard/tests/serialize/bug64146.phpt]
 =====================================================================
-	EL6 x86_64 - June 10
+	EL6 x86_64 - June 19 - 5.6.0RC1
 =====================================================================
 0 FAILED TEST SUMMARY
 ---------------------------------------------------------------------
 =====================================================================
-	EL5 i386 - June 10
+	EL5 i386 - June 19 - 5.6.0RC1
 =====================================================================
-3 FAILED TEST SUMMARY
+4 FAILED TEST SUMMARY
 ---------------------------------------------------------------------
-Bug #41523 (strtotime('0000-00-00 00:00:00') is parsed as 1999-11-30) (32 bit) [ext/date/tests/bug41523.phpt]
 Bug #64802: openssl_x509_parse fails to parse subject properly in some cases [ext/openssl/tests/bug64802.phpt]
 sni_server [ext/openssl/tests/sni_server.phpt]
 Specific protocol method specification [ext/openssl/tests/stream_crypto_flags_004.phpt]
 Bug #64146 (serialize incorrectly saving objects when they are cloned) [ext/standard/tests/serialize/bug64146.phpt]
 =====================================================================
-	EL5 x86_64 - June 10
+	EL5 x86_64 - June 19 - 5.6.0RC1
 =====================================================================
 3 FAILED TEST SUMMARY
 ---------------------------------------------------------------------
diff --git a/php-5.6.0-openssl.patch b/php-5.6.0-openssl.patch
deleted file mode 100644
index 4167d2d..0000000
--- a/php-5.6.0-openssl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- ext/openssl/tests/openssl_spki_verify.phpt.orig	2014-06-11 16:52:01.794416390 +0200
-+++ ext/openssl/tests/openssl_spki_verify.phpt	2014-06-11 16:53:34.629855059 +0200
-@@ -17,9 +17,7 @@
- 			   '4096'=>4096);
- 
- /* array of available hashings to test */
--$algo = array('md4'=>OPENSSL_ALGO_MD4,
--              'md5'=>OPENSSL_ALGO_MD5,
--              'sha1'=>OPENSSL_ALGO_SHA1,
-+$algo = array('sha1'=>OPENSSL_ALGO_SHA1,
- 			  'sha224'=>OPENSSL_ALGO_SHA224,
-               'sha256'=>OPENSSL_ALGO_SHA256,
-               'sha384'=>OPENSSL_ALGO_SHA384,
-@@ -58,18 +56,6 @@
- bool(true)
- bool(false)
- bool(true)
--bool(false)
--bool(true)
--bool(false)
--bool(true)
--bool(false)
--bool(true)
--bool(false)
--bool(true)
--bool(false)
--bool(true)
--bool(false)
--bool(true)
- bool(false)
- bool(true)
- bool(false)
diff --git a/php-bug67392.patch b/php-bug67392.patch
deleted file mode 100644
index ab9e1f8..0000000
--- a/php-bug67392.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6d1885342c1504a8697b41e075844b082f7b335f Mon Sep 17 00:00:00 2001
-From: Nikita Popov <nikic@php.net>
-Date: Fri, 6 Jun 2014 17:09:49 +0200
-Subject: [PATCH] Fix bug #67392: dtrace breaks argument unpack
-
----
- NEWS                | 3 +++
- Zend/zend_execute.c | 3 ++-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
-index bdf8b6e..ad92c5f 100644
---- a/Zend/zend_execute.c
-+++ b/Zend/zend_execute.c
-@@ -1490,7 +1490,8 @@ ZEND_API void execute_internal(zend_execute_data *execute_data_ptr, zend_fcall_i
- 	} else {
- 		zval **return_value_ptr = &EX_TMP_VAR(execute_data_ptr, execute_data_ptr->opline->result.var)->var.ptr;
- 		execute_data_ptr->function_state.function->internal_function.handler(
--			execute_data_ptr->opline->extended_value, *return_value_ptr, return_value_ptr,
-+			execute_data_ptr->opline->extended_value + execute_data_ptr->call->num_additional_args,
-+			*return_value_ptr, return_value_ptr,
- 			execute_data_ptr->object, return_value_used TSRMLS_CC
- 		);
- 	}
--- 
-1.9.2
-
diff --git a/php-bug67410.patch b/php-bug67410.patch
deleted file mode 100644
index 9e09d3a..0000000
--- a/php-bug67410.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e77659a8c87272e5061738a31430d2111482c426 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Tue, 10 Jun 2014 14:02:36 +0200
-Subject: [PATCH] Fixed Bug #67410 fileinfo: mconvert incorrect handling of
- truncated pascal string size
-
-Upstream
-https://github.com/file/file/commit/27a14bc7ba285a0a5ebfdb55e54001aa11932b08
----
- ext/fileinfo/libmagic/softmagic.c | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
-index 21fea6b..01e4977 100644
---- a/ext/fileinfo/libmagic/softmagic.c
-+++ b/ext/fileinfo/libmagic/softmagic.c
-@@ -881,10 +881,18 @@ mconvert(struct magic_set *ms, struct magic *m, int flip)
- 		return 1;
- 	}
- 	case FILE_PSTRING: {
--		char *ptr1 = p->s, *ptr2 = ptr1 + file_pstring_length_size(m);
-+		size_t sz = file_pstring_length_size(m);
-+		char *ptr1 = p->s, *ptr2 = ptr1 + sz;
- 		size_t len = file_pstring_get_length(m, ptr1);
--		if (len >= sizeof(p->s))
--			len = sizeof(p->s) - 1;
-+		if (len >= sizeof(p->s)) {
-+			/*
-+			 * The size of the pascal string length (sz)
-+			 * is 1, 2, or 4. We need at least 1 byte for NUL
-+			 * termination, but we've already truncated the
-+			 * string by p->s, so we need to deduct sz.
-+			 */ 
-+			len = sizeof(p->s) - sz;
-+		}
- 		while (len--)
- 			*ptr1++ = *ptr2++;
- 		*ptr1 = '\0';
--- 
-1.9.2
-
diff --git a/php-bug67411.patch b/php-bug67411.patch
deleted file mode 100644
index 27c0204..0000000
--- a/php-bug67411.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5c9f96799961818944d43b22c241cc56c215c2e4 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Tue, 10 Jun 2014 14:13:14 +0200
-Subject: [PATCH] Fixed Bug #67411 	fileinfo: cdf_check_stream_offset
- insufficient boundary check
-
-Upstream:
-https://github.com/file/file/commit/36fadd29849b8087af9f4586f89dbf74ea45be67
----
- ext/fileinfo/libmagic/cdf.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c
-index 16649f1..c9a5d50 100644
---- a/ext/fileinfo/libmagic/cdf.c
-+++ b/ext/fileinfo/libmagic/cdf.c
-@@ -277,13 +277,15 @@ cdf_check_stream_offset(const cdf_stream_t *sst, const cdf_header_t *h,
- {
- 	const char *b = (const char *)sst->sst_tab;
- 	const char *e = ((const char *)p) + tail;
-+	size_t ss = sst->sst_dirlen < h->h_min_size_standard_stream ?
-+	    CDF_SHORT_SEC_SIZE(h) : CDF_SEC_SIZE(h);
- 	(void)&line;
--	if (e >= b && (size_t)(e - b) <= CDF_SEC_SIZE(h) * sst->sst_len)
-+	if (e >= b && (size_t)(e - b) <= ss * sst->sst_len)
- 		return 0;
- 	DPRINTF(("%d: offset begin %p < end %p || %" SIZE_T_FORMAT "u"
- 	    " > %" SIZE_T_FORMAT "u [%" SIZE_T_FORMAT "u %"
- 	    SIZE_T_FORMAT "u]\n", line, b, e, (size_t)(e - b),
--	    CDF_SEC_SIZE(h) * sst->sst_len, CDF_SEC_SIZE(h), sst->sst_len));
-+	    ss * sst->sst_len, ss, sst->sst_len));
- 	errno = EFTYPE;
- 	return -1;
- }
--- 
-1.9.2
-
diff --git a/php-bug67412.patch b/php-bug67412.patch
deleted file mode 100644
index 8380dee..0000000
--- a/php-bug67412.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 40ef6e07e0b2cdced57c506e08cf18f47122292d Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Tue, 10 Jun 2014 14:22:04 +0200
-Subject: [PATCH] Bug #67412 	fileinfo: cdf_count_chain insufficient
- boundary check
-
-Upstream:
-https://github.com/file/file/commit/40bade80cbe2af1d0b2cd0420cebd5d5905a2382
----
- ext/fileinfo/libmagic/cdf.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c
-index c9a5d50..ee467a6 100644
---- a/ext/fileinfo/libmagic/cdf.c
-+++ b/ext/fileinfo/libmagic/cdf.c
-@@ -470,7 +470,8 @@ size_t
- cdf_count_chain(const cdf_sat_t *sat, cdf_secid_t sid, size_t size)
- {
- 	size_t i, j;
--	cdf_secid_t maxsector = (cdf_secid_t)(sat->sat_len * size);
-+	cdf_secid_t maxsector = (cdf_secid_t)((sat->sat_len * size)
-+	    / sizeof(maxsector));
- 
- 	DPRINTF(("Chain:"));
- 	for (j = i = 0; sid >= 0; i++, j++) {
-@@ -480,8 +481,8 @@ cdf_count_chain(const cdf_sat_t *sat, cdf_secid_t sid, size_t size)
- 			errno = EFTYPE;
- 			return (size_t)-1;
- 		}
--		if (sid > maxsector) {
--			DPRINTF(("Sector %d > %d\n", sid, maxsector));
-+		if (sid >= maxsector) {
-+			DPRINTF(("Sector %d >= %d\n", sid, maxsector));
- 			errno = EFTYPE;
- 			return (size_t)-1;
- 		}
--- 
-1.9.2
-
diff --git a/php-bug67413.patch b/php-bug67413.patch
deleted file mode 100644
index 3751e8d..0000000
--- a/php-bug67413.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 25b1dc917a53787dbb2532721ca22f3f36eb13c0 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Tue, 10 Jun 2014 14:33:37 +0200
-Subject: [PATCH] Fixed Bug #67413 	fileinfo: cdf_read_property_info
- insufficient boundary chec
-
-Upstream:
-https://github.com/file/file/commit/93e063ee374b6a75729df9e7201fb511e47e259d
-
-Adapted for C standard.
----
- ext/fileinfo/libmagic/cdf.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c
-index ee467a6..429f3b9 100644
---- a/ext/fileinfo/libmagic/cdf.c
-+++ b/ext/fileinfo/libmagic/cdf.c
-@@ -812,7 +812,11 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
- 	if (cdf_check_stream_offset(sst, h, e, 0, __LINE__) == -1)
- 		goto out;
- 	for (i = 0; i < sh.sh_properties; i++) {
--		size_t ofs = CDF_GETUINT32(p, (i << 1) + 1);
-+		size_t ofs, tail = (i << 1) + 1;
-+		if (cdf_check_stream_offset(sst, h, p, tail * sizeof(uint32_t),
-+		    __LINE__) == -1)
-+			goto out;
-+		ofs = CDF_GETUINT32(p, tail);
- 		q = (const uint8_t *)(const void *)
- 		    ((const char *)(const void *)p + ofs
- 		    - 2 * sizeof(uint32_t));
--- 
-1.9.2
-
diff --git a/php-reg67118.patch b/php-reg67118.patch
deleted file mode 100644
index 2c64c06..0000000
--- a/php-reg67118.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 1fe9f1e4f572d7b4d5a3872f41ea61e71fb563bf Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Thu, 5 Jun 2014 13:39:46 +0200
-Subject: [PATCH] Fix regression introduce in fix for bug #67118
-
-The fix was correct but break some code (at least in Horde)
-This is a temporary workaround to fix regressioni in 5.4, 5.5 and 5.6
-
-This make php_date_initialize more consistent
-- on success return 1 + time initiliazed
-- on failure return 0 + time = zero
-  which is check by DATE_CHECK_INITIALIZED by later method call
-
-Will restore consistency with other date classes in master.
----
- ext/date/php_date.c          |  6 +++---
- ext/date/tests/bug67118.phpt | 18 +++++++++---------
- 2 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/ext/date/php_date.c b/ext/date/php_date.c
-index a2bf001..595b0b0 100644
---- a/ext/date/php_date.c
-+++ b/ext/date/php_date.c
-@@ -2441,6 +2441,8 @@ PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str,
- 			err->error_messages[0].position, err->error_messages[0].character, err->error_messages[0].message);
- 	}
- 	if (err && err->error_count) {
-+		timelib_time_dtor(dateobj->time);
-+		dateobj->time = 0;
- 		return 0;
- 	}
- 
-@@ -2548,9 +2550,7 @@ PHP_METHOD(DateTime, __construct)
- 
- 	zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC);
- 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sO!", &time_str, &time_str_len, &timezone_object, date_ce_timezone)) {
--		if (!php_date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC)) {
--			ZVAL_NULL(getThis());
--		}
-+		php_date_initialize(zend_object_store_get_object(getThis() TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 1 TSRMLS_CC);
- 	}
- 	zend_restore_error_handling(&error_handling TSRMLS_CC);
- }
-diff --git a/ext/date/tests/bug67118.phpt b/ext/date/tests/bug67118.phpt
-index 6371757..973b4eb 100644
---- a/ext/date/tests/bug67118.phpt
-+++ b/ext/date/tests/bug67118.phpt
-@@ -1,5 +1,5 @@
- --TEST--
--Bug #67118 php-cgi crashes regularly on IIS 7
-+Bug #67118 crashes in DateTime when this used after failed __construct
- --INI--
- date.timezone=Europe/Berlin
- --FILE--
-@@ -12,16 +12,16 @@
- 			$tz = new DateTimeZone($tz);
- 		}
-
--		@parent::__construct($time, $tz);
-+		try {
-+			@parent::__construct($time, $tz);
-+		} catch (Exception $e) {
-+			echo "Bad date" . $this->format("Y") . "\n";
-+		}
- 	}
-
- };
-
- new mydt("Funktionsansvarig rådgivning och juridik", "UTC");
- --EXPECTF--
--Fatal error: Uncaught exception 'Exception' with message 'DateTime::__construct(): Failed to parse time string (Funktionsansvarig rådgivning och juridik) at position 0 (F): The timezone could not be found in the database' in %sbug67118.php:%d
--Stack trace:
--#0 %sbug67118.php(%d): DateTime->__construct('Funktionsansvar...', Object(DateTimeZone))
--#1 %sbug67118.php(%d): mydt->__construct('Funktionsansvar...', 'UTC')
--#2 {main}
--  thrown in %sbug67118.php on line %d
-+Warning: DateTime::format(): The DateTime object has not been correctly initialized by its constructor in %sbug67118.php on line %d
-+Bad date
---
-1.9.2
-
-From 15d8c80ead75be976c18a66b0933cf52f3e6579f Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Thu, 5 Jun 2014 14:00:00 +0200
-Subject: [PATCH] add test for previous fix
-
----
- ext/date/tests/bug67118_2.phpt | 35 +++++++++++++++++++++++++++++++++++
- 1 file changed, 35 insertions(+)
- create mode 100644 ext/date/tests/bug67118_2.phpt
-
-diff --git a/ext/date/tests/bug67118_2.phpt b/ext/date/tests/bug67118_2.phpt
-new file mode 100644
-index 0000000..b517a3b
---- /dev/null
-+++ b/ext/date/tests/bug67118_2.phpt
-@@ -0,0 +1,35 @@
-+--TEST--
-+Regression introduce in fix for Bug #67118
-+--INI--
-+date.timezone=Europe/Paris
-+--FILE--
-+<?php
-+class Foo extends DateTime {
-+    public function __construct($time = null) {
-+        $tz = new DateTimeZone('UTC');
-+        try {
-+            echo "First try\n";
-+            parent::__construct($time, $tz);
-+            return;
-+        } catch (Exception $e) {
-+            echo "Second try\n";
-+            parent::__construct($time.'C', $tz);
-+        }
-+    }
-+}
-+$date = '12 Sep 2007 15:49:12 UT';
-+var_dump(new Foo($date));
-+?>
-+Done
-+--EXPECTF--
-+First try
-+Second try
-+object(Foo)#1 (3) {
-+  ["date"]=>
-+  string(26) "2007-09-12 15:49:12.000000"
-+  ["timezone_type"]=>
-+  int(3)
-+  ["timezone"]=>
-+  string(3) "UTC"
-+}
-+Done
-\ No newline at end of file
--- 
-1.9.2
-
diff --git a/php-serialize.patch b/php-serialize.patch
deleted file mode 100644
index 4de9a30..0000000
--- a/php-serialize.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -up ./ext/spl/spl_array.c.serialize ./ext/spl/spl_array.c
---- ./ext/spl/spl_array.c.serialize	2014-06-04 03:22:06.000000000 +0200
-+++ ./ext/spl/spl_array.c	2014-06-16 09:06:10.821885032 +0200
-@@ -1749,7 +1749,6 @@ SPL_METHOD(Array, unserialize)
- 	}
- 
- 	if (buf_len == 0) {
--		zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Empty serialized string cannot be empty");
- 		return;
- 	}
- 
-diff -up ./ext/spl/spl_dllist.c.serialize ./ext/spl/spl_dllist.c
---- ./ext/spl/spl_dllist.c.serialize	2014-06-16 09:06:10.822885036 +0200
-+++ ./ext/spl/spl_dllist.c	2014-06-16 09:07:01.601098042 +0200
-@@ -1192,7 +1192,6 @@ SPL_METHOD(SplDoublyLinkedList, unserial
- 	}
- 
- 	if (buf_len == 0) {
--		zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Serialized string cannot be empty");
- 		return;
- 	}
- 
-diff -up ./ext/spl/spl_observer.c.serialize ./ext/spl/spl_observer.c
---- ./ext/spl/spl_observer.c.serialize	2014-06-04 03:22:06.000000000 +0200
-+++ ./ext/spl/spl_observer.c	2014-06-16 09:06:10.823885040 +0200
-@@ -831,7 +831,6 @@ SPL_METHOD(SplObjectStorage, unserialize
- 	}
- 
- 	if (buf_len == 0) {
--		zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC, "Empty serialized string cannot be empty");
- 		return;
- 	}
- 
-diff -up ./ext/spl/tests/ArrayObject_unserialize_empty_string.phpt.serialize ./ext/spl/tests/ArrayObject_unserialize_empty_string.phpt
---- ./ext/spl/tests/ArrayObject_unserialize_empty_string.phpt.serialize	2014-06-04 03:22:06.000000000 +0200
-+++ ./ext/spl/tests/ArrayObject_unserialize_empty_string.phpt	2014-06-16 09:06:10.824885044 +0200
-@@ -1,5 +1,5 @@
- --TEST--
--ArrayObject: test that you cannot unserialize a empty string
-+ArrayObject: test that you can unserialize a empty string
- --CREDITS--
- Havard Eide <nucleuz@gmail.com>
- #PHPTestFest2009 Norway 2009-06-09 \o/
-@@ -8,9 +8,6 @@ Havard Eide <nucleuz@gmail.com>
- $a = new ArrayObject(array());
- $a->unserialize("");
- ?>
-+Done
- --EXPECTF--
--Fatal error: Uncaught exception 'UnexpectedValueException' with message 'Empty serialized string cannot be empty' in %s.php:%d
--Stack trace:
--#0 %s(%d): ArrayObject->unserialize('')
--#1 {main}
--  thrown in %s.php on line %d
-+Done
-diff -up ./ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter3.phpt.serialize ./ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter3.phpt
---- ./ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter3.phpt.serialize	2014-06-04 03:22:06.000000000 +0200
-+++ ./ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter3.phpt	2014-06-16 09:06:10.824885044 +0200
-@@ -1,5 +1,5 @@
- --TEST--
--Check that SplObjectStorage::unserialize throws exception when NULL passed
-+Check that SplObjectStorage::unserialize doesn't throws exception when NULL passed
- --CREDITS--
- PHPNW Testfest 2009 - Simon Westcott (swestcott@gmail.com)
- --FILE--
-@@ -14,6 +14,6 @@ try {
- }
- 
- ?>
-+Done
- --EXPECTF--
--Empty serialized string cannot be empty
--
-+Done
-diff -up ./ext/spl/tests/unserialize.phpt.serialize ./ext/spl/tests/unserialize.phpt
---- ./ext/spl/tests/unserialize.phpt.serialize	2014-06-16 09:06:10.824885044 +0200
-+++ ./ext/spl/tests/unserialize.phpt	2014-06-16 09:06:10.824885044 +0200
-@@ -0,0 +1,43 @@
-+--TEST--
-+SPL: unserialize with no data (for PHPUnit)
-+--FILE--
-+<?php
-+
-+$types = array('SplDoublyLinkedList', 'SplObjectStorage', 'ArrayObject');
-+
-+foreach ($types as $type) {
-+	// serialize an empty new object
-+	$exp = serialize(new $type());
-+	// hack to instanciate an object without constructor
-+	$str = sprintf('C:%d:"%s":0:{}', strlen($type), $type);
-+	$obj = unserialize($str);
-+	var_dump($obj);
-+	// serialize result
-+	$out = serialize($obj);
-+	// both should match
-+	var_dump($exp === $out);
-+}
-+?>
-+===DONE===
-+--EXPECTF--
-+object(SplDoublyLinkedList)#%d (2) {
-+  ["flags":"SplDoublyLinkedList":private]=>
-+  int(0)
-+  ["dllist":"SplDoublyLinkedList":private]=>
-+  array(0) {
-+  }
-+}
-+bool(true)
-+object(SplObjectStorage)#%d (1) {
-+  ["storage":"SplObjectStorage":private]=>
-+  array(0) {
-+  }
-+}
-+bool(true)
-+object(ArrayObject)#%d (1) {
-+  ["storage":"ArrayObject":private]=>
-+  array(0) {
-+  }
-+}
-+bool(true)
-+===DONE===
diff --git a/php56.spec b/php56.spec
index 72e460b..329dd63 100644
--- a/php56.spec
+++ b/php56.spec
@@ -118,13 +118,13 @@
 %endif
 
 #global snapdate      201405061030
-%global rcver         beta4
+%global rcver         RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.6.0
 %if 0%{?snapdate:1}%{?rcver:1}
-Release: 0.12.%{?snapdate}%{?rcver}%{?dist}
+Release: 0.13.%{?snapdate}%{?rcver}%{?dist}
 %else
 Release: 1%{?dist}
 %endif
@@ -185,12 +185,6 @@ Patch47: php-5.4.9-phpinfo.patch
 Patch91: php-5.3.7-oci8conf.patch
 
 # Upstream fixes (100+)
-Patch100: php-reg67118.patch
-Patch101: php-bug67392.patch
-Patch102: php-bug67410.patch
-Patch103: php-bug67411.patch
-Patch104: php-bug67412.patch
-Patch105: php-bug67413.patch
 
 # Security fixes (200+)
 
@@ -199,11 +193,8 @@ Patch105: php-bug67413.patch
 Patch301: php-5.6.0-oldpcre.patch
 # see https://bugzilla.redhat.com/971416
 Patch302: php-5.6.0-noNO.patch
-# modern distro refuse to verify md4/md5 digests
-Patch303: php-5.6.0-openssl.patch
 
 # WIP
-Patch400: php-serialize.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -918,12 +909,6 @@ rm -rf ext/json
 %patch91 -p1 -b .remi-oci8
 
 # upstream patches
-%patch100 -p1 -b .reg67118
-%patch101 -p1 -b .bug67392
-%patch102 -p1 -b .bug67410
-%patch103 -p1 -b .bug67411
-%patch104 -p1 -b .bug67412
-%patch105 -p1 -b .bug67413
 
 # security patches
 
@@ -935,10 +920,8 @@ rm -rf ext/json
 %endif
 %endif
 %patch302 -p0 -b .971416
-%patch303 -p0 -b .md4md5
 
 # WIP patch
-%patch400 -p0 -b .serialize
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -1928,6 +1911,9 @@ fi
 
 
 %changelog
+* Thu Jun 19 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.13.RC1
+- php 5.6.0RC1
+
 * Mon Jun 16 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.12.beta4
 - test build for serialize