summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2004-03-18 15:27:28 +0000
committerAndi Gutmans <andi@php.net>2004-03-18 15:27:28 +0000
commit814000305a7689355bcb601330147a107fd96d9c (patch)
tree87d291b6fa18a9cc813eeb9061d81bdc0fc0a433
parent3d331bc64c908531d6177295e68eea2f904f04ae (diff)
downloadphp-git-814000305a7689355bcb601330147a107fd96d9c.tar.gz
- Back to RC2-dev
-rw-r--r--NEWS1
-rw-r--r--Zend/zend.h2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
4 files changed, 5 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index a45e9331d3..54dc492fe8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ????? 2004, PHP 5 Release Candidate 2
18 March 2004, PHP 5 Release Candidate 1
- Fixed numerous bugs with the just-in-time auto-global initialization, that
could cause $_SERVER, $argv/$argc and other variables not to work properly.
diff --git a/Zend/zend.h b/Zend/zend.h
index 498e671ec2..b89b54ad73 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -22,7 +22,7 @@
#ifndef ZEND_H
#define ZEND_H
-#define ZEND_VERSION "2.0.0RC1"
+#define ZEND_VERSION "2.0.0RC2-dev"
#define ZEND_ENGINE_2
diff --git a/configure.in b/configure.in
index 0335617513..4f78a426c5 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ AC_CONFIG_HEADER(main/php_config.h)
MAJOR_VERSION=5
MINOR_VERSION=0
RELEASE_VERSION=0
-EXTRA_VERSION="RC1"
+EXTRA_VERSION="RC2-dev"
VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
dnl Define where extension directories are located in the configure context
diff --git a/main/php_version.h b/main/php_version.h
index e8fe88fb12..b95a5e7439 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,5 +3,5 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 0
#define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.0.0RC1"
+#define PHP_EXTRA_VERSION "RC2-dev"
+#define PHP_VERSION "5.0.0RC2-dev"