CVS update: php3/functions
| From: | sas | Date: | Wed, 26 May 1999 12:45:00 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-6015@lists.php.net to get a copy of this message | ||
Date: Wednesday May 26, 1999 @ 8:45
Author: sas
Update of /repository/php3/functions
In directory php:/tmp/cvs-serv13683
Modified Files:
fsock.c
Log Message:
check correctly for '\n'
Index: php3/functions/fsock.c
diff -u php3/functions/fsock.c:1.102 php3/functions/fsock.c:1.103
--- php3/functions/fsock.c:1.102 Wed May 26 08:42:24 1999
+++ php3/functions/fsock.c Wed May 26 08:45:00 1999
@@ -27,7 +27,7 @@
| Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.102 1999/05/26 12:42:24 sas Exp $ */
+/* $Id: fsock.c,v 1.103 1999/05/26 12:45:00 sas Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
@@ -423,10 +423,12 @@
if(sock->is_blocked) {
for(nr_read = 1; !sock->eof && nr_read < maxlen; ) {
nr_read += _php3_sock_read_limited(sock, 1);
+ if((p = memchr(READPTR(sock, '\n', TOREAD(sock)))) != NULL) break;
}
+ } else {
+ p = memchr(READPTR(sock), '\n', MIN(TOREAD(sock), maxlen - 1));
}
- p = memchr(READPTR(sock), '\n', MIN(TOREAD(sock), maxlen - 1));
if(p) {
amount = (ptrdiff_t) p - (ptrdiff_t) READPTR(sock) + 1;
} else {
--
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