Merge branch 'PHP-7.0' into PHP-7.1

This commit is contained in:
Bob Weinand 2016-10-03 12:55:23 +02:00
commit 8fcc938e56

View file

@ -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) {