1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-7.3' into PHP-7.4

This commit is contained in:
Nikita Popov
2019-08-30 16:07:54 +02:00

View File

@@ -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);