diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-30 16:07:33 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-30 16:07:43 +0200 |
| commit | e9cfd94b8e54325c1cfcd1a35037b62966aebe12 (patch) | |
| tree | b6ef85c6b17df04ed86bf1da7bbb9771234f2f4c | |
| parent | 34edd4aa2aa100a39075d3c4b086165f8c372945 (diff) | |
| parent | 8f564e5308970e3c1b96fd17e493c5c3a952954b (diff) | |
| download | php-git-e9cfd94b8e54325c1cfcd1a35037b62966aebe12.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | main/fastcgi.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -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 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); |