[php-src] PHP-8.5: Merge branch 'PHP-8.4' into PHP-8.5

Author: Weilin Du (LamentXU123) Date: 2026-10-10T15:07:17+08:00 Commit: https://github.com/php/php-src/commit/8b9691526a0eb0c649dac58d12e91519fb0a2369 Raw diff: https://github.com/php/php-src/commit/8b9691526a0eb0c649dac58d12e91519fb0a2369.diff Merge branch 'PHP-8.4' into PHP-8.5 * PHP-8.4: Fix GH-24229: Use SHUT_WR when closing FastCGI connections (#24230) Changed paths: M NEWS M main/fastcgi.c Diff: diff --git a/NEWS b/NEWS index a6ef04ca537e..54b04dc734b5 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,10 @@ PHP NEWS . Fixed bug GH-24218 (Invalid opcode for count() of a literal array without SCCP). (lazerg) +- FPM: + . Fixed bug GH-24229 (fcgi_close() passes shutdown() a literal 1, which is + SHUT_RD in WASI). (Ryosuke Ishibashi) + - Opcache: . Fixed bug GH-17626 (JIT corrupts an opline handler when blacklisting a root trace at the opcache.jit_max_root_traces limit, causing spurious diff --git a/main/fastcgi.c b/main/fastcgi.c index d1355d17fbee..f63210a59d97 100644 --- a/main/fastcgi.c +++ b/main/fastcgi.c @@ -1290,7 +1290,7 @@ void fcgi_close(fcgi_request *req, int force, int destroy) if (!force) { char buf[8]; - shutdown(req->fd, 1); + shutdown(req->fd, SHUT_WR); /* read any remaining data, it may be omitted */ while (recv(req->fd, buf, sizeof(buf), 0) > 0) {} }