summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2016-10-03 12:55:45 +0200
committerBob Weinand <bobwei9@hotmail.com>2016-10-03 12:55:45 +0200
commit007cf7d7d3391a51dd3055a3577d2bf731ab69ef (patch)
treea72754d6dde60dcbb5b8472b90395f7e86d1f9b6
parent2b134a1dcbc0c168c6c43a838638094d12bdb3d4 (diff)
parent8fcc938e56f51fda3d36eae94e38cf1dd9f04f5c (diff)
downloadphp-git-007cf7d7d3391a51dd3055a3577d2bf731ab69ef.tar.gz
Merge branch 'PHP-7.1'
-rw-r--r--sapi/phpdbg/phpdbg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 5a1bd3a6b4..a7fda1ddd2 100644
--- 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) {