Merge branch 'PHP-8.2'

Author: bukka

configure.ac

@@ -694,6 +694,8 @@ if test "$ac_cv_func_getaddrinfo" = yes; then
   AC_DEFINE(HAVE_GETADDRINFO,1,[Define if you have the getaddrinfo function])
 fi
 
+dnl on FreeBSD, copy_file_range() works only with the undocumented flag 0x01000000;
+dnl until the problem is fixed properly, copy_file_range() is used only on Linux
 AC_CACHE_CHECK([for copy_file_range], ac_cv_copy_file_range,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #ifdef __linux__

ext/standard/tests/file/gh9779.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Bug GH-9779 (stream_copy_to_stream doesn't work anymore with resource opened in a append mode)
+--FILE--
+<?php
+
+$src = __DIR__.'/gh9779_src.txt';
+$dest = __DIR__.'/gh9779_dest.txt';
+
+file_put_contents($src, "bar");
+file_put_contents($dest, "foo");
+$sourceHandle = fopen($src, "r");
+$destHandle = fopen($dest, "a");
+stream_copy_to_stream($sourceHandle, $destHandle);
+fclose($sourceHandle);
+fclose($destHandle);
+var_dump(file_get_contents($dest));
+?>
+--CLEAN--
+<?php
+$src = __DIR__.'/gh9779_src.txt';
+$dest = __DIR__.'/gh9779_dest.txt';
+
+@unlink($src);
+@unlink($dest);
+?>
+--EXPECTF--
+string(6) "foobar"

main/streams/streams.c

@@ -1558,87 +1558,73 @@ PHPAPI zend_result _php_stream_copy_to_stream_ex(php_stream *src, php_stream *de
 	}
 
 #ifdef HAVE_COPY_FILE_RANGE
-
-	/* TODO: on FreeBSD, copy_file_range() works only with the
-	   undocumented flag 0x01000000; until the problem is fixed
-	   properly, copy_file_range() is not used on FreeBSD */
-#ifndef __FreeBSD__
 	if (php_stream_is(src, PHP_STREAM_IS_STDIO) &&
-	    php_stream_is(dest, PHP_STREAM_IS_STDIO) &&
-	    src->writepos == src->readpos &&
-	    php_stream_can_cast(src, PHP_STREAM_AS_FD) == SUCCESS &&
-	    php_stream_can_cast(dest, PHP_STREAM_AS_FD) == SUCCESS) {
-		/* both php_stream instances are backed by a file
-		   descriptor, are not filtered and the read buffer is
-		   empty: we can use copy_file_range() */
-
-		int src_fd, dest_fd;
-
-		php_stream_cast(src, PHP_STREAM_AS_FD, (void*)&src_fd, 0);
-		php_stream_cast(dest, PHP_STREAM_AS_FD, (void*)&dest_fd, 0);
-
-		/* clamp to INT_MAX to avoid EOVERFLOW */
-		const size_t cfr_max = MIN(maxlen, (size_t)SSIZE_MAX);
-
-		/* copy_file_range() is a Linux-specific system call
-		   which allows efficient copying between two file
-		   descriptors, eliminating the need to transfer data
-		   from the kernel to userspace and back.  For
-		   networking file systems like NFS and Ceph, it even
-		   eliminates copying data to the client, and local
-		   filesystems like Btrfs and XFS can create shared
-		   extents. */
-
-		ssize_t result = copy_file_range(src_fd, NULL,
-						 dest_fd, NULL,
-						 cfr_max, 0);
-		if (result > 0) {
-			size_t nbytes = (size_t)result;
-			haveread += nbytes;
-
-			src->position += nbytes;
-			dest->position += nbytes;
-
-			if ((maxlen != PHP_STREAM_COPY_ALL && nbytes == maxlen) ||
-			    php_stream_eof(src)) {
-				/* the whole request was satisfied or
-				   end-of-file reached - done */
+			php_stream_is(dest, PHP_STREAM_IS_STDIO) &&
+			src->writepos == src->readpos) {
+		/* both php_stream instances are backed by a file descriptor, are not filtered and the
+		 * read buffer is empty: we can use copy_file_range() */
+		int src_fd, dest_fd, dest_open_flags = 0;
+
+		/* get dest open flags to check if the stream is open in append mode */
+		php_stream_parse_fopen_modes(dest->mode, &dest_open_flags);
+
+		/* copy_file_range does not work with O_APPEND */
+		if (php_stream_cast(src, PHP_STREAM_AS_FD, (void*)&src_fd, 0) == SUCCESS &&
+				php_stream_cast(dest, PHP_STREAM_AS_FD, (void*)&dest_fd, 0) == SUCCESS &&
+				php_stream_parse_fopen_modes(dest->mode, &dest_open_flags) == SUCCESS &&
+				!(dest_open_flags & O_APPEND)) {
+
+			/* clamp to INT_MAX to avoid EOVERFLOW */
+			const size_t cfr_max = MIN(maxlen, (size_t)SSIZE_MAX);
+
+			/* copy_file_range() is a Linux-specific system call which allows efficient copying
+			 * between two file descriptors, eliminating the need to transfer data from the kernel
+			 * to userspace and back. For networking file systems like NFS and Ceph, it even
+			 * eliminates copying data to the client, and local filesystems like Btrfs and XFS can
+			 * create shared extents. */
+			ssize_t result = copy_file_range(src_fd, NULL, dest_fd, NULL, cfr_max, 0);
+			if (result > 0) {
+				size_t nbytes = (size_t)result;
+				haveread += nbytes;
+
+				src->position += nbytes;
+				dest->position += nbytes;
+
+				if ((maxlen != PHP_STREAM_COPY_ALL && nbytes == maxlen) || php_stream_eof(src)) {
+					/* the whole request was satisfied or end-of-file reached - done */
+					*len = haveread;
+					return SUCCESS;
+				}
+
+				/* there may be more data; continue copying using the fallback code below */
+			} else if (result == 0) {
+				/* end of file */
 				*len = haveread;
 				return SUCCESS;
-			}
-
-			/* there may be more data; continue copying
-			   using the fallback code below */
-		} else if (result == 0) {
-			/* end of file */
-			*len = haveread;
-			return SUCCESS;
-		} else if (result < 0) {
-			switch (errno) {
-			case EINVAL:
-				/* some formal error, e.g. overlapping
-				   file ranges */
-				break;
-
-			case EXDEV:
-				/* pre Linux 5.3 error */
-				break;
-
-			case ENOSYS:
-				/* not implemented by this Linux kernel */
-				break;
+			} else if (result < 0) {
+				switch (errno) {
+					case EINVAL:
+						/* some formal error, e.g. overlapping file ranges */
+						break;
+
+					case EXDEV:
+						/* pre Linux 5.3 error */
+						break;
+
+					case ENOSYS:
+						/* not implemented by this Linux kernel */
+						break;
+
+					default:
+						/* unexpected I/O error - give up, no fallback */
+						*len = haveread;
+						return FAILURE;
+				}
 
-			default:
-				/* unexpected I/O error - give up, no
-				   fallback */
-				*len = haveread;
-				return FAILURE;
+				/* fall back to classic copying */
 			}
-
-			/* fall back to classic copying */
 		}
 	}
-#endif // __FreeBSD__
 #endif // HAVE_COPY_FILE_RANGE
 
 	if (maxlen == PHP_STREAM_COPY_ALL) {