Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #81346: Non-seekable streams don't update position after write

Author: cmb69

NEWS

@@ -4,6 +4,8 @@ PHP                                                                        NEWS
 
 - Core:
   . Fixed bug #81302 (Stream position after stream filter removed). (cmb)
+  . Fixed bug #81346 (Non-seekable streams don't update position after write).
+    (cmb)
 
 26 Aug 2021, PHP 8.0.10
 

ext/standard/tests/streams/bug81346.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Bug #81346 (Non-seekable streams don't update position after write)
+--DESCRIPTION--
+The test expectation is due to bug #81345.
+--SKIPIF--
+<?php
+if (!extension_loaded('bz2')) die("bz2 extension not available");
+?>
+--FILE--
+<?php
+$s = fopen("compress.bzip2://" . __DIR__ . "/bug81346.bz2", "w");
+fwrite($s, str_repeat("hello world", 100));
+fflush($s);
+var_dump(ftell($s));
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . "/bug81346.bz2");
+?>
+--EXPECT--
+int(1100)

main/streams/streams.c

@@ -1144,12 +1144,7 @@ static ssize_t _php_stream_write_buffer(php_stream *stream, const char *buf, siz
 		buf += justwrote;
 		count -= justwrote;
 		didwrite += justwrote;
-
-		/* Only screw with the buffer if we can seek, otherwise we lose data
-		 * buffered from fifos and sockets */
-		if (stream->ops->seek && (stream->flags & PHP_STREAM_FLAG_NO_SEEK) == 0) {
-			stream->position += justwrote;
-		}
+		stream->position += justwrote;
 	}
 
 	return didwrite;