cvs: php4(PHP_4_3) /main streams.c
| From: | Wez Furlong | Date: | Wed, 19 Mar 2003 01:34:38 +0000 |
| Subject: | cvs: php4(PHP_4_3) /main streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19685@lists.php.net to get a copy of this message | ||
wez Tue Mar 18 20:34:38 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main streams.c
Log:
Fix my fix.
# The perils of manual merging :/
Index: php4/main/streams.c
diff -u php4/main/streams.c:1.125.2.45 php4/main/streams.c:1.125.2.46
--- php4/main/streams.c:1.125.2.45 Tue Mar 18 19:18:12 2003
+++ php4/main/streams.c Tue Mar 18 20:34:38 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.125.2.45 2003/03/19 00:18:12 wez Exp $ */
+/* $Id: streams.c,v 1.125.2.46 2003/03/19 01:34:38 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1150,8 +1150,6 @@
ptr = *buf = pemalloc_rel_orig(max_len, persistent);
- max_len = step;
-
while((ret = php_stream_read(src, ptr, max_len - len))) {
len += ret;
if (len + min_room >= max_len) {