Skip to content

[pull] master from php:master #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Oct 27, 2025
Merged

[pull] master from php:master #488

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8761c4e
Fix GH-20240: FTP with SSL: ftp_fput(): Connection timed out on succe…
ndossche Oct 25, 2025
6dab33a
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Oct 26, 2025
6bcc4e2
Merge branch 'PHP-8.4' into PHP-8.5
ndossche Oct 26, 2025
64b30ce
Merge branch 'PHP-8.5'
ndossche Oct 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ext/ftp/ftp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1508,14 +1508,17 @@ static int my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len)
return (nr_bytes);
}

static bool data_available(ftpbuf_t *ftp, php_socket_t s)
static bool data_available(ftpbuf_t *ftp, php_socket_t s, bool silent)
{
int n;

n = my_poll(s, PHP_POLLREADABLE, 1000);
if (n < 1) {
char buf[256];
if (n == 0) {
if (silent) {
return false;
}
#ifdef PHP_WIN32
_set_errno(ETIMEDOUT);
#else
Expand Down Expand Up @@ -1831,7 +1834,9 @@ static void ftp_ssl_shutdown(ftpbuf_t *ftp, php_socket_t fd, SSL *ssl_handle) {
done = 0;
}

while (!done && data_available(ftp, fd)) {
/* Don't report timeouts on the control channel if we're negotiating a shutdown already.
* Some servers don't put a final response. */
while (!done && data_available(ftp, fd, true)) {
ERR_clear_error();
nread = SSL_read(ssl_handle, buf, sizeof(buf));
if (nread <= 0) {
Expand Down Expand Up @@ -2078,7 +2083,7 @@ int ftp_nb_continue_read(ftpbuf_t *ftp)
data = ftp->data;

/* check if there is already more data */
if (!data_available(ftp, data->fd)) {
if (!data_available(ftp, data->fd, false)) {
return PHP_FTP_MOREDATA;
}

Expand Down