diff --git a/NEWS b/NEWS index 6600eed3d90b..e491f6b62c94 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2012, PHP 5.4.13 +14 Mar 2012, PHP 5.4.13 - Core: . Fixed bug #64235 (Insteadof not work for class method in 5.4.11). @@ -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) @@ -40,7 +43,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 3597c24afa02..9823ecd970ae 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="" 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/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c index ffc910177fdd..2316175bd2ee 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; diff --git a/main/php_version.h b/main/php_version.h index 46dbbb12c8c0..e23d89e078a2 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 "" +#define PHP_VERSION "5.4.13" #define PHP_VERSION_ID 50413