cvs: php4 /main streams.c
| From: | Wez Furlong | Date: | Mon, 23 Sep 2002 19:10:33 +0000 |
| Subject: | cvs: php4 /main streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-14181@lists.php.net to get a copy of this message | ||
wez Mon Sep 23 15:10:33 2002 EDT
Modified files:
/php4/main streams.c
Log:
Ensure that the seekable stream returned for include("http://") under win32
is based on a temporary file rather than a memory stream.
Index: php4/main/streams.c
diff -u php4/main/streams.c:1.79 php4/main/streams.c:1.80
--- php4/main/streams.c:1.79 Mon Sep 23 14:12:39 2002
+++ php4/main/streams.c Mon Sep 23 15:10:33 2002
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.79 2002/09/23 18:12:39 wez Exp $ */
+/* $Id: streams.c,v 1.80 2002/09/23 19:10:33 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1864,7 +1864,9 @@
if (stream != NULL && (options & STREAM_MUST_SEEK)) {
php_stream *newstream;
- switch(php_stream_make_seekable_rel(stream, &newstream, PHP_STREAM_NO_PREFERENCE)) {
+ switch(php_stream_make_seekable_rel(stream, &newstream,
+ (options & STREAM_WILL_CAST)
+ ? PHP_STREAM_PREFER_STDIO : PHP_STREAM_NO_PREFERENCE)) {
case PHP_STREAM_UNCHANGED:
return stream;
case PHP_STREAM_RELEASED: