1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  Fix GH-20603 issue on windows 32 bits.
This commit is contained in:
David Carlier
2025-12-03 20:22:38 +00:00

View File

@@ -147,7 +147,7 @@ PHP_FUNCTION(ftp_connect)
RETURN_THROWS();
}
const zend_long timeoutmax = (zend_long)((double) PHP_TIMEOUT_ULL_MAX / 1000000.0);
const uint64_t timeoutmax = (uint64_t)((double) PHP_TIMEOUT_ULL_MAX / 1000000.0);
if (timeout_sec <= 0) {
zend_argument_value_error(3, "must be greater than 0");
@@ -155,7 +155,7 @@ PHP_FUNCTION(ftp_connect)
}
if (timeout_sec >= timeoutmax) {
zend_argument_value_error(3, "must be less than " ZEND_LONG_FMT, timeoutmax);
zend_argument_value_error(3, "must be less than " ZEND_ULONG_FMT, timeoutmax);
RETURN_THROWS();
}