summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2010-07-01 14:39:57 +0000
committerIlia Alshanetsky <iliaa@php.net>2010-07-01 14:39:57 +0000
commit802bc19f762967a64fc18a65427690e29c68bc17 (patch)
tree64ffbd0c2e690d66c0db1c5db9a5f3098aadcd22
parente0b76f37253a7f7a5cbe8d7b7b05aea51b1546b1 (diff)
downloadphp-git-802bc19f762967a64fc18a65427690e29c68bc17.tar.gz
5.2.14RC2
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 8c4ffd9070..905466c8cd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? Jun 2010, PHP 5.2.14
+01 Jul 2010, PHP 5.2.14RC2
- Fixed SplObjectStorage unserialization problems (CVE-2010-2225). (Stas)
- Fixed bug #52163 (SplFileObject::fgetss() fails due to parameter that can't
diff --git a/configure.in b/configure.in
index f833e81a62..112b043f25 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=14
-PHP_EXTRA_VERSION="RC2-dev"
+PHP_EXTRA_VERSION="RC2"
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 70ad0f9b8f..8f5df41b1c 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 14
-#define PHP_EXTRA_VERSION "RC2-dev"
-#define PHP_VERSION "5.2.14RC2-dev"
+#define PHP_EXTRA_VERSION "RC2"
+#define PHP_VERSION "5.2.14RC2"
#define PHP_VERSION_ID 50214