summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-03-29 11:22:44 +0200
committerJohannes Schlüter <johannes@php.net>2012-03-29 11:22:44 +0200
commitfb124764de04ccd1249dd192d874ee04aada7dc0 (patch)
tree71610ede4b4797b29e8612e03d279025aa312ccb
parent21fa9634c19210050b130bed9f3ac77c5332080b (diff)
downloadphp-git-fb124764de04ccd1249dd192d874ee04aada7dc0.tar.gz
This will be PHP 5.3.12
-rw-r--r--NEWS4
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 8 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 8d690738de..c7cd2c7c40 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,11 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2012, PHP 5.3.12
+
?? ??? 2012, PHP 5.3.11
+(merge after 5.3.11 release)
+
- Core:
. Fixed bug #61273 (call_user_func_array with more than 16333 arguments
leaks / crashes). (Laruence)
diff --git a/configure.in b/configure.in
index d3f96b0ac9..5151f342d2 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=11
+PHP_RELEASE_VERSION=12
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 c2f3e45f9f..401ab97f4c 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 11
+#define PHP_RELEASE_VERSION 12
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.3.11-dev"
-#define PHP_VERSION_ID 50311
+#define PHP_VERSION "5.3.12-dev"
+#define PHP_VERSION_ID 50312