diff options
author | Bob Weinand <bobwei9@hotmail.com> | 2016-10-03 12:55:23 +0200 |
---|---|---|
committer | Bob Weinand <bobwei9@hotmail.com> | 2016-10-03 12:55:23 +0200 |
commit | 8fcc938e56f51fda3d36eae94e38cf1dd9f04f5c (patch) | |
tree | 691abc6644c5179d0ad69b0b06452d375130a37a | |
parent | f58cf8b24dc01d79a07035a794531bedc1b0b3f3 (diff) | |
parent | 8908df690f7bc29b606421c18eb06414154fa183 (diff) | |
download | php-git-8fcc938e56f51fda3d36eae94e38cf1dd9f04f5c.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
-rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 |
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) { |