Merge branch 'PHP-7.2'

sgolemon · sgolemon · commit fd463cfbad66 · 2017-11-13T13:35:46.000-05:00
* PHP-7.2:
  Bugfix#75515 php://streams behaving greedily
diff --git a/ext/standard/tests/streams/stream_set_chunk_size.phpt b/ext/standard/tests/streams/stream_set_chunk_size.phpt
@@ -39,7 +39,7 @@ var_dump(fwrite($f, str_repeat('b', 3)));
 
 echo "should return previous chunk size (1)\n";
 var_dump(stream_set_chunk_size($f, 100));
-echo "should elicit 3 reads of size 100 (chunk size)\n";
+echo "should elicit one read of size 100 (chunk size)\n";
 var_dump(strlen(fread($f, 250)));
 echo "should elicit one read of size 100 (chunk size)\n";
 var_dump(strlen(fread($f, 50)));
@@ -67,15 +67,13 @@ write with size: 1
 int(3)
 should return previous chunk size (1)
 int(1)
-should elicit 3 reads of size 100 (chunk size)
-read with size: 100
-read with size: 100
+should elicit one read of size 100 (chunk size)
 read with size: 100
-int(250)
+int(100)
 should elicit one read of size 100 (chunk size)
+read with size: 100
 int(50)
 should elicit no read because there is sufficient cached data
-read with size: 100
 int(50)
 should elicit 2 writes of size 100 and one of size 50
 write with size: 100
diff --git a/main/streams/streams.c b/main/streams/streams.c
@@ -24,6 +24,7 @@
 #define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
+#include "php_memory_streams.h"
 #include "php_network.h"
 #include "php_open_temporary_file.h"
 #include "ext/standard/file.h"
@@ -704,8 +705,10 @@ PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size)
 			break;
 		}
 
-		/* just break anyway, to avoid greedy read */
-		if (!stream->wrapper || stream->wrapper->is_url) {
+		/* just break anyway, to avoid greedy read for file://, php://memory, and php://temp */
+		if ((stream->wrapper != &php_plain_files_wrapper) &&
+			(stream->ops != &php_stream_memory_ops) &&
+			(stream->ops != &php_stream_temp_ops)) {
 			break;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`#define _GNU_SOURCE`
`25`	`25`	`#include "php.h"`
`26`	`26`	`#include "php_globals.h"`
	`27`	`+#include "php_memory_streams.h"`
`27`	`28`	`#include "php_network.h"`
`28`	`29`	`#include "php_open_temporary_file.h"`
`29`	`30`	`#include "ext/standard/file.h"`
`@@ -704,8 +705,10 @@ PHPAPI size_t _php_stream_read(php_stream stream, char buf, size_t size)`
`704`	`705`	`break;`
`705`	`706`	`}`
`706`	`707`
`707`		`- /* just break anyway, to avoid greedy read */`
`708`		`- if (!stream->wrapper \|\| stream->wrapper->is_url) {`
	`708`	`+ /* just break anyway, to avoid greedy read for file://, php://memory, and php://temp */`
	`709`	`+ if ((stream->wrapper != &php_plain_files_wrapper) &&`
	`710`	`+ (stream->ops != &php_stream_memory_ops) &&`
	`711`	`+ (stream->ops != &php_stream_temp_ops)) {`
`709`	`712`	`break;`
`710`	`713`	`}`
`711`	`714`	`}`