summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2010-07-14 22:59:20 +0000
committerJohannes Schlüter <johannes@php.net>2010-07-14 22:59:20 +0000
commit8370d1a8645538d115e262240f354bd61760ae3f (patch)
tree3929bd9f8c82c118bf35e8f61431ee706a720cbd
parentc99bdaf6de51b0cb483f7a01580edfabe209e829 (diff)
downloadphp-git-8370d1a8645538d115e262240f354bd61760ae3f.tar.gz
Back to -dev
-rw-r--r--NEWS3
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 6 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 1bbc945d74..4b7cfb6cd9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? Jul 2010, PHP 5.2.14
+
+
15 Jul 2010, PHP 5.2.14RC3
- Rewrote var_export() to use smart_str rather than output buffering, prevents
data disclosure if a fatal error occurs. (Scott)
diff --git a/configure.in b/configure.in
index e9546266e0..10e108ffa5 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="RC3"
+PHP_EXTRA_VERSION="RC4-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 1604651649..26a9a2a408 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 "RC3"
-#define PHP_VERSION "5.2.14RC3"
+#define PHP_EXTRA_VERSION "RC4-dev"
+#define PHP_VERSION "5.2.14RC4-dev"
#define PHP_VERSION_ID 50214