Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c branches/PHP_5_3/ext/my

2010-01-18 Thread Pierre Joye
hi Andrey,

This commit breaks the build with Vc6 (http://pastie.org/782886), pls
fix it asap as we plan to release 5.3.2RC soonish.

Cheers,

On Wed, Jan 13, 2010 at 3:06 PM, Andrey Hristov and...@php.net wrote:
 andrey                                   Wed, 13 Jan 2010 14:06:02 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=293504

 Log:
 make mysqlnd's tracing API more reusable

 Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c
    U   php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h
    U   php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
    U   php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c


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




-- 
Pierre

@pierrejoye | http://blog.thepimp.net | http://www.libgd.org

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



[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/main/streams/xp_socket.c branches/PHP_5_3/NEWS branches/PHP_5_3/main/streams/xp_socket.c trunk/main/streams/xp_socket.c

2010-01-18 Thread Ilia Alshanetsky
iliaaMon, 18 Jan 2010 12:50:08 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293699

Log:
Fixed bug #50787 (stream_set_write_buffer() has no effect on socket streams).

Bug: http://bugs.php.net/50787 (Open) stream_set_write_buffer() has no effect 
on socket streams
  
Changed paths:
U   php/php-src/branches/PHP_5_2/NEWS
U   php/php-src/branches/PHP_5_2/main/streams/xp_socket.c
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/main/streams/xp_socket.c
U   php/php-src/trunk/main/streams/xp_socket.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS   2010-01-18 11:13:20 UTC (rev 293698)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-01-18 12:50:08 UTC (rev 293699)
@@ -13,6 +13,8 @@

 - Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)

+- Fixed bug #50787 (stream_set_write_buffer() has no effect on socket
+  streams). (vnegrier at optilian dot com, Ilia)
 - Fixed bug #50761 (system.multiCall crashes in xmlrpc extension). (hiroaki
   dot kawai at gmail dot com, Ilia)
 - Fixed bug #50732 (exec() adds single byte twice to $output array). (Ilia)

Modified: php/php-src/branches/PHP_5_2/main/streams/xp_socket.c
===
--- php/php-src/branches/PHP_5_2/main/streams/xp_socket.c   2010-01-18 
11:13:20 UTC (rev 293698)
+++ php/php-src/branches/PHP_5_2/main/streams/xp_socket.c   2010-01-18 
12:50:08 UTC (rev 293699)
@@ -396,6 +396,10 @@
}
 #endif

+   case PHP_STREAM_OPTION_WRITE_BUFFER:
+   php_stream_set_chunk_size(stream, 
(ptrparam ? *(size_t *)ptrparam : PHP_SOCK_CHUNK_SIZE));
+   return PHP_STREAM_OPTION_RETURN_OK;
+
default:
return PHP_STREAM_OPTION_RETURN_NOTIMPL;
}

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-01-18 11:13:20 UTC (rev 293698)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-01-18 12:50:08 UTC (rev 293699)
@@ -13,6 +13,8 @@
 - Added stream filter support to mcrypt extension (ported from
   mcrypt_filter). (Stas)

+- Fixed bug #50787 (stream_set_write_buffer() has no effect on socket
+  streams). (vnegrier at optilian dot com, Ilia)
 - Fixed bug #50761 (system.multiCall crashes in xmlrpc extension). (hiroaki
   dot kawai at gmail dot com, Ilia)
 - Fixed bug #50732 (exec() adds single byte twice to $output array). (Ilia)

Modified: php/php-src/branches/PHP_5_3/main/streams/xp_socket.c
===
--- php/php-src/branches/PHP_5_3/main/streams/xp_socket.c   2010-01-18 
11:13:20 UTC (rev 293698)
+++ php/php-src/branches/PHP_5_3/main/streams/xp_socket.c   2010-01-18 
12:50:08 UTC (rev 293699)
@@ -400,6 +400,10 @@
}
 #endif

+   case PHP_STREAM_OPTION_WRITE_BUFFER:
+   php_stream_set_chunk_size(stream, 
(ptrparam ? *(size_t *)ptrparam : PHP_SOCK_CHUNK_SIZE));
+   return PHP_STREAM_OPTION_RETURN_OK;
+
default:
return PHP_STREAM_OPTION_RETURN_NOTIMPL;
}

Modified: php/php-src/trunk/main/streams/xp_socket.c
===
--- php/php-src/trunk/main/streams/xp_socket.c  2010-01-18 11:13:20 UTC (rev 
293698)
+++ php/php-src/trunk/main/streams/xp_socket.c  2010-01-18 12:50:08 UTC (rev 
293699)
@@ -400,6 +400,10 @@
}
 #endif

+   case PHP_STREAM_OPTION_WRITE_BUFFER:
+   php_stream_set_chunk_size(stream, 
(ptrparam ? *(size_t *)ptrparam : PHP_SOCK_CHUNK_SIZE));
+   return PHP_STREAM_OPTION_RETURN_OK;
+
default:
return PHP_STREAM_OPTION_RETURN_NOTIMPL;
}

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