Skip to content

Commit 0a134e5

Browse files
committed
Merge branch 'PHP-8.3'
2 parents a481556 + ff6e3b6 commit 0a134e5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

main/fastcgi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -958,9 +958,9 @@ static inline ssize_t safe_read(fcgi_request *req, const void *buf, size_t count
958958
tmp = count - n;
959959

960960
if (!req->tcp) {
961-
unsigned int in_len = tmp > UINT_MAX ? UINT_MAX : (unsigned int)tmp;
961+
unsigned int in_len = tmp > INT_MAX ? INT_MAX : (unsigned int)tmp;
962962

963-
ret = read(req->fd, ((char*)buf)+n, in_len);
963+
ret = _read(req->fd, ((char*)buf)+n, in_len);
964964
} else {
965965
int in_len = tmp > INT_MAX ? INT_MAX : (int)tmp;
966966

sapi/cgi/cgi_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,9 +486,9 @@ static size_t sapi_cgi_read_post(char *buffer, size_t count_bytes)
486486
while (read_bytes < count_bytes) {
487487
#ifdef PHP_WIN32
488488
size_t diff = count_bytes - read_bytes;
489-
unsigned int to_read = (diff > UINT_MAX) ? UINT_MAX : (unsigned int)diff;
489+
unsigned int to_read = (diff > INT_MAX) ? INT_MAX : (unsigned int)diff;
490490

491-
tmp_read_bytes = read(STDIN_FILENO, buffer + read_bytes, to_read);
491+
tmp_read_bytes = _read(STDIN_FILENO, buffer + read_bytes, to_read);
492492
#else
493493
tmp_read_bytes = read(STDIN_FILENO, buffer + read_bytes, count_bytes - read_bytes);
494494
#endif

0 commit comments

Comments
 (0)