summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2010-11-18 14:40:49 +0000
committerIlia Alshanetsky <iliaa@php.net>2010-11-18 14:40:49 +0000
commit73d45d3ff3f20eac64ab4b18d0b0b83208319e91 (patch)
tree56b7d3994d4380319d35ef88246d6af9745d01fe
parent3594dd8ceb896a4682c53a87744e94bd9960e766 (diff)
downloadphp-git-73d45d3ff3f20eac64ab4b18d0b0b83208319e91.tar.gz
Back to dev
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index e7b5c72fcb..9bb8c9bfe8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
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 80a9c52b11..a75ab62f3d 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="RC1"
+PHP_EXTRA_VERSION="RC2-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 ef4c2ddf63..5b4cac28bf 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 "RC1"
-#define PHP_VERSION "5.2.15RC1"
+#define PHP_EXTRA_VERSION "RC2-dev"
+#define PHP_VERSION "5.2.15RC2-dev"
#define PHP_VERSION_ID 50215