CVS update: php3/functions
| From: | sas | Date: | Mon, 24 May 1999 14:50:13 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-5938@lists.php.net to get a copy of this message | ||
Date: Monday May 24, 1999 @ 10:50
Author: sas
Update of /repository/php3/functions
In directory php:/tmp/cvs-serv11121
Modified Files:
fsock.c
Log Message:
Return data, even if there is no newline within the specified range
Index: php3/functions/fsock.c
diff -u php3/functions/fsock.c:1.99 php3/functions/fsock.c:1.100
--- php3/functions/fsock.c:1.99 Sat May 22 12:52:53 1999
+++ php3/functions/fsock.c Mon May 24 10:50:13 1999
@@ -27,7 +27,7 @@
| Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.99 1999/05/22 16:52:53 sas Exp $ */
+/* $Id: fsock.c,v 1.100 1999/05/24 14:50:13 sas Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
@@ -393,8 +393,8 @@
p = memchr(READPTR(sock), '\n', MIN(TOREAD(sock), maxlen - 1));
if(p) {
amount = (ptrdiff_t) p - (ptrdiff_t) READPTR(sock) + 1;
- } else if(sock->eof && TOREAD(sock) < maxlen) {
- amount = TOREAD(sock);
+ } else {
+ amount = MIN(TOREAD(sock), maxlen - 1);
}
if(amount > 0) {
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net