iliaa Sat Feb 24 15:48:40 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/main/streams transports.c
Log:
Fixed Bug #39396 (stream_set_blocking crashes on Win32).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.559&r2=1.2027.2.547.2.560&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.559 php-src/NEWS:1.2027.2.547.2.560
--- php-src/NEWS:1.2027.2.547.2.559 Fri Feb 23 16:22:19 2007
+++ php-src/NEWS Sat Feb 24 15:48:40 2007
@@ -45,6 +45,8 @@
- Fixed bug #40236 (php -a function allocation eats memory). (Dmitry)
- Fixed bug #40109 (iptcembed fails on non-jfif jpegs). (Tony)
- Fixed bug #39836 (SplObjectStorage empty after unserialize). (Marcus)
+- Fixed Bug #39396 (stream_set_blocking crashes on Win32). (Ilia, maurice at
+ iceblog dot de)
- Fixed bug #39322 (proc_terminate() destroys process resource). (Nuno)
- Fixed bug #38406 (crash when assigning objects to SimpleXML attributes).
(Tony)
- Fixed bug #37799 (ftp_ssl_connect() falls back to non-ssl connection). (Nuno)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/transports.c?r1=1.16.2.1.2.3&r2=1.16.2.1.2.4&diff_format=u
Index: php-src/main/streams/transports.c
diff -u php-src/main/streams/transports.c:1.16.2.1.2.3
php-src/main/streams/transports.c:1.16.2.1.2.4
--- php-src/main/streams/transports.c:1.16.2.1.2.3 Mon Jan 15 17:07:07 2007
+++ php-src/main/streams/transports.c Sat Feb 24 15:48:40 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: transports.c,v 1.16.2.1.2.3 2007/01/15 17:07:07 tony2001 Exp $ */
+/* $Id: transports.c,v 1.16.2.1.2.4 2007/02/24 15:48:40 iliaa Exp $ */
#include "php.h"
#include "php_streams_int.h"
@@ -139,7 +139,7 @@
if ((flags & STREAM_XPORT_SERVER) == 0) {
/* client */
- if (flags & STREAM_XPORT_CONNECT) {
+ if (flags &
(STREAM_XPORT_CONNECT|STREAM_XPORT_CONNECT_ASYNC)) {
if (-1 == php_stream_xport_connect(stream,
name, namelen,
flags &
STREAM_XPORT_CONNECT_ASYNC ? 1 : 0,
timeout, &error_text,
error_code TSRMLS_CC)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
