IO copy API for stream copying

configure.ac

@@ -587,10 +587,12 @@ AC_CHECK_FUNCS(m4_normalize([
   putenv
   reallocarray
   scandir
+  sendfile
   setenv
   setitimer
   shutdown
   sigprocmask
+  splice
   statfs
   statvfs
   std_syslog
@@ -1682,6 +1684,12 @@ PHP_ADD_SOURCES_X([main],
   [PHP_FASTCGI_OBJS],
   [no])
 
+PHP_ADD_SOURCES([main/io], m4_normalize([
+    php_io.c
+    php_io_copy_linux.c
+  ]),
+  [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
+
 PHP_ADD_SOURCES([main/streams], m4_normalize([
     cast.c
     filter.c

ext/openssl/xp_ssl.c

@@ -29,7 +29,7 @@
 #include "zend_exceptions.h"
 #include "php_openssl.h"
 #include "php_openssl_backend.h"
-#include "php_network.h"
+#include "php_io.h"
 #include <openssl/ssl.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
@@ -2605,6 +2605,18 @@ static int php_openssl_sockop_cast(php_stream *stream, int castas, void **ret)
 				*(php_socket_t *)ret = sslsock->s.socket;
 			}
 			return SUCCESS;
+		case PHP_STREAM_AS_FD_FOR_COPY:
+			if (sslsock->ssl_active) {
+				return FAILURE;
+			}
+			if (ret) {
+				php_io_fd *copy_fd = (php_io_fd *) ret;
+				copy_fd->socket = sslsock->s.socket;
+				copy_fd->fd_type = PHP_IO_FD_SOCKET;
+				copy_fd->timeout = sslsock->s.timeout;
+				copy_fd->is_blocked = sslsock->s.is_blocked;
+			}
+			return SUCCESS;
 		default:
 			return FAILURE;
 	}

ext/standard/tests/streams/stream_copy_to_stream_file_to_socket_medium.phpt

@@ -0,0 +1,48 @@
+--TEST--
+stream_copy_to_stream() 16k with file as $source and socket as $dest
+--SKIPIF--
+<?php
+if (!function_exists("proc_open")) die("skip no proc_open");
+?>
+--FILE--
+<?php
+
+$serverCode = <<<'CODE'
+    $server = stream_socket_server("tcp://127.0.0.1:0", $errno, $errstr);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+    $data = str_repeat('data', 4096);
+    $result = stream_get_contents($conn);
+
+    phpt_notify(message: strlen($result));
+    phpt_notify(message: $result === $data ? "match" : "mismatch");
+
+    fclose($conn);
+    fclose($server);
+CODE;
+
+$clientCode = <<<'CODE'
+    $src = tmpfile();
+    $data = str_repeat('data', 4096);
+    fwrite($src, $data);
+    rewind($src);
+
+    $dest = stream_socket_client("tcp://{{ ADDR }}", $errno, $errstr, 10);
+    $copied = stream_copy_to_stream($src, $dest);
+    var_dump($copied);
+
+    fclose($dest);
+    fclose($src);
+
+    var_dump((int) trim(phpt_wait()));
+    var_dump(trim(phpt_wait()) === "match");
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECT--
+int(16384)
+int(16384)
+bool(true)

ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_large.phpt

@@ -0,0 +1,42 @@
+--TEST--
+stream_copy_to_stream() 200k bytes with socket as $source and file as $dest
+--SKIPIF--
+<?php
+if (!function_exists("proc_open")) die("skip no proc_open");
+?>
+--FILE--
+<?php
+
+$serverCode = <<<'CODE'
+    $server = stream_socket_server("tcp://127.0.0.1:0", $errno, $errstr);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+    fwrite($conn, str_repeat("a", 200000));
+    stream_socket_shutdown($conn, STREAM_SHUT_WR);
+
+    /* Keep alive until client is done reading. */
+    fread($conn, 1);
+
+    fclose($conn);
+    fclose($server);
+CODE;
+
+$clientCode = <<<'CODE'
+    $source = stream_socket_client("tcp://{{ ADDR }}", $errno, $errstr, 10);
+    $tmp = tmpfile();
+
+    stream_copy_to_stream($source, $tmp);
+
+    fseek($tmp, 0, SEEK_SET);
+    var_dump(strlen(stream_get_contents($tmp)));
+
+    fclose($tmp);
+    fclose($source);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECT--
+int(200000)

ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_single.phpt

@@ -0,0 +1,49 @@
+--TEST--
+stream_copy_to_stream() single byte with socket as $source and file as $dest
+--SKIPIF--
+<?php
+if (!function_exists("proc_open")) die("skip no proc_open");
+?>
+--FILE--
+<?php
+
+$serverCode = <<<'CODE'
+    $server = stream_socket_server("tcp://127.0.0.1:0", $errno, $errstr);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+    fwrite($conn, "a");
+    stream_socket_shutdown($conn, STREAM_SHUT_WR);
+
+    /* Keep alive until client is done reading. */
+    fread($conn, 1);
+
+    fclose($conn);
+    fclose($server);
+CODE;
+
+$clientCode = <<<'CODE'
+    $source = stream_socket_client("tcp://{{ ADDR }}", $errno, $errstr, 10);
+    $tmp = tmpfile();
+
+    stream_copy_to_stream($source, $tmp);
+
+    fseek($tmp, 0, SEEK_SET);
+    var_dump(stream_get_contents($tmp));
+
+    /* Second copy after EOF should be a no-op. */
+    stream_copy_to_stream($source, $tmp);
+
+    fseek($tmp, 0, SEEK_SET);
+    var_dump(stream_get_contents($tmp));
+
+    fclose($tmp);
+    fclose($source);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECT--
+string(1) "a"
+string(1) "a"

ext/standard/tests/streams/stream_copy_to_stream_socket_to_file_small.phpt

@@ -0,0 +1,42 @@
+--TEST--
+stream_copy_to_stream() 2048 bytes with socket as $source and file as $dest
+--SKIPIF--
+<?php
+if (!function_exists("proc_open")) die("skip no proc_open");
+?>
+--FILE--
+<?php
+
+$serverCode = <<<'CODE'
+    $server = stream_socket_server("tcp://127.0.0.1:0", $errno, $errstr);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+    fwrite($conn, str_repeat("a", 2048));
+    stream_socket_shutdown($conn, STREAM_SHUT_WR);
+
+    /* Keep alive until client is done reading. */
+    fread($conn, 1);
+
+    fclose($conn);
+    fclose($server);
+CODE;
+
+$clientCode = <<<'CODE'
+    $source = stream_socket_client("tcp://{{ ADDR }}", $errno, $errstr, 10);
+    $tmp = tmpfile();
+
+    stream_copy_to_stream($source, $tmp);
+
+    fseek($tmp, 0, SEEK_SET);
+    var_dump(stream_get_contents($tmp));
+
+    fclose($tmp);
+    fclose($source);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+string(2048) "aaaaa%saaa"

ext/standard/tests/streams/stream_copy_to_stream_socket_to_socket.phpt

@@ -0,0 +1,69 @@
+--TEST--
+stream_copy_to_stream() socket to socket (splice both directions)
+--SKIPIF--
+<?php
+if (!function_exists("proc_open")) die("skip no proc_open");
+?>
+--FILE--
+<?php
+
+$sourceCode = <<<'CODE'
+    $server = stream_socket_server("tcp://127.0.0.1:0", $errno, $errstr);
+    phpt_notify_server_start($server);
+
+    /* Send address again so the client can read it via phpt_wait(). */
+    phpt_notify(message: stream_socket_get_name($server, false));
+
+    $conn = stream_socket_accept($server);
+    $data = str_repeat('test data ', 1000);
+    fwrite($conn, $data);
+    stream_socket_shutdown($conn, STREAM_SHUT_WR);
+
+    /* Keep alive until client is done reading. */
+    fread($conn, 1);
+
+    fclose($conn);
+    fclose($server);
+CODE;
+
+$destCode = <<<'CODE'
+    $server = stream_socket_server("tcp://127.0.0.1:0", $errno, $errstr);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+    $result = stream_get_contents($conn);
+
+    phpt_notify(message: strlen($result));
+    phpt_notify(message: $result === str_repeat('test data ', 1000) ? "match" : "mismatch");
+
+    fclose($conn);
+    fclose($server);
+CODE;
+
+$clientCode = <<<'CODE'
+    $sourceAddr = trim(phpt_wait("source"));
+    $source = stream_socket_client("tcp://$sourceAddr", $errno, $errstr, 10);
+    $dest = stream_socket_client("tcp://{{ ADDR }}", $errno, $errstr, 10);
+
+    $copied = stream_copy_to_stream($source, $dest);
+    var_dump($copied);
+
+    stream_socket_shutdown($dest, STREAM_SHUT_WR);
+    fclose($source);
+
+    var_dump((int) trim(phpt_wait("dest")));
+    var_dump(trim(phpt_wait("dest")) === "match");
+
+    fclose($dest);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, [
+    'source' => $sourceCode,
+    'dest' => $destCode,
+]);
+?>
+--EXPECT--
+int(10000)
+int(10000)
+bool(true)

ext/standard/tests/streams/stream_copy_to_stream_socket_to_stdout.phpt

@@ -0,0 +1,32 @@
+--TEST--
+stream_copy_to_stream() with socket as $source and STDOUT as $dest
+--SKIPIF--
+<?php
+if (!function_exists("proc_open")) die("skip no proc_open");
+?>
+--FILE--
+<?php
+
+$serverCode = <<<'CODE'
+    $server = stream_socket_server("tcp://127.0.0.1:0", $errno, $errstr);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server, 5);
+    fwrite($conn, "data to stdout\n");
+    fclose($conn);
+    fclose($server);
+CODE;
+
+$clientCode = <<<'CODE'
+    $fd = stream_socket_client("tcp://{{ ADDR }}", $errno, $errstr, 10);
+
+    stream_copy_to_stream($fd, STDOUT);
+
+    fclose($fd);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECT--
+data to stdout

ext/zend_test/test.c

@@ -1820,7 +1820,7 @@ typedef off_t off64_t;
 PHP_ZEND_TEST_API ssize_t copy_file_range(int fd_in, off64_t *off_in, int fd_out, off64_t *off_out, size_t len, unsigned int flags)
 {
 	ssize_t (*original_copy_file_range)(int, off64_t *, int, off64_t *, size_t, unsigned int) = dlsym(RTLD_NEXT, "copy_file_range");
-	if (ZT_G(limit_copy_file_range) >= Z_L(0)) {
+	if (ZT_G(limit_copy_file_range) >= Z_L(0) && ZT_G(limit_copy_file_range) < len) {
 		len = ZT_G(limit_copy_file_range);
 	}
 	return original_copy_file_range(fd_in, off_in, fd_out, off_out, len, flags);