From 0351fd55523b8c9e437161c6334fe413280eaa6c Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Tue, 26 Feb 2013 22:24:09 -0800 Subject: [PATCH 1/4] 5.4.13 RC1 --- NEWS | 4 ++-- configure.in | 2 +- main/php_version.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 6600eed3d90b9..70c5996bbd806 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2012, PHP 5.4.13 +28 Feb 2012, PHP 5.4.13 RC1 - Core: . Fixed bug #64235 (Insteadof not work for class method in 5.4.11). @@ -40,7 +40,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 3597c24afa02f..9d4cb4ebaf824 100644 --- a/configure.in +++ b/configure.in @@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 PHP_RELEASE_VERSION=13 -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 46dbbb12c8c05..69a05ff962002 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 13 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.4.13-dev" +#define PHP_EXTRA_VERSION "RC1" +#define PHP_VERSION "5.4.13RC1" #define PHP_VERSION_ID 50413 From 993f9fbccc0b005ae987cf0b47bc1e82e51b3765 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Sat, 2 Mar 2013 15:57:00 -0800 Subject: [PATCH 2/4] Fixed timestamp update on Phar contents modification. --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 70c5996bbd806..ea008ee3d3f85 100644 --- a/NEWS +++ b/NEWS @@ -23,6 +23,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) From 00f84126d1da20124b1d037a9524925466f2fc5a Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Wed, 13 Mar 2013 22:29:53 -0700 Subject: [PATCH 3/4] 5.4.13 --- NEWS | 2 +- configure.in | 2 +- main/php_version.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index ea008ee3d3f85..e491f6b62c949 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -28 Feb 2012, PHP 5.4.13 RC1 +14 Mar 2012, PHP 5.4.13 - Core: . Fixed bug #64235 (Insteadof not work for class method in 5.4.11). diff --git a/configure.in b/configure.in index 9d4cb4ebaf824..9823ecd970ae4 100644 --- a/configure.in +++ b/configure.in @@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=4 PHP_RELEASE_VERSION=13 -PHP_EXTRA_VERSION="RC1" +PHP_EXTRA_VERSION="" 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 69a05ff962002..e23d89e078a20 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 13 -#define PHP_EXTRA_VERSION "RC1" -#define PHP_VERSION "5.4.13RC1" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.4.13" #define PHP_VERSION_ID 50413 From b381deddab10131394d1cc78fd8cc4ce73caff5e Mon Sep 17 00:00:00 2001 From: Jon Watson Date: Wed, 20 Mar 2013 11:51:15 -0700 Subject: [PATCH 4/4] Update dblib_driver.c Bugfix for issue 63638. The patch from 1 to NULL is reverted with this commit. --- ext/pdo_dblib/dblib_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c index ffc910177fdd3..2316175bd2ee1 100644 --- a/ext/pdo_dblib/dblib_driver.c +++ b/ext/pdo_dblib/dblib_driver.c @@ -315,7 +315,7 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ DBSETOPT(H->link, DBTEXTSIZE, "2147483647"); /* allow double quoted indentifiers */ - DBSETOPT(H->link, DBQUOTEDIDENT, NULL); + DBSETOPT(H->link, DBQUOTEDIDENT, 1); if (vars[3].optval && FAIL == dbuse(H->link, vars[3].optval)) { goto cleanup;