From 52d1add0fe385d0e0d8b1132edd11168eb7fe0e4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Feb 2013 14:35:34 +0100 Subject: [PATCH 1/7] add support for ppc64p7 arch (Power7 optimized) --- config.sub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sub b/config.sub index 6759825a5b7..3995776ddab 100644 --- a/config.sub +++ b/config.sub @@ -897,7 +897,7 @@ case $basic_machine in ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown From 61099f85857193c223dd62b0c5302507a77cf0ab Mon Sep 17 00:00:00 2001 From: Mike Willbanks Date: Fri, 22 Feb 2013 13:05:38 -0800 Subject: [PATCH 2/7] Bug #52861: unset fails with ArrayObject and deep arrays When checking to make into a reference write, readwrite are checked but not unset --- NEWS | 2 ++ ext/spl/spl_array.c | 2 +- ext/spl/tests/bug52861.phpt | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 ext/spl/tests/bug52861.phpt diff --git a/NEWS b/NEWS index a298c55a5a8..57bae92e6fb 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,8 @@ PHP NEWS . Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence) . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS). (patch by kriss@krizalys.com, Laruence) + . Fixed bug #52861 (unset fails with ArrayObject and deep arrays). + (Mike Willbanks) 21 Feb 2013, PHP 5.3.22 diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 7d6f31427de..77453d66734 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -408,7 +408,7 @@ static zval *spl_array_read_dimension_ex(int check_inherited, zval *object, zval /* When in a write context, * ZE has to be fooled into thinking this is in a reference set * by separating (if necessary) and returning as an is_ref=1 zval (even if refcount == 1) */ - if ((type == BP_VAR_W || type == BP_VAR_RW) && !Z_ISREF_PP(ret)) { + if ((type == BP_VAR_W || type == BP_VAR_RW || type == BP_VAR_UNSET) && !Z_ISREF_PP(ret)) { if (Z_REFCOUNT_PP(ret) > 1) { zval *newval; diff --git a/ext/spl/tests/bug52861.phpt b/ext/spl/tests/bug52861.phpt new file mode 100644 index 00000000000..30a3261c4ef --- /dev/null +++ b/ext/spl/tests/bug52861.phpt @@ -0,0 +1,22 @@ +--TEST-- +Bug #52861 (unset failes with ArrayObject and deep arrays) +--FILE-- + array('bar' => array('baz' => 'boo')))); + +unset($arrayObject['foo']['bar']['baz']); +print_r($arrayObject->getArrayCopy()); +?> +--EXPECT-- +Array +( + [foo] => Array + ( + [bar] => Array + ( + ) + + ) + +) + From 7ffb77d243897a1a9d39a6a51715d9ff3c14e02a Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Tue, 26 Feb 2013 22:20:21 -0800 Subject: [PATCH 3/7] add news for SOAP fixes --- NEWS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS b/NEWS index 5fea27afdbb..6600eed3d90 100644 --- a/NEWS +++ b/NEWS @@ -23,6 +23,11 @@ PHP NEWS . Fixed bug #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs). (Johannes) +- SOAP + . Added check that soap.wsdl_cache_dir conforms to open_basedir + (CVE-2013-1635). (Dmitry) + . Disabled external entities loading (CVE-2013-1643). (Dmitry) + - SPL: . Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence) . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS). From 31a6f8b7f443ec03cd7ff7ed155dbeafd44c8557 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Tue, 26 Feb 2013 22:25:33 -0800 Subject: [PATCH 4/7] 5.4.13 branched, now it's 5.4.14 --- NEWS | 4 +++- configure.in | 2 +- main/php_version.h | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 6600eed3d90..03dbbee097b 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? ??? 2012, PHP 5.4.14 + ?? ??? 2012, PHP 5.4.13 - Core: @@ -40,7 +42,7 @@ PHP NEWS - SNMP: . Fixed bug #64124 (IPv6 malformed). (Boris Lytochkin) -?? ??? 2012, PHP 5.4.12 +21 Feb 2012, PHP 5.4.12 - Core: . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). (Johannes) diff --git a/configure.in b/configure.in index 3597c24afa0..c0700b49166 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 -PHP_RELEASE_VERSION=13 +PHP_RELEASE_VERSION=14 PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 46dbbb12c8c..9d0b61f6213 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 -#define PHP_RELEASE_VERSION 13 +#define PHP_RELEASE_VERSION 14 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.4.13-dev" -#define PHP_VERSION_ID 50413 +#define PHP_VERSION "5.4.14-dev" +#define PHP_VERSION_ID 50414 From 8f533d2dfd1f029b5d1a811fdeac753a4dc0a7a2 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Thu, 28 Feb 2013 21:22:06 -0800 Subject: [PATCH 5/7] 5.3.23RC1 --- NEWS | 2 +- configure.in | 2 +- main/php_version.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 57bae92e6fb..5f19e6da3e9 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2013, PHP 5.3.23 +28 Feb 2013, PHP 5.3.23RC1 - SPL: . Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence) diff --git a/configure.in b/configure.in index eb7781e9d89..c461df2c76b 100644 --- a/configure.in +++ b/configure.in @@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=23 -PHP_EXTRA_VERSION="-dev" +PHP_EXTRA_VERSION="RC1" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 3a4fbe1b6bd..3add96c6634 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 23 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.3.23-dev" +#define PHP_EXTRA_VERSION "RC1" +#define PHP_VERSION "5.3.23RC1" #define PHP_VERSION_ID 50323 From 5c5bc7cf1bb8227ca4c91d7666fb2c46812c913b Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Thu, 28 Feb 2013 21:25:36 -0800 Subject: [PATCH 6/7] 5.4.24-dev --- NEWS | 2 ++ configure.in | 4 ++-- main/php_version.h | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 5f19e6da3e9..790d72d43bd 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? ??? 2013, PHP 5.3.24 + 28 Feb 2013, PHP 5.3.23RC1 - SPL: diff --git a/configure.in b/configure.in index c461df2c76b..f49e19568f7 100644 --- a/configure.in +++ b/configure.in @@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 -PHP_RELEASE_VERSION=23 -PHP_EXTRA_VERSION="RC1" +PHP_RELEASE_VERSION=24 +PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 3add96c6634..10e5b7d684d 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 -#define PHP_RELEASE_VERSION 23 -#define PHP_EXTRA_VERSION "RC1" -#define PHP_VERSION "5.3.23RC1" -#define PHP_VERSION_ID 50323 +#define PHP_RELEASE_VERSION 24 +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.3.24-dev" +#define PHP_VERSION_ID 50324 From ecf0cbdf3b985c41bd79fc9a79a50ef37d2828cc Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 1 Mar 2013 19:17:25 +0400 Subject: [PATCH 7/7] Fixed timestamp update on Phar contents modification. --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 03dbbee097b..4f29a68f01e 100644 --- a/NEWS +++ b/NEWS @@ -25,6 +25,9 @@ PHP NEWS . Fixed bug #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs). (Johannes) +- Phar: + . Fixed timestamp update on Phar contents modification. (Dmitry) + - SOAP . Added check that soap.wsdl_cache_dir conforms to open_basedir (CVE-2013-1635). (Dmitry)