summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2008-03-27 22:53:49 +0000
committerIlia Alshanetsky <iliaa@php.net>2008-03-27 22:53:49 +0000
commitdd040e75c36e8ca0285d12aa260832cfa0ed80fb (patch)
treeb0acc5bc4b3328c7846ddc8e31331dcd14821cf4
parent1de0c2f27c6cc79f00e74bd6132086e0fbdcc5f6 (diff)
downloadphp-git-dd040e75c36e8ca0285d12aa260832cfa0ed80fb.tar.gz
Back to dev
-rw-r--r--NEWS4
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 6 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 7e94f6efd8..64d2b15991 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-27 Mar 2008 , PHP 5.2.6RC3
+?? Apr 2008, PHP 5.2.6
+
+27 Mar 2008, PHP 5.2.6RC3
- Properly address incomplete multibyte chars inside escapeshellcmd() (Ilia,
Stefan Esser)
- Fix integer overflow in printf(). (Stas, Maksymilian Aciemowicz)
diff --git a/configure.in b/configure.in
index edeb1b9c88..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="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 18f972f1d6..c44134cfbd 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 "RC3"
-#define PHP_VERSION "5.2.6RC3"
+#define PHP_EXTRA_VERSION "RC4-dev"
+#define PHP_VERSION "5.2.6RC4-dev"
#define PHP_VERSION_ID 50206