summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--main/fastcgi.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 838f1d23e8..8ededb077d 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,10 @@ PHP NEWS
. Fixed bug #78412 (Generator incorrectly reports non-releasable $this as GC
child). (Nikita)
+- FastCGI:
+ . Fixed bug #78469 (FastCGI on_accept hook is not called when using named
+ pipes on Windows). (Sergei Turchanov)
+
- MySQLnd:
. Fixed connect_attr issues and added the _server_host connection attribute.
(Qianqian Bu)
diff --git a/main/fastcgi.c b/main/fastcgi.c
index 3181661877..4b3dd312ff 100644
--- a/main/fastcgi.c
+++ b/main/fastcgi.c
@@ -1375,6 +1375,8 @@ int fcgi_accept_request(fcgi_request *req)
if (in_shutdown) {
return -1;
}
+
+ req->hook.on_accept();
#ifdef _WIN32
if (!req->tcp) {
pipe = (HANDLE)_get_osfhandle(req->listen_socket);
@@ -1405,8 +1407,6 @@ int fcgi_accept_request(fcgi_request *req)
sa_t sa;
socklen_t len = sizeof(sa);
- req->hook.on_accept();
-
FCGI_LOCK(req->listen_socket);
req->fd = accept(listen_socket, (struct sockaddr *)&sa, &len);
FCGI_UNLOCK(req->listen_socket);