Back to dev

diff --git a/NEWS b/NEWS
index 9a4106b5f3af898103d507fad8275ebe60e1197f..90143406770b16882c0fc02c3424d551e9d651bd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-22 Dec 2006, PHP 5.1.2RC1
+?? Jan 2006, PHP 5.1.2RC2
+- Fixed bug #35781 (stream_filter_append() can cause segfault). (Tony)
+- Fixed bug #35759 (mysqli_stmt_bind_result() makes huge allocation when
+  column empty). (Andrey)
+
+22 Dec 2005, PHP 5.1.2RC1
 - Updated libsqlite in ext/sqlite to 2.8.17. (Ilia)
 - Updated libsqlite in ext/pdo_sqlite to 3.2.8. (Ilia)
 - Updated to libxml2-2.6.22 and libxslt-1.1.15 in the win32 bundle. (Rob)
@@ -33,8 +38,6 @@ PHP                                                                        NEWS
 - Fixed crash and leak in mysqli when using 4.1.x client libraries and
   connecting to 5.x server. (Andrey)
 - Fixed bug #35760 (sybase_ct doesn't compile on Solaris using old gcc). (Tony)
-- Fixed bug #35759 (mysqli_stmt_bind_result() makes huge allocation when
-  column empty). (Andrey)
 - Fixed bug #35740 (memory leak when including a directory). (Tony)
 - Fixed bug #35730 (ext/mssql + freetds: Use correct character encoding
   and allow setting it). (Frank)

diff --git a/configure.in b/configure.in
index cadf96dd503efa689b03365dde50d31f3b0b2416..853a5cd3890a4a17d262d5d099585f9224261ba1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h)
 MAJOR_VERSION=5
 MINOR_VERSION=1
 RELEASE_VERSION=2
-EXTRA_VERSION="RC1"
+EXTRA_VERSION="RC1-dev"
 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 608b347b23cae2923e33efea83cbf5925b8d11ee..0733a5cea900174082d3bfb89e4921eec218a5f5 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 1
 #define PHP_RELEASE_VERSION 2
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.1.2RC1"
+#define PHP_EXTRA_VERSION "RC2-dev"
+#define PHP_VERSION "5.1.2RC2-dev"