summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2009-12-07 10:17:16 +0000
committerAntony Dovgal <tony2001@php.net>2009-12-07 10:17:16 +0000
commitf2b9db204e8f98c75a74544550da1f3e4cead9c4 (patch)
tree3ea8154ef29540e18bf3bc6ed587137fb4145bab
parentd1cb54864985ea802cc2e81694c0d190c9b45fd0 (diff)
downloadphp-git-f2b9db204e8f98c75a74544550da1f3e4cead9c4.tar.gz
add missing FPM-specific code
-rw-r--r--sapi/fpm/fpm/fastcgi.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sapi/fpm/fpm/fastcgi.c b/sapi/fpm/fpm/fastcgi.c
index 5312d64f5a..df5d87aae9 100644
--- a/sapi/fpm/fpm/fastcgi.c
+++ b/sapi/fpm/fpm/fastcgi.c
@@ -922,6 +922,7 @@ void fcgi_close(fcgi_request *req, int force, int destroy)
close(req->fd);
#endif
req->fd = -1;
+ fpm_request_finished();
}
}
@@ -968,6 +969,8 @@ int fcgi_accept_request(fcgi_request *req)
sa_t sa;
socklen_t len = sizeof(sa);
+ fpm_request_accepting();
+
FCGI_LOCK(req->listen_socket);
req->fd = accept(listen_socket, (struct sockaddr *)&sa, &len);
FCGI_UNLOCK(req->listen_socket);
@@ -1007,6 +1010,8 @@ int fcgi_accept_request(fcgi_request *req)
struct pollfd fds;
int ret;
+ fpm_request_reading_headers();
+
fds.fd = req->fd;
fds.events = POLLIN;
fds.revents = 0;
@@ -1019,6 +1024,8 @@ int fcgi_accept_request(fcgi_request *req)
}
fcgi_close(req, 1, 0);
#else
+ fpm_request_reading_headers();
+
if (req->fd < FD_SETSIZE) {
struct timeval tv = {5,0};
fd_set set;