[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/ fastcgi.c

[Antony Dovgal]

tony2001                                 Mon, 07 Dec 2009 10:17:16 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=291811

Log:
add missing FPM-specific code

Changed paths:
    U   php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fastcgi.c

Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fastcgi.c
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fastcgi.c     2009-12-07 
08:47:18 UTC (rev 291810)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fastcgi.c     2009-12-07 
10:17:16 UTC (rev 291811)
@@ -922,6 +922,7 @@
                close(req->fd);
 #endif
                req->fd = -1;
+               fpm_request_finished();
        }
 }

@@ -968,6 +969,8 @@
                                        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 @@
                                        struct pollfd fds;
                                        int ret;

+                                       fpm_request_reading_headers();
+
                                        fds.fd = req->fd;
                                        fds.events = POLLIN;
                                        fds.revents = 0;
@@ -1019,6 +1024,8 @@
                                        }
                                        fcgi_close(req, 1, 0);
 #else
+                                       fpm_request_reading_headers();
+
                                        if (req->fd < FD_SETSIZE) {
                                                struct timeval tv = {5,0};
                                                fd_set set;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php