tony2001 Thu Nov 17 09:20:04 2005 EDT
Modified files: (Branch: PHP_5_0)
/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.1760.2.514&r2=1.1760.2.515&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.514 php-src/NEWS:1.1760.2.515
--- php-src/NEWS:1.1760.2.514 Wed Nov 16 06:51:51 2005
+++ php-src/NEWS Thu Nov 17 09:20:03 2005
@@ -8,6 +8,8 @@
- Fixed bug #35229 (call_user_func() crashes when arguement_stack is nearly
full). (Dmitry)
- Fixed bug #35197 (Destructor is not called). (Tony)
+- Fixed bug #35079 (stream_set_blocking(true) toggles, not enables
+ blocking). (askalski at gmail dot com, Tony)
- Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension
is compiled as shared). (Dmitry)
- Fixed bug #34996 (ImageTrueColorToPalette() crashes when ncolors is
http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.39.2.7&r2=1.39.2.8&ty=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.39.2.7
php-src/main/streams/plain_wrapper.c:1.39.2.8
--- php-src/main/streams/plain_wrapper.c:1.39.2.7 Tue May 24 06:14:05 2005
+++ php-src/main/streams/plain_wrapper.c Thu Nov 17 09:20:04 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: plain_wrapper.c,v 1.39.2.7 2005/05/24 10:14:05 tony2001 Exp $ */
+/* $Id: plain_wrapper.c,v 1.39.2.8 2005/11/17 14:20:04 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -533,7 +533,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
