Merge branch 'PHP-7.0' into PHP-7.1

bwoebi · bwoebi · commit 8fcc938e56f5 · 2016-10-03T12:55:23.000+02:00
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
@@ -1322,7 +1322,7 @@ php_stream *phpdbg_stream_url_wrap_php(php_stream_wrapper *wrapper, const char *
 	}
 
 	if (!strncasecmp(path, "stdin", 6) && PHPDBG_G(stdin_file)) {
-		php_stream *stream =stream = php_stream_fopen_from_file(PHPDBG_G(stdin_file), "r");
+		php_stream *stream = php_stream_fopen_from_fd(dup(fileno(PHPDBG_G(stdin_file))), "r", NULL);
 #ifdef PHP_WIN32
 		zval *blocking_pipes = php_stream_context_get_option(context, "pipe", "blocking");
 		if (blocking_pipes) {

Original file line number	Diff line number	Diff line change
`@@ -1322,7 +1322,7 @@ php_stream phpdbg_stream_url_wrap_php(php_stream_wrapper wrapper, const char *`
`1322`	`1322`	`}`
`1323`	`1323`
`1324`	`1324`	`if (!strncasecmp(path, "stdin", 6) && PHPDBG_G(stdin_file)) {`
`1325`		`- php_stream *stream =stream = php_stream_fopen_from_file(PHPDBG_G(stdin_file), "r");`
	`1325`	`+ php_stream *stream = php_stream_fopen_from_fd(dup(fileno(PHPDBG_G(stdin_file))), "r", NULL);`
`1326`	`1326`	`#ifdef PHP_WIN32`
`1327`	`1327`	`zval *blocking_pipes = php_stream_context_get_option(context, "pipe", "blocking");`
`1328`	`1328`	`if (blocking_pipes) {`