cvs commit

From: sas Date: Sat Jul 10 15:52:55 1999 Modified files: php3/functions/fsock.c Log message: trigger a read from feof, if necessary. I'm not 100% sure how to test for eof on blocking sockets without the danger to block the caller Index: php3/functions/fsock.c diff -u php3/functions/fsock.c:1.124 php3/functions/fsock.c:1.125 --- php3/functions/fsock.c:1.124 Sat Jul 10 13:04:00 1999 +++ php3/functions/fsock.c Sat Jul 10 15:52:54 1999 @@ -27,7 +27,7 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.124 1999/07/10 17:04:00 sas Exp $ */ +/* $Id: fsock.c,v 1.125 1999/07/10 19:52:54 sas Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif @@ -635,10 +635,15 @@ return ret; } +/* + * XXX: With blocking sockets, this blocks until data arrives, if + * TOREAD(sock) == 0 + */ + int _php3_sock_feof(int socket) { int ret = 0; - SOCK_FIND(sock, socket); + SOCK_FIND_AND_READ_MAX(1); if(!TOREAD(sock) && sock->eof) ret = 1;