tony2001 Thu Nov 17 09:19:40 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/main/streams plain_wrapper.c
Log:
MFH: fix #35079 (stream_set_blocking(true) toggles, not enables blocking)
patch by askalski at gmail dot com
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.196&r2=1.2027.2.197&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.196 php-src/NEWS:1.2027.2.197
--- php-src/NEWS:1.2027.2.196 Wed Nov 16 09:17:55 2005
+++ php-src/NEWS Thu Nov 17 09:19:39 2005
@@ -19,6 +19,8 @@
- Fixed bug #35142 (SOAP Client/Server Complex Object Support). (Dmitry)
- Fixed bug #35135 (PDOStatment without related PDO object may crash). (Ilia)
- Fixed bug #35091 (SoapClient leaks memory). (Dmitry)
+- Fixed bug #35079 (stream_set_blocking(true) toggles, not enables
+ blocking). (askalski at gmail dot com, Tony)
- Fixed bug #35078 (configure does not find ldap_start_tls_s). (Jani)
- Fixed bugs #35022, #35019 (Regression in the behavior of key() and current()
functions). (Ilia)
http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.52.2.1&r2=1.52.2.2&ty=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.1
php-src/main/streams/plain_wrapper.c:1.52.2.2
--- php-src/main/streams/plain_wrapper.c:1.52.2.1 Fri Aug 26 08:56:07 2005
+++ php-src/main/streams/plain_wrapper.c Thu Nov 17 09:19:40 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.1 2005/08/26 12:56:07 derick Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.2 2005/11/17 14:19:40 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -540,7 +540,7 @@
flags = fcntl(fd, F_GETFL, 0);
oldval = (flags & O_NONBLOCK) ? 0 : 1;
if (value)
- flags ^= O_NONBLOCK;
+ flags &= ~O_NONBLOCK;
else
flags |= O_NONBLOCK;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
