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.5'

Browse Source 
* PHP-8.5:
  ftp: Fix weird typo (#20295)
This commit is contained in:
Niels Dossche
2025-10-26 08:57:26 +01:00
parent 5d0499af7e 393302bc62
commit 23674d9482
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/ftp/php_ftp.c
View File

@@ -815,7 +815,7 @@ PHP_FUNCTION(ftp_nb_get)
}
/* }}} */
/* {{{ Continues retrieving/sending a file nbronously */
/* {{{ Continues to retrieve or send a file in non-blocking mode */
PHP_FUNCTION(ftp_nb_continue)
{
zval *z_ftp;
@@ -828,7 +828,7 @@ PHP_FUNCTION(ftp_nb_continue)
GET_FTPBUF(ftp, z_ftp);
if (!ftp->nb) {
php_error_docref(NULL, E_WARNING, "No nbronous transfer to continue");
php_error_docref(NULL, E_WARNING, "No non-blocking transfer to continue");
RETURN_LONG(PHP_FTP_FAILED);
}

2
ext/ftp/tests/005.phpt
View File

@@ -85,7 +85,7 @@ int(-1)
Warning: ftp_mkdir(): Command not implemented (7). in %s005.php on line %d
bool(false)
Warning: ftp_nb_continue(): No nbronous transfer to continue in %s005.php on line %d
Warning: ftp_nb_continue(): No non-blocking transfer to continue in %s on line %d
int(0)
ftp_nb_fget(): Argument #4 ($mode) must be either FTP_ASCII or FTP_BINARY
ftp_nb_fput(): Argument #4 ($mode) must be either FTP_ASCII or FTP_BINARY