jani Tue Jul 17 13:28:44 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/main/streams xp_socket.c
Log:
MFH:- Fixed bugs #36796, #36918, #41371 (stream_set_blocking() does not work)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.837&r2=1.2027.2.547.2.838&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.837 php-src/NEWS:1.2027.2.547.2.838
--- php-src/NEWS:1.2027.2.547.2.837 Tue Jul 17 12:12:26 2007
+++ php-src/NEWS Tue Jul 17 13:28:43 2007
@@ -154,6 +154,8 @@
apache child die). (isk at ecommerce dot com, Gopal, Tony)
- Fixed bug #39291 (ldap_sasl_bind() misses the sasl_authc_id parameter).
(diafour at gmail dot com, Jani)
+- Fixed bugs #36796, #36918, #41371 (stream_set_blocking() does not work).
+ (Jani)
- Fixed bug #35981 (pdo-pgsql should not use pkg-config when not present).
(Jani)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.4&r2=1.33.2.2.2.5&diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.4
php-src/main/streams/xp_socket.c:1.33.2.2.2.5
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.4 Mon Jan 1 09:36:12 2007
+++ php-src/main/streams/xp_socket.c Tue Jul 17 13:28:44 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xp_socket.c,v 1.33.2.2.2.4 2007/01/01 09:36:12 sebastian Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.5 2007/07/17 13:28:44 jani Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -281,18 +281,11 @@
}
case PHP_STREAM_OPTION_BLOCKING:
-
oldmode = sock->is_blocked;
-
- /* no need to change anything */
- if (value == oldmode)
- return oldmode;
-
if (SUCCESS == php_set_sock_blocking(sock->socket,
value TSRMLS_CC)) {
sock->is_blocked = value;
return oldmode;
}
-
return PHP_STREAM_OPTION_RETURN_ERR;
case PHP_STREAM_OPTION_READ_TIMEOUT:
@@ -751,11 +744,8 @@
/* fall through */
;
}
-
- /* fall through */
- default:
- return php_sockop_set_option(stream, option, value,
ptrparam TSRMLS_CC);
}
+ return php_sockop_set_option(stream, option, value, ptrparam TSRMLS_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
