tony2001                                 Wed, 16 Dec 2009 17:49:04 +0000

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

Log:
exit event loop first, then reinitialize libevent (Jerome Loyet)

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

Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_children.c
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_children.c        
2009-12-16 17:14:55 UTC (rev 292216)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_children.c        
2009-12-16 17:49:04 UTC (rev 292217)
@@ -373,12 +373,12 @@
                switch (pid) {

                        case 0 :
-                               event_init(); /* reopen epoll descriptor */
                                fpm_child_resources_use(child);
                                fpm_globals.is_child = 1;
                                if (in_event_loop) {
                                        fpm_event_exit_loop();
                                }
+                               event_init(); /* reopen epoll descriptor */
                                fpm_child_init(wp);
                                return 0;


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

Reply via email to