summaryrefslogtreecommitdiff
path: root/main/fastcgi.c
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-08-30 16:07:33 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-08-30 16:07:43 +0200
commite9cfd94b8e54325c1cfcd1a35037b62966aebe12 (patch)
treeb6ef85c6b17df04ed86bf1da7bbb9771234f2f4c /main/fastcgi.c
parent34edd4aa2aa100a39075d3c4b086165f8c372945 (diff)
parent8f564e5308970e3c1b96fd17e493c5c3a952954b (diff)
downloadphp-git-e9cfd94b8e54325c1cfcd1a35037b62966aebe12.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
Diffstat (limited to 'main/fastcgi.c')
-rw-r--r--main/fastcgi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/fastcgi.c b/main/fastcgi.c
index a255baedc7..8dd791cc38 100644
--- a/main/fastcgi.c
+++ b/main/fastcgi.c
@@ -1373,6 +1373,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);
@@ -1403,8 +1405,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);