From: Zeev Suraski <zeev@php.net>
Date: Wed, 30 Mar 2005 21:43:12 +0000 (+0000)
Subject: Roll 5.0.4
X-Git-Tag: php-5.0.4~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6118b0b7385e033ac984578aa1ff96d7b9cf75d2;p=php

Roll 5.0.4
---

diff --git a/NEWS b/NEWS
index 055ea88662..3901e17eec 100644
--- 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 ed90e6504b..8a48efb4f9 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=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 23292924eb..b9a1a69066 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 4
-#define PHP_EXTRA_VERSION "RC2-dev"
-#define PHP_VERSION "5.0.4RC2-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.0.4"