cvs: /php3/functions fsock.c
| From: | sas | Date: | Tue, 13 Jul 1999 13:46:47 +0000 |
| Subject: | cvs: /php3/functions fsock.c | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-8448@lists.php.net to get a copy of this message | ||
sas Tue Jul 13 13:46:47 1999 EDT
Modified files:
/php3/functions fsock.c
Log:
Get rid of extra counter which could lead to wrong results and stop at maxlen - 1
Index: php3/functions/fsock.c
diff -u php3/functions/fsock.c:1.131 php3/functions/fsock.c:1.132
--- php3/functions/fsock.c:1.131 Tue Jul 13 12:33:37 1999
+++ php3/functions/fsock.c Tue Jul 13 13:46:46 1999
@@ -27,7 +27,7 @@
| Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.131 1999/07/13 16:33:37 sas Exp $ */
+/* $Id: fsock.c,v 1.132 1999/07/13 17:46:46 sas Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
@@ -602,15 +602,14 @@
char *p = NULL;
char *ret = NULL;
size_t amount = 0;
- size_t nr_read;
SOCK_FIND(sock, socket);
SEARCHCR;
if(!p) {
if(sock->is_blocked) {
- for(nr_read = 0; !p && !sock->eof && nr_read < maxlen; ) {
- nr_read += _php3_sock_read_internal(sock);
+ while(!p && !sock->eof && TOREAD(sock) < maxlen - 1) {
+ _php3_sock_read_internal(sock);
SEARCHCR;
}
} else {