wez Sun Feb 6 18:17:10 2005 EDT
Modified files:
/php-src/main php_streams.h
Log:
Avoid bug where stream_copy_to_stream() call for precisely 2000000 bytes would
result in entire resource being copied.
The mmap brake is already present inside mmap_range() and is set to 1MB.
http://cvs.php.net/diff.php/php-src/main/php_streams.h?r1=1.99&r2=1.100&ty=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.99 php-src/main/php_streams.h:1.100
--- php-src/main/php_streams.h:1.99 Mon Nov 15 18:43:12 2004
+++ php-src/main/php_streams.h Sun Feb 6 18:17:09 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_streams.h,v 1.99 2004/11/15 23:43:12 iliaa Exp $ */
+/* $Id: php_streams.h,v 1.100 2005/02/06 23:17:09 wez Exp $ */
#ifndef PHP_STREAMS_H
#define PHP_STREAMS_H
@@ -407,10 +407,8 @@
#define PHP_STREAM_OPTION_RETURN_NOTIMPL -2 /* underlying stream does
not implement; streams can handle it instead */
/* copy up to maxlen bytes from src to dest. If maxlen is
PHP_STREAM_COPY_ALL, copy until eof(src).
- * Uses mmap if the src is a plain file and at offset 0
- * To ensure we don't take up too much memory when reading large files, set
the default mmap length
- * at this many bytes */
-#define PHP_STREAM_COPY_ALL 2000000
+ * Uses mmap if the src is a plain file and at offset 0 */
+#define PHP_STREAM_COPY_ALL ((size_t)-1)
BEGIN_EXTERN_C()
PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest,
size_t maxlen STREAMS_DC TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
