summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2010-11-18 14:38:25 +0000
committerIlia Alshanetsky <iliaa@php.net>2010-11-18 14:38:25 +0000
commit3594dd8ceb896a4682c53a87744e94bd9960e766 (patch)
treea3f716eeeed592884c370c4d6e1ae9dc0d8a1481
parent938d2a4333a1cd156f2c0356394f74313d2906ee (diff)
downloadphp-git-3594dd8ceb896a4682c53a87744e94bd9960e766.tar.gz
One more try
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 3 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 9bb8c9bfe8..e7b5c72fcb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,5 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2010, PHP 5.2.15RC2
-
18 Nov 2010, PHP 5.2.15RC1
- Fixed a possible double free in imap extension (Identified by Mateusz
Kocielski). (CVE-2010-4150). (Ilia)
diff --git a/configure.in b/configure.in
index a75ab62f3d..80a9c52b11 100644
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=2
PHP_RELEASE_VERSION=15
-PHP_EXTRA_VERSION="RC2-dev"
+PHP_EXTRA_VERSION="RC1"
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 5b4cac28bf..ef4c2ddf63 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 2
#define PHP_RELEASE_VERSION 15
-#define PHP_EXTRA_VERSION "RC2-dev"
-#define PHP_VERSION "5.2.15RC2-dev"
+#define PHP_EXTRA_VERSION "RC1"
+#define PHP_VERSION "5.2.15RC1"
#define PHP_VERSION_ID 50215