5.2.5

diff --git a/NEWS b/NEWS
index 09212c0648a84cfa30f74c0e269b69931561c392..99bee76209e0d2dcfe6ddefdb893c3be87426e31 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,19 +1,11 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? Nov 2007 , PHP 5.2.5
-- Fixed bug #43196 (array_intersect_assoc() crashes with non-array input).
-  (Jani)
-
-01 Nov 2007, PHP 5.2.5RC2
-- Added ability to control memory consumption between request using
-  ZEND_MM_COMPACT environment variable. (Dmitry)
-- Fixed bug #43137 (rmdir() and rename() do not clear statcache). (Jani)
-- Fixed bug #42773 (WSDL error causes HTTP 500 Response). (Dmitry)
-
-18 Oct 2007, PHP 5.2.5RC1
+08 Nov 2007 , PHP 5.2.5
 - Upgraded PCRE to version 7.3 (Nuno)
 - Added optional parameter $provide_object to debug_backtrace(). (Sebastian)
 - Added alpha support for imagefilter() IMG_FILTER_COLORIZE. (Pierre)
+- Added ability to control memory consumption between request using
+  ZEND_MM_COMPACT environment variable. (Dmitry)
 
 - Improved speed of array_intersect_key(), array_intersect_assoc(),
   array_uintersect_assoc(), array_diff_key(), array_diff_assoc() and
@@ -46,8 +38,11 @@ PHP                                                                        NEWS
 - Fixed htmlentities/htmlspecialchars not to accept partial multibyte
   sequences. (Stas)
 
+- Fixed bug #43196 (array_intersect_assoc() crashes with non-array input).
+  (Jani)
 - Fixed bug #43139 (PDO ignores ATTR_DEFAULT_FETCH_MODE in some cases with
   fetchAll()). (Ilia)
+- Fixed bug #43137 (rmdir() and rename() do not clear statcache). (Jani)
 - Fixed bug #43130 (Bound parameters cannot have - in their name). (Ilia)
 - Fixed bug #43099 (XMLWriter::endElement() does not check # of params).
   (Ilia)
@@ -70,6 +65,7 @@ PHP                                                                        NEWS
   then following standard syntax). (Ilia)
 - Fixed bug #42783 (pg_insert() does not accept an empty list for
   insertion). (Ilia)
+- Fixed bug #42773 (WSDL error causes HTTP 500 Response). (Dmitry)
 - Fixed bug #42772 (Storing $this in a static var fails while handling a cast
   to string). (Dmitry)
 - Fixed bug #42767 (highlight_string() truncates trailing comment). (Ilia)

diff --git a/configure.in b/configure.in
index b36a70ea672fc9d80190897c83bb122a261abd3e..bf09a03e30b870f06414b3502bff9907c51bc1d1 100644 (file)
--- 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=5
-PHP_EXTRA_VERSION="RC3-dev"
+PHP_EXTRA_VERSION=""
 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 57b59e2807921bdac97d553b742285764d2faf0e..c4cd550849b0bed763d67f1e4e971f0ed681ed65 100644 (file)
--- 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 5
-#define PHP_EXTRA_VERSION "RC3-dev"
-#define PHP_VERSION "5.2.5RC3-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.2.5"
 #define PHP_VERSION_ID 50205