summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-01-20 10:38:33 -0800
committerStanislav Malyshev <stas@php.net>2015-01-20 10:38:33 -0800
commit8825311ce1e9b0c3b627ff32808dd4e0d577c136 (patch)
treefa400683919f3a7676193ee966d8f6f2f7f9dab8
parente63f7b47e1937821e75e9862284c3150e1b1d524 (diff)
downloadphp-git-8825311ce1e9b0c3b627ff32808dd4e0d577c136.tar.gz
5.4.38 next
-rw-r--r--NEWS4
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h7
3 files changed, 7 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index e4629f9584..e1e3fd108a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 20?? PHP 5.4.37
+?? ??? 20?? PHP 5.4.38
+
+22 Jan 2015 PHP 5.4.37
- Core:
. Fixed bug #68710 (Use After Free Vulnerability in PHP's unserialize()).
(CVE-2015-0231) (Stefan Esser)
diff --git a/configure.in b/configure.in
index 8700b1775a..4282fa2165 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=37
+PHP_RELEASE_VERSION=38
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 d0aab5a10c..34e91ea672 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,8 +2,7 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 37
-
+#define PHP_RELEASE_VERSION 38
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.37-dev"
-#define PHP_VERSION_ID 50437
+#define PHP_VERSION "5.4.38-dev"
+#define PHP_VERSION_ID 50438