Commit 710a1357506 for php
commit 710a13575060e1efbc131b322cb6f4fda4adf03c
Merge: f466d4f3b37 da4e0ad0e44
Author: ndossche <7771979+ndossche@users.noreply.github.com>
Date: Fri Oct 16 10:36:12 2026 +0200
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
Fix double free in ext/ftp data_accept() on accept failure
diff --cc ext/ftp/tests/server.inc
index b8ac8893ea0,4ed9d29b1f4..3fc167148a0
--- a/ext/ftp/tests/server.inc
+++ b/ext/ftp/tests/server.inc
@@@ -328,8 -328,13 +328,13 @@@ if ($pid)
break;
}
}elseif (preg_match('/^RETR ([\/]*[\w\h]+)/', $buf, $matches)) {
+ if ($matches[1] === "no_data_connection") {
+ // Never open the active data connection.
+ fputs($s, "150 File status okay; about to open data connection.\r\n");
+ continue;
+ }
if(!empty($pasv)){
- ;
+ $fs = $pasvs;
}
else if (!$fs = stream_socket_client("tcp://$host:$port")) {
fputs($s, "425 Can't open data connection\r\n");