Back to dev

diff --git a/NEWS b/NEWS
index f00ac0de3b39280fcc6a18203618cd9a8cc8cfe5..4dde03ba2bb1463b5767ad2774cc1f62bad27370 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2009, PHP 5.2.9
+- Fixed bug #46782 (fastcgi.c parse error). (Matt)
+- Fixed bug #46739 (array returned by curl_getinfo should contain content_type key). 
+  (Mikko)
+
 08 Dec 2008, PHP 5.2.8
 - Reverted bug fix #42718 that broke magic_quotes_gpc (Scott)
 

diff --git a/configure.in b/configure.in
index 226a7ebf4168a0c918ff98b4fa85fea4b465d62c..3bff1db1bedb6aae28a18652fba9ec61a989a84e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h)
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
-PHP_RELEASE_VERSION=8
-PHP_EXTRA_VERSION=""
+PHP_RELEASE_VERSION=9
+PHP_EXTRA_VERSION="-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 bc9a9c9f9880221ef75f4ba981402e5800b42b31..91fb29af94b080dcf66873128d28c2ff1ca21a5d 100644 (file)
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 2
-#define PHP_RELEASE_VERSION 8
-#define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.2.8"
-#define PHP_VERSION_ID 50208
+#define PHP_RELEASE_VERSION 9
+#define PHP_EXTRA_VERSION "-dev"
+#define PHP_VERSION "5.2.9-dev"
+#define PHP_VERSION_ID 50209