Merge branch 'PHP-7.3' into PHP-7.4

php · Aug 30, 2019 · 27da21d · 27da21d
2 parents b4088ba + e9cfd94
commit 27da21d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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);