summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-03-17 22:37:16 -0700
committerStanislav Malyshev <stas@php.net>2015-03-17 22:37:16 -0700
commit4c3b73b6dfda62c19c6273f9b4e530d421de8baf (patch)
treefe84efab62090c94c959042adabb09ad4e11648e
parentef8fc4b53d92fbfcd8ef1abbd6f2f5fe2c4a11e5 (diff)
downloadphp-git-4c3b73b6dfda62c19c6273f9b4e530d421de8baf.tar.gz
5.4.40 next
-rw-r--r--NEWS4
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 7 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 0ce25d00f6..ea3af2a8dc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2015 PHP 5.4.39
+?? ??? 2015 PHP 5.4.40
+
+19 Mar 2015 PHP 5.4.39
- Core:
. Fixed bug #68976 (Use After Free Vulnerability in unserialize()). (Stas)
diff --git a/configure.in b/configure.in
index 5cdeb2d81e..205d0fa2fc 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=39
+PHP_RELEASE_VERSION=40
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 46f681765e..44f5a70afe 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 39
+#define PHP_RELEASE_VERSION 40
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.39-dev"
-#define PHP_VERSION_ID 50439
+#define PHP_VERSION "5.4.40-dev"
+#define PHP_VERSION_ID 50440