summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2008-02-28 00:35:26 +0000
committerIlia Alshanetsky <iliaa@php.net>2008-02-28 00:35:26 +0000
commit0dd068331a2a8fd49a268e0b5c340d4f8e3df4f3 (patch)
treea63fbc28be89b116bcc4bd4402259ccd6078622a
parent743bb87a57e753c9cc08375cbd68e95dd5620b85 (diff)
downloadphp-git-0dd068331a2a8fd49a268e0b5c340d4f8e3df4f3.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 675d9e1664..a66d54c44c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? Mar 2008, PHP 5.2.6
+
27 Feb 2008, PHP 5.2.6RC1
- Fixed security issue detailed in CVE-2008-0599. (Rasmus)
- Fixed potential memleak in stream filter parameter for zlib filter (Greg)
diff --git a/configure.in b/configure.in
index 12c338d3a6..f5665b3488 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=6
-PHP_EXTRA_VERSION="RC1"
+PHP_EXTRA_VERSION="RC1-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 084434788c..d18b80b309 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 6
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.2.6RC1"
+#define PHP_EXTRA_VERSION "RC1-dev"
+#define PHP_VERSION "5.2.6RC1-dev"
#define PHP_VERSION_ID 50206