summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2008-04-04 00:16:53 +0000
committerIlia Alshanetsky <iliaa@php.net>2008-04-04 00:16:53 +0000
commitcb9be83c3158a72b35803e4873de618a39370d1c (patch)
tree8638c931599fa5de0ca3ae61a37dd53fe071727d
parent62c865e21f26a199492ed451684bc3f9b5a500b0 (diff)
downloadphp-git-cb9be83c3158a72b35803e4873de618a39370d1c.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 b899d651cf..04a26c528d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? Apr 2008, PHP 5.2.6
+
03 Apr 2008, PHP 5.2.6RC4
- Fixed possible stack buffer overflow in FastCGI SAPI. (Andrei Nigmatulin)
- Fixed sending of uninitialized paddings which may contain some information.
diff --git a/configure.in b/configure.in
index c212f0a381..97b8a7feb9 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="RC4"
+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 947739aad1..ddd0742ade 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 "RC4"
-#define PHP_VERSION "5.2.6RC4"
+#define PHP_EXTRA_VERSION "RC5-dev"
+#define PHP_VERSION "5.2.6RC5-dev"
#define PHP_VERSION_ID 50206