summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-05-08 11:28:15 +0200
committerJohannes Schlüter <johannes@php.net>2012-05-08 11:28:15 +0200
commite120a0c7f30953774d3ff2ac1a14b2ab623a047c (patch)
tree1bd22e0318501e55ee99095e449c9c9cfeed3a5a
parent000e84aa88ce16deabbf61e7086fc8db63ca88aa (diff)
downloadphp-git-e120a0c7f30953774d3ff2ac1a14b2ab623a047c.tar.gz
This will be PHP 5.3.14
-rw-r--r--NEWS27
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 24 insertions, 11 deletions
diff --git a/NEWS b/NEWS
index c2b10e50dd..c354b39e8d 100644
--- a/NEWS
+++ b/NEWS
@@ -40,13 +40,19 @@ PHP NEWS
. Fixed bug #61961 (file_get_contents leaks when access empty file with
maxlen set). (Reeze)
-(merge after 5.3.11 release)
+08 May 2012, PHP 5.3.13
+- CGI
+ . Improve fix for PHP-CGI query string parameter vulnerability, CVE-2012-2311.
+ (Stas)
+
+03 May 2012, PHP 5.3.12
+- Fix PHP-CGI query string parameter vulnerability, CVE-2012-1823. (Rasmus)
+
+26 Apr 2012, PHP 5.3.11
- Core:
- . Fixed bug #61605 (header_remove() does not remove all headers).
- (Laruence)
- . Fixed bug #61541 (Segfault when using ob_* in output_callback).
- (reeze.xia@gmail.com)
+ . Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables
+ (without apache2)). (Laruence)
. Fixed bug #61273 (call_user_func_array with more than 16333 arguments
leaks / crashes). (Laruence)
. Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
@@ -93,14 +99,17 @@ PHP NEWS
. Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones)
- Fileinfo
+ . Upgraded libmagic to 5.11 (Pierre, Anatoliy)
+ . Fixed bug #61565 where php_stream_open_wrapper_ex tries to open a
+ directory descriptor under windows. (Anatoliy)
+ . Fixed bug #61566 failure caused by the posix lseek and read versions
+ under windows in cdf_read(). (Anatoliy)
. Fixed bug #61173 (Unable to detect error from finfo constructor). (Gustavo)
- Firebird Database extension (ibase):
. Fixed bug #60802 (ibase_trans() gives segfault when passing params).
- Libxml:
- . Fixed bug #61617 (Libxml tests failed(ht is already destroyed)).
- (Laruence)
. Fixed bug #61367 (open_basedir bypass using libxml RSHUTDOWN).
(Tim Starling)
@@ -123,6 +132,10 @@ PHP NEWS
- PDO_Sqlite extension:
. Add createCollation support. (Damien)
+- pgsql:
+ . Fixed bug #60718 (Compile problem with libpq (PostgreSQL 7.3 or less).
+ (Yasuo Ohgaki)
+
- Phar:
. Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL
bytes). (Nikic)
diff --git a/configure.in b/configure.in
index b257cbb399..35356d02a8 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=3
-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 358c6c010d..0b523d720a 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 13
+#define PHP_RELEASE_VERSION 14
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.3.13-dev"
-#define PHP_VERSION_ID 50313
+#define PHP_VERSION "5.3.14-dev"
+#define PHP_VERSION_ID 50314