Don't set position=0 on ESPIPE

nikic · nikic · commit be8c06ab9dc7 · 2019-09-05T16:35:40.000+02:00
We should recognize that this is a pipe, but leave the position as -1,
as the pipe is not seekable. This makes the behavior consistent between
fd+file and as such also between STDIN and php://stdin.
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
@@ -270,7 +270,6 @@ PHPAPI php_stream *_php_stream_fopen_from_fd(int fd, const char *mode, const cha
 			stream->position = zend_lseek(self->fd, 0, SEEK_CUR);
 #ifdef ESPIPE
 			if (stream->position == (zend_off_t)-1 && errno == ESPIPE) {
-				stream->position = 0;
 				stream->flags |= PHP_STREAM_FLAG_NO_SEEK;
 				self->is_pipe = 1;
 			}
diff --git a/sapi/cli/tests/std_streams.phpt b/sapi/cli/tests/std_streams.phpt
@@ -0,0 +1,29 @@
+--TEST--
+Testing ftell() on std streams
+--SKIPIF--
+<?php
+if (getenv("SKIP_IO_CAPTURE_TESTS")) {
+    die("skip I/O capture test");
+}
+?>
+--CAPTURE_STDIO--
+STDOUT
+--FILE--
+<?php
+
+var_dump(ftell(STDIN));
+var_dump(ftell(STDERR));
+var_dump(ftell(fopen("php://stdin", "r")));
+var_dump(ftell(fopen("php://stderr", "w")));
+
+var_dump(ftell(STDOUT));
+var_dump(ftell(fopen("php://stdout", "w")));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+int(0)
+int(0)

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,6 @@ PHPAPI php_stream _php_stream_fopen_from_fd(int fd, const char mode, const cha`
`270`	`270`	`stream->position = zend_lseek(self->fd, 0, SEEK_CUR);`
`271`	`271`	`#ifdef ESPIPE`
`272`	`272`	`if (stream->position == (zend_off_t)-1 && errno == ESPIPE) {`
`273`		`- stream->position = 0;`
`274`	`273`	`stream->flags \|= PHP_STREAM_FLAG_NO_SEEK;`
`275`	`274`	`self->is_pipe = 1;`
`276`	`275`	`}`