Merge branch 'PHP-7.2' into PHP-7.3

php · Aug 30, 2019 · e9cfd94 · e9cfd94
2 parents 34edd4a + 8f564e5
commit e9cfd94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -11,6 +11,10 @@ PHP                                                                        NEWS
   . Fixed bug #77812 (Interactive mode does not support PHP 7.3-style heredoc).
     (cmb, Nikita)
 
+- FastCGI:
+  . Fixed bug #78469 (FastCGI on_accept hook is not called when using named
+    pipes on Windows). (Sergei Turchanov)
+
 - FPM:
   . Fixed bug #78334 (fpm log prefix message includes wrong stdout/stderr
     notation). (Tsuyoshi Sadakata)

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