php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix GH-20240: FTP with SSL: ftp_fput(): Connection timed out on successful writes
This commit is contained in:
Niels Dossche
2025-10-26 23:39:02 +01:00
parent d4030362cf 8761c4e507
commit 6dab33a438
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -25,6 +25,10 @@ PHP NEWS
. Fixed bug GH-19974 (fpm_status_export_to_zval segfault for parallel . Fixed bug GH-19974 (fpm_status_export_to_zval segfault for parallel
execution). (Jakub Zelenka, txuna) execution). (Jakub Zelenka, txuna)
- FTP:
. Fixed bug GH-20240 (FTP with SSL: ftp_fput(): Connection timed out on
successful writes). (nielsdos)
- GD: - GD:
. Fixed bug GH-20070 (Return type violation in imagefilter when an invalid . Fixed bug GH-20070 (Return type violation in imagefilter when an invalid
filter is provided). (Girgias) filter is provided). (Girgias)

11
ext/ftp/ftp.c
View File

@@ -1625,7 +1625,7 @@ my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len)
/* {{{ data_available */ /* {{{ data_available */
int int
data_available(ftpbuf_t *ftp, php_socket_t s) data_available(ftpbuf_t *ftp, php_socket_t s, bool silent)
{ {
int n; int n;
@@ -1633,6 +1633,9 @@ data_available(ftpbuf_t *ftp, php_socket_t s)
if (n < 1) { if (n < 1) {
char buf[256]; char buf[256];
if (n == 0) { if (n == 0) {
if (silent) {
return 0;
}
#ifdef PHP_WIN32 #ifdef PHP_WIN32
_set_errno(ETIMEDOUT); _set_errno(ETIMEDOUT);
#else #else
@@ -1961,7 +1964,9 @@ static void ftp_ssl_shutdown(ftpbuf_t *ftp, php_socket_t fd, SSL *ssl_handle) {
done = 0; 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(); ERR_clear_error();
nread = SSL_read(ssl_handle, buf, sizeof(buf)); nread = SSL_read(ssl_handle, buf, sizeof(buf));
if (nread <= 0) { if (nread <= 0) {
@@ -2219,7 +2224,7 @@ ftp_nb_continue_read(ftpbuf_t *ftp)
data = ftp->data; data = ftp->data;
/* check if there is already more 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; return PHP_FTP_MOREDATA;
} }