tony2001 Thu Nov 17 09:21:11 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src NEWS
/php-src/main streams.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.1247.2.920.2.78&r2=1.1247.2.920.2.79&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.78 php-src/NEWS:1.1247.2.920.2.79
--- php-src/NEWS:1.1247.2.920.2.78 Thu Nov 17 06:42:35 2005
+++ php-src/NEWS Thu Nov 17 09:21:09 2005
@@ -5,6 +5,8 @@
- Added missing safe_mode/open_basedir checks in cURL extension. (Ilia)
- Fixed bug #35257 (Calling ob_flush after creating an ob callback causes
segfault). (Tony)
+- 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 bug #35071 (Wrong fopen mode used in GD safe-mode checks). (Jani)
- Fixed bug #35067, #35063 (key(),current() need to work by reference). (Ilia)
http://cvs.php.net/diff.php/php-src/main/streams.c?r1=1.125.2.100&r2=1.125.2.100.2.1&ty=u
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.100
php-src/main/streams.c:1.125.2.100.2.1
--- php-src/main/streams.c:1.125.2.100 Tue May 24 06:14:16 2005
+++ php-src/main/streams.c Thu Nov 17 09:21:10 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.125.2.100 2005/05/24 10:14:16 tony2001 Exp $ */
+/* $Id: streams.c,v 1.125.2.100.2.1 2005/11/17 14:21:10 tony2001 Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1667,7 +1667,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
