iliaa           Fri Dec 23 14:42:50 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src    configure.in NEWS 
    /php-src/main       php_version.h 
  Log:
  Back to dev
  
  
http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.579.2.30&r2=1.579.2.31&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.30 php-src/configure.in:1.579.2.31
--- php-src/configure.in:1.579.2.30     Thu Dec 22 14:17:56 2005
+++ php-src/configure.in        Fri Dec 23 14:42:49 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.30 2005/12/22 14:17:56 iliaa Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.31 2005/12/23 14:42:49 iliaa Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -42,7 +42,7 @@
 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
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.316&r2=1.2027.2.317&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.316 php-src/NEWS:1.2027.2.317
--- php-src/NEWS:1.2027.2.316   Thu Dec 22 18:13:47 2005
+++ php-src/NEWS        Fri Dec 23 14:42:49 2005
@@ -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 @@
 - 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)
http://cvs.php.net/viewcvs.cgi/php-src/main/php_version.h?r1=1.112.2.20&r2=1.112.2.21&diff_format=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112.2.20 
php-src/main/php_version.h:1.112.2.21
--- php-src/main/php_version.h:1.112.2.20       Thu Dec 22 14:17:56 2005
+++ php-src/main/php_version.h  Fri Dec 23 14:42:49 2005
@@ -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"

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to