From ff209bb97cb8bdd337b9dcbfc37166465b124d3a Mon Sep 17 00:00:00 2001
From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 7 Dec 2008 19:08:35 +0000
Subject: [PATCH] Move active branch to 5.2.9

---
 NEWS               | 5 ++++-
 configure.in       | 2 +-
 main/php_version.h | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 6acb9408cbb..748c26e5455 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,13 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2009, PHP 5.2.8
+?? ??? 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)
 
+09 Dec 2008, PHP 5.2.8
+- Reverted bug fix #42718 that broke magic_quotes_gpc (Scott)
+
 04 Dec 2008, PHP 5.2.7
 - Upgraded PCRE to version 7.8 (Fixes CVE-2008-2371) (Ilia)
 - Updated timezone database to version 2008.9. (Derick)
diff --git a/configure.in b/configure.in
index ea4d198140a..3bff1db1bed 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ AC_CONFIG_HEADER(main/php_config.h)
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=2
-PHP_RELEASE_VERSION=8
+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 ef56ccc66c4..91fb29af94b 100644
--- 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_RELEASE_VERSION 9
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.2.8-dev"
-#define PHP_VERSION_ID 50208
+#define PHP_VERSION "5.2.9-dev"
+#define PHP_VERSION_ID 50209