Roll 5.0.4

diff --git a/NEWS b/NEWS
index 055ea886625f8e39f7ee03a2be8f9af3409fb73d..3901e17eecb749e8d20225afc4f104c10bd11b6a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-24 Mar 2005, PHP 5.0.4RC2
+31 Mar 2005, PHP 5.0.4
 - Added SNMPv2 support. (harrie)
 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
 - Added length and charsetnr for field array and object in mysqli. (Georg)

diff --git a/configure.in b/configure.in
index ed90e6504b0ebab1a067b6a3a7cab69335c3b800..8a48efb4f92661b5e273a7a7605e1cbc75d4745f 100644 (file)
--- 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=4
-EXTRA_VERSION="RC2-dev"
+EXTRA_VERSION=""
 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 23292924ebbb90d6e357d967d8a7a57c0e9685b9..b9a1a690662da1def519bfa3b882387edea57145 100644 (file)
--- 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 4
-#define PHP_EXTRA_VERSION "RC2-dev"
-#define PHP_VERSION "5.0.4RC2-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.0.4"