5.4.40 next

diff --git a/NEWS b/NEWS
index 0ce25d00f65348cbbf6fd4f5f65cd118cf1cc000..ea3af2a8dc1aa4a1d33474b3465a68b22f10b670 100644 (file)
--- 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 5cdeb2d81eb7229e74fb6a8d29dd04e387f02df0..205d0fa2fc6228a8fdd529597812b4dd67488a9e 100644 (file)
--- 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 46f681765e940afaa31d090197787a10de496d5b..44f5a70afeac28573a341cfe8a7b87e3ed589895 100644 (file)
--- 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