cvs: php4 /main streams.c
| From: | Wez Furlong | Date: | Thu, 13 Feb 2003 21:08:05 +0000 |
| Subject: | cvs: php4 /main streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-18808@lists.php.net to get a copy of this message | ||
wez Thu Feb 13 16:08:05 2003 EDT
Modified files:
/php4/main streams.c
Log:
MFB: Fix for bug #22199
Index: php4/main/streams.c
diff -u php4/main/streams.c:1.153 php4/main/streams.c:1.154
--- php4/main/streams.c:1.153 Thu Feb 13 12:20:20 2003
+++ php4/main/streams.c Thu Feb 13 16:08:04 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.153 2003/02/13 17:20:20 wez Exp $ */
+/* $Id: streams.c,v 1.154 2003/02/13 21:08:04 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -869,14 +869,17 @@
justwrote = stream->ops->write(stream, buf, towrite TSRMLS_CC);
}
if (justwrote > 0) {
- stream->position += justwrote;
buf += justwrote;
count -= justwrote;
didwrite += justwrote;
- /* FIXME: invalidate the whole readbuffer */
- stream->writepos = 0;
- stream->readpos = 0;
+ /* Only screw with the buffer if we can seek, otherwise we lose data
+ * buffered from fifos and sockets */
+ if (stream->ops->seek && (stream->flags & PHP_STREAM_FLAG_NO_SEEK) == 0) {
+ stream->position += justwrote;
+ stream->writepos = 0;
+ stream->readpos = 0;
+ }
} else {
break;
}