[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2008-01-02 Thread changelog
changelog   Thu Jan  3 01:31:32 2008 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2915r2=1.2916diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2915 php-src/ChangeLog:1.2916
--- php-src/ChangeLog:1.2915Wed Jan  2 01:31:35 2008
+++ php-src/ChangeLog   Thu Jan  3 01:31:31 2008
@@ -1,3 +1,57 @@
+2008-01-02  Andrey Hristov  [EMAIL PROTECTED]
+
+* ext/mysqlnd/mysqlnd.c
+  ext/mysqlnd/mysqlnd.h
+  ext/mysqlnd/mysqlnd_libmysql_compat.h
+  ext/mysqlnd/mysqlnd_portability.h
+  ext/mysqlnd/mysqlnd_priv.h
+  ext/mysqlnd/mysqlnd_ps.c
+  ext/mysqlnd/mysqlnd_ps_codec.c
+  ext/mysqlnd/mysqlnd_result.c
+  ext/mysqlnd/mysqlnd_statistics.h
+  ext/mysqlnd/mysqlnd_structs.h
+  ext/mysqlnd/mysqlnd_wireprotocol.c
+  ext/mysqlnd/mysqlnd_wireprotocol.h:
+  - Fix problems with double definitions
+  - Clean up a bit a type mess - 4 types less. No need to have aliases
+for the same thing (unification is the name).
+  - New macro for Johannes mysqlnd_stmt_ro_result_metadata
+  --
+
+* (PHP_5_3)
+  ext/mysqlnd/mysqlnd.c
+  ext/mysqlnd/mysqlnd.h
+  ext/mysqlnd/mysqlnd_libmysql_compat.h
+  ext/mysqlnd/mysqlnd_portability.h
+  ext/mysqlnd/mysqlnd_priv.h
+  ext/mysqlnd/mysqlnd_ps.c
+  ext/mysqlnd/mysqlnd_ps_codec.c
+  ext/mysqlnd/mysqlnd_result.c
+  ext/mysqlnd/mysqlnd_statistics.h
+  ext/mysqlnd/mysqlnd_structs.h
+  ext/mysqlnd/mysqlnd_wireprotocol.c
+  ext/mysqlnd/mysqlnd_wireprotocol.h:
+  - Fix problems with double definitions
+  - Clean up a bit a type mess - 4 types less. No need to have aliases
+for the same thing (unification is the name).
+  - New macro for Johannes mysqlnd_stmt_ro_result_metadata
+
+2008-01-02  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  NEWS
+  ext/spl/examples/findfile.inc:
+  MFB: Fixed bug #43647 (Make FindFile use PATH_SEPARATOR instead of ;)
+
+* ext/spl/examples/findfile.inc:
+  
+  MFB: Fixed bug #43647 (Make FindFile use PATH_SEPARATOR instead of ;)
+
+* (PHP_5_3)
+  ext/spl/examples/findfile.inc:
+  
+  Fixed bug #43647 (Make FindFile use PATH_SEPARATOR instead of ;)
+
 2008-01-01  Ilia Alshanetsky  [EMAIL PROTECTED]
 
 * sapi/cli/php.1.in


[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/examples findfile.inc

2008-01-02 Thread Ilia Alshanetsky
iliaa   Wed Jan  2 19:19:32 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/spl/examples   findfile.inc 
  Log:
  
  Fixed bug #43647 (Make FindFile use PATH_SEPARATOR instead of ;)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/examples/findfile.inc?r1=1.7r2=1.7.6.1diff_format=u
Index: php-src/ext/spl/examples/findfile.inc
diff -u php-src/ext/spl/examples/findfile.inc:1.7 
php-src/ext/spl/examples/findfile.inc:1.7.6.1
--- php-src/ext/spl/examples/findfile.inc:1.7   Tue Feb  8 19:10:04 2005
+++ php-src/ext/spl/examples/findfile.inc   Wed Jan  2 19:19:31 2008
@@ -33,7 +33,7 @@
function __construct($path, $file)
{
$this-file = $file;
-   $list = split(';', $path);
+   $list = split(PATH_SEPARATOR, $path);
if (count($list) = 1) {
parent::__construct(new RecursiveIteratorIterator(new 
RecursiveDirectoryIterator($path)));
} else {

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



[PHP-CVS] cvs: php-src /ext/spl/examples findfile.inc

2008-01-02 Thread Ilia Alshanetsky
iliaa   Wed Jan  2 19:19:45 2008 UTC

  Modified files:  
/php-src/ext/spl/examples   findfile.inc 
  Log:
  
  MFB: Fixed bug #43647 (Make FindFile use PATH_SEPARATOR instead of ;)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/examples/findfile.inc?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/spl/examples/findfile.inc
diff -u php-src/ext/spl/examples/findfile.inc:1.8 
php-src/ext/spl/examples/findfile.inc:1.9
--- php-src/ext/spl/examples/findfile.inc:1.8   Tue Feb 21 23:21:53 2006
+++ php-src/ext/spl/examples/findfile.inc   Wed Jan  2 19:19:45 2008
@@ -33,7 +33,7 @@
function __construct($path, $file)
{
$this-file = $file;
-   $list = split(';', $path);
+   $list = split(PATH_SEPARATOR, $path);
if (count($list) = 1) {
parent::__construct(new RecursiveIteratorIterator(new 
RecursiveDirectoryIterator($path)));
} else {

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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/spl/examples findfile.inc

2008-01-02 Thread Ilia Alshanetsky
iliaa   Wed Jan  2 19:20:15 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/spl/examples   findfile.inc 
/php-srcNEWS 
  Log:
  MFB: Fixed bug #43647 (Make FindFile use PATH_SEPARATOR instead of ;)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/examples/findfile.inc?r1=1.7r2=1.7.4.1diff_format=u
Index: php-src/ext/spl/examples/findfile.inc
diff -u php-src/ext/spl/examples/findfile.inc:1.7 
php-src/ext/spl/examples/findfile.inc:1.7.4.1
--- php-src/ext/spl/examples/findfile.inc:1.7   Tue Feb  8 19:10:04 2005
+++ php-src/ext/spl/examples/findfile.inc   Wed Jan  2 19:20:15 2008
@@ -33,7 +33,7 @@
function __construct($path, $file)
{
$this-file = $file;
-   $list = split(';', $path);
+   $list = split(PATH_SEPARATOR, $path);
if (count($list) = 1) {
parent::__construct(new RecursiveIteratorIterator(new 
RecursiveDirectoryIterator($path)));
} else {
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1045r2=1.2027.2.547.2.1046diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1045 php-src/NEWS:1.2027.2.547.2.1046
--- php-src/NEWS:1.2027.2.547.2.1045Tue Jan  1 16:51:08 2008
+++ php-src/NEWSWed Jan  2 19:20:15 2008
@@ -5,6 +5,7 @@
 
 - Fixed bug #43663 (Extending PDO class with a __call() function doesn't 
work). 
   (David Soria Parra)
+- Fixed bug #43647 (Make FindFile use PATH_SEPARATOR instead of ;). (Ilia)
 - Fixed bug #43635 (mysql extension ingores INI settings on NULL values
   passed to mysql_connect()). (Ilia)
 - Fixed bug #43620 (Workaround for a bug inside libcurl 7.16.2 that can result 

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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd.c mysqlnd.h mysqlnd_libmysql_compat.h mysqlnd_portability.h mysqlnd_priv.h mysqlnd_ps.c mysqlnd_ps_codec.c mysqlnd_result.c mysqlnd_statistics.h my

2008-01-02 Thread Andrey Hristov
andrey  Wed Jan  2 21:14:36 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd.c mysqlnd.h mysqlnd_libmysql_compat.h 
mysqlnd_portability.h mysqlnd_priv.h 
mysqlnd_ps.c mysqlnd_ps_codec.c 
mysqlnd_result.c mysqlnd_statistics.h 
mysqlnd_structs.h mysqlnd_wireprotocol.c 
mysqlnd_wireprotocol.h 
  Log:
  - Fix problems with double definitions
  - Clean up a bit a type mess - 4 types less. No need to have aliases
for the same thing (unification is the name).
  - New macro for Johannes mysqlnd_stmt_ro_result_metadata
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.5r2=1.5.2.6diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.5 
php-src/ext/mysqlnd/mysqlnd.c:1.5.2.6
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.5   Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysqlnd/mysqlnd.c   Wed Jan  2 21:14:34 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd.c,v 1.5.2.5 2007/12/31 07:17:10 sebastian Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.6 2008/01/02 21:14:34 andrey Exp $ */
 #include php.h
 #include mysqlnd.h
 #include mysqlnd_wireprotocol.h
@@ -1283,7 +1283,7 @@
 
 
 /* {{{ mysqlnd_conn::insert_id */
-static mynd_ulonglong
+static uint64
 MYSQLND_METHOD(mysqlnd_conn, insert_id)(const MYSQLND * const conn)
 {
return conn-upsert_status.last_insert_id;
@@ -1292,7 +1292,7 @@
 
 
 /* {{{ mysqlnd_conn::affected_rows */
-static mynd_ulonglong
+static uint64
 MYSQLND_METHOD(mysqlnd_conn, affected_rows)(const MYSQLND * const conn)
 {
return conn-upsert_status.affected_rows;
@@ -1371,7 +1371,7 @@
 
 
 /* {{{ mysqlnd_conn::thread_id */
-static mynd_ulonglong
+static uint64
 MYSQLND_METHOD(mysqlnd_conn, thread_id)(const MYSQLND * const conn)
 {
return conn-thread_id;
@@ -1425,7 +1425,7 @@
}
 
SET_EMPTY_ERROR(conn-error_info);
-   conn-upsert_status.affected_rows= ~(mynd_ulonglong) 0;
+   SET_ERROR_AFF_ROWS(conn);
/*
  We are sure that there is a result set, since conn-state is set 
accordingly
  in mysqlnd_store_result() or mysqlnd_fetch_row_unbuffered()
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.h?r1=1.3.2.3r2=1.3.2.4diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.h
diff -u php-src/ext/mysqlnd/mysqlnd.h:1.3.2.3 
php-src/ext/mysqlnd/mysqlnd.h:1.3.2.4
--- php-src/ext/mysqlnd/mysqlnd.h:1.3.2.3   Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysqlnd/mysqlnd.h   Wed Jan  2 21:14:35 2008
@@ -18,12 +18,12 @@
   +--+
 */
 
-/* $Id: mysqlnd.h,v 1.3.2.3 2007/12/31 07:17:10 sebastian Exp $ */
+/* $Id: mysqlnd.h,v 1.3.2.4 2008/01/02 21:14:35 andrey Exp $ */
 
 #ifndef MYSQLND_H
 #define MYSQLND_H
 
-#define MYSQLND_VERSION mysqlnd 5.0.2-dev - 070928 - $Revision: 1.3.2.3 $
+#define MYSQLND_VERSION mysqlnd 5.0.2-dev - 070928 - $Revision: 1.3.2.4 $
 #define MYSQLND_VERSION_ID 50002
 
 /* This forces inlining of some accessor functions */
@@ -250,6 +250,7 @@
 #define mysqlnd_stmt_bind_result(stmt,bind)(stmt)-m-bind_result((stmt), 
(bind) TSRMLS_CC)
 #define mysqlnd_stmt_param_metadata(stmt)  
(stmt)-m-get_parameter_metadata((stmt))
 #define mysqlnd_stmt_result_metadata(stmt) 
(stmt)-m-get_result_metadata((stmt) TSRMLS_CC)
+#define mysqlnd_stmt_ronly_result_metadata(stmt) ((stmt)-result)
 
 #definemysqlnd_stmt_free_result(stmt)  
(stmt)-m-free_result((stmt) TSRMLS_CC)
 #definemysqlnd_stmt_close(stmt, implicit)  (stmt)-m-dtor((stmt), 
(implicit) TSRMLS_CC)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h
diff -u php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h:1.1.2.3 
php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h:1.1.2.4
--- php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h:1.1.2.3   Mon Dec 31 
07:17:10 2007
+++ php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h   Wed Jan  2 21:14:35 2008
@@ -31,7 +31,7 @@
 #define MYSQL_ROW  MYSQLND_ROW
 #define MYSQL  MYSQLND
 #define my_boolzend_bool
-#define my_ulonglong   mynd_ulonglong
+#define my_ulonglong   uint64
 
 #define MYSQL_VERSION_ID   MYSQLND_VERSION_ID
 #define MYSQL_SERVER_VERSION   MYSQLND_VERSION
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_portability.h?r1=1.4.2.2r2=1.4.2.3diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_portability.h
diff -u php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.2 
php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.3
--- 

[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd.c mysqlnd.h mysqlnd_libmysql_compat.h mysqlnd_portability.h mysqlnd_priv.h mysqlnd_ps.c mysqlnd_ps_codec.c mysqlnd_result.c mysqlnd_statistics.h mysqlnd_str

2008-01-02 Thread Andrey Hristov
andrey  Wed Jan  2 21:16:46 2008 UTC

  Modified files:  
/php-src/ext/mysqlndmysqlnd.c mysqlnd.h mysqlnd_libmysql_compat.h 
mysqlnd_portability.h mysqlnd_priv.h 
mysqlnd_ps.c mysqlnd_ps_codec.c 
mysqlnd_result.c mysqlnd_statistics.h 
mysqlnd_structs.h mysqlnd_wireprotocol.c 
mysqlnd_wireprotocol.h 
  Log:
  - Fix problems with double definitions
  - Clean up a bit a type mess - 4 types less. No need to have aliases
for the same thing (unification is the name).
  - New macro for Johannes mysqlnd_stmt_ro_result_metadata
  --
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.8 php-src/ext/mysqlnd/mysqlnd.c:1.9
--- php-src/ext/mysqlnd/mysqlnd.c:1.8   Mon Dec 31 07:12:12 2007
+++ php-src/ext/mysqlnd/mysqlnd.c   Wed Jan  2 21:16:46 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd.c,v 1.8 2007/12/31 07:12:12 sebastian Exp $ */
+/* $Id: mysqlnd.c,v 1.9 2008/01/02 21:16:46 andrey Exp $ */
 #include php.h
 #include mysqlnd.h
 #include mysqlnd_wireprotocol.h
@@ -1283,7 +1283,7 @@
 
 
 /* {{{ mysqlnd_conn::insert_id */
-static mynd_ulonglong
+static uint64
 MYSQLND_METHOD(mysqlnd_conn, insert_id)(const MYSQLND * const conn)
 {
return conn-upsert_status.last_insert_id;
@@ -1292,7 +1292,7 @@
 
 
 /* {{{ mysqlnd_conn::affected_rows */
-static mynd_ulonglong
+static uint64
 MYSQLND_METHOD(mysqlnd_conn, affected_rows)(const MYSQLND * const conn)
 {
return conn-upsert_status.affected_rows;
@@ -1371,7 +1371,7 @@
 
 
 /* {{{ mysqlnd_conn::thread_id */
-static mynd_ulonglong
+static uint64
 MYSQLND_METHOD(mysqlnd_conn, thread_id)(const MYSQLND * const conn)
 {
return conn-thread_id;
@@ -1425,7 +1425,7 @@
}
 
SET_EMPTY_ERROR(conn-error_info);
-   conn-upsert_status.affected_rows= ~(mynd_ulonglong) 0;
+   SET_ERROR_AFF_ROWS(conn);
/*
  We are sure that there is a result set, since conn-state is set 
accordingly
  in mysqlnd_store_result() or mysqlnd_fetch_row_unbuffered()
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.h?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.h
diff -u php-src/ext/mysqlnd/mysqlnd.h:1.4 php-src/ext/mysqlnd/mysqlnd.h:1.5
--- php-src/ext/mysqlnd/mysqlnd.h:1.4   Mon Dec 31 07:12:12 2007
+++ php-src/ext/mysqlnd/mysqlnd.h   Wed Jan  2 21:16:46 2008
@@ -18,12 +18,12 @@
   +--+
 */
 
-/* $Id: mysqlnd.h,v 1.4 2007/12/31 07:12:12 sebastian Exp $ */
+/* $Id: mysqlnd.h,v 1.5 2008/01/02 21:16:46 andrey Exp $ */
 
 #ifndef MYSQLND_H
 #define MYSQLND_H
 
-#define MYSQLND_VERSION mysqlnd 5.0.2-dev - 070928 - $Revision: 1.4 $
+#define MYSQLND_VERSION mysqlnd 5.0.2-dev - 070928 - $Revision: 1.5 $
 #define MYSQLND_VERSION_ID 50002
 
 /* This forces inlining of some accessor functions */
@@ -250,6 +250,7 @@
 #define mysqlnd_stmt_bind_result(stmt,bind)(stmt)-m-bind_result((stmt), 
(bind) TSRMLS_CC)
 #define mysqlnd_stmt_param_metadata(stmt)  
(stmt)-m-get_parameter_metadata((stmt))
 #define mysqlnd_stmt_result_metadata(stmt) 
(stmt)-m-get_result_metadata((stmt) TSRMLS_CC)
+#define mysqlnd_stmt_ronly_result_metadata(stmt) ((stmt)-result)
 
 #definemysqlnd_stmt_free_result(stmt)  
(stmt)-m-free_result((stmt) TSRMLS_CC)
 #definemysqlnd_stmt_close(stmt, implicit)  (stmt)-m-dtor((stmt), 
(implicit) TSRMLS_CC)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h
diff -u php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h:1.2 
php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h:1.3
--- php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h:1.2   Mon Dec 31 07:12:12 2007
+++ php-src/ext/mysqlnd/mysqlnd_libmysql_compat.h   Wed Jan  2 21:16:46 2008
@@ -31,7 +31,7 @@
 #define MYSQL_ROW  MYSQLND_ROW
 #define MYSQL  MYSQLND
 #define my_boolzend_bool
-#define my_ulonglong   mynd_ulonglong
+#define my_ulonglong   uint64
 
 #define MYSQL_VERSION_ID   MYSQLND_VERSION_ID
 #define MYSQL_SERVER_VERSION   MYSQLND_VERSION
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_portability.h?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_portability.h
diff -u php-src/ext/mysqlnd/mysqlnd_portability.h:1.6 
php-src/ext/mysqlnd/mysqlnd_portability.h:1.7
--- php-src/ext/mysqlnd/mysqlnd_portability.h:1.6   Tue Oct 16 20:58:35 2007
+++