From 2441ddf10ee7572ba305879719d6697fbcdf7a5e Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Fri, 10 Sep 2010 03:08:05 +0000 Subject: [PATCH] Fix bug #52802 (Out-of-date comment for file_get_contents/php_stream_copy_to_mem) by updating the relevant comments. --- ext/standard/file.c | 1 - main/php_streams.h | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ext/standard/file.c b/ext/standard/file.c index 47b0c03fbdf..ddbeb02642c 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -557,7 +557,6 @@ PHP_FUNCTION(file_get_contents) RETURN_FALSE; } - /* uses mmap if possible */ if ((len = php_stream_copy_to_mem(stream, &contents, maxlen, 0)) > 0) { if (PG(magic_quotes_runtime)) { diff --git a/main/php_streams.h b/main/php_streams.h index 917c027836c..99a75473f4f 100755 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -416,8 +416,8 @@ END_EXTERN_C() #define PHP_STREAM_OPTION_RETURN_ERR -1 /* problem setting option */ #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 */ +/* copy up to maxlen bytes from src to dest. If maxlen is PHP_STREAM_COPY_ALL, + * copy until eof(src). */ #define PHP_STREAM_COPY_ALL ((size_t)-1) BEGIN_EXTERN_C() @@ -428,8 +428,8 @@ PHPAPI size_t _php_stream_copy_to_stream_ex(php_stream *src, php_stream *dest, s #define php_stream_copy_to_stream_ex(src, dest, maxlen, len) _php_stream_copy_to_stream_ex((src), (dest), (maxlen), (len) STREAMS_CC TSRMLS_CC) -/* read all data from stream and put into a buffer. Caller must free buffer when done. - * The copy will use mmap if available. */ +/* read all data from stream and put into a buffer. Caller must free buffer + * when done. */ PHPAPI size_t _php_stream_copy_to_mem(php_stream *src, char **buf, size_t maxlen, int persistent STREAMS_DC TSRMLS_DC); #define php_stream_copy_to_mem(src, buf, maxlen, persistent) _php_stream_copy_to_mem((src), (buf), (maxlen), (persistent) STREAMS_CC TSRMLS_CC)