Skip to content

Commit 7d7daae

Browse files
committed
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5: Fix GH-24229: Use SHUT_WR when closing FastCGI connections (#24230)
2 parents 564fbfd + 8b96915 commit 7d7daae

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

‎NEWS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ PHP NEWS
1414
the next smaller bin in its larger bin, which efree_size() then freed
1515
into the wrong one. (Marc Bennewitz)
1616

17+
- FPM:
18+
. Fixed bug GH-24229 (fcgi_close() passes shutdown() a literal 1, which is
19+
SHUT_RD in WASI). (Ryosuke Ishibashi)
20+
1721
- Opcache:
1822
. Fixed bug GH-17626 (JIT corrupts an opline handler when blacklisting a
1923
root trace at the opcache.jit_max_root_traces limit, causing spurious

‎main/fastcgi.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1279,7 +1279,7 @@ void fcgi_close(fcgi_request *req, int force, int destroy)
12791279
if (!force) {
12801280
char buf[8];
12811281

1282-
shutdown(req->fd, 1);
1282+
shutdown(req->fd, SHUT_WR);
12831283
/* read any remaining data, it may be omitted */
12841284
while (recv(req->fd, buf, sizeof(buf), 0) > 0) {}
12851285
}

0 commit comments

Comments
 (0)