cvs: /php4/ext/standard fsock.c
| From: | Andrei Zmievski | Date: | Wed, 02 Feb 2000 18:01:15 +0000 |
| Subject: | cvs: /php4/ext/standard fsock.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-9689@lists.php.net to get a copy of this message | ||
andrei Wed Feb 2 19:01:15 2000 EDT
Modified files:
/php4/ext/standard fsock.c
Log:
(php_sock_fgets) Respect timeout event.
Index: php4/ext/standard/fsock.c
diff -u php4/ext/standard/fsock.c:1.43 php4/ext/standard/fsock.c:1.44
--- php4/ext/standard/fsock.c:1.43 Tue Feb 1 21:02:44 2000
+++ php4/ext/standard/fsock.c Wed Feb 2 19:00:44 2000
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.43 2000/02/01 20:02:44 andrei Exp $ */
+/* $Id: fsock.c,v 1.44 2000/02/02 18:00:44 andrei Exp $ */
/* Synced with php 3.0 revision 1.121 1999-06-18 [ssb] */
/* Synced with php 3.0 revision 1.133 1999-07-21 [sas] */
@@ -648,7 +648,7 @@
if(!p) {
if(sock->is_blocked) {
- while(!p && !sock->eof && TOREAD(sock) < maxlen) {
+ while(!p && !sock->eof && !sock->timeout_event && TOREAD(sock)
< maxlen) {
php_sockread_internal(sock);
SEARCHCR();
}