Merge branch 'PHP-7.0' into PHP-7.1

ksmiley · Oct 3, 2016 · 8fcc938 · 8fcc938
2 parents f58cf8b + 8908df6
commit 8fcc938
Showing 1 changed file with 1 addition and 1 deletion.
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) {