tony2001 Fri, 29 Jan 2010 11:45:01 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=294187
Log:
revert wrong slowlog fix, zend MM is already shut down at the moment
Changed paths:
U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c
Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c 2010-01-29
09:55:10 UTC (rev 294186)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c 2010-01-29
11:45:01 UTC (rev 294187)
@@ -1764,11 +1764,11 @@
zend_first_try {
while (fcgi_accept_request(&request) >= 0) {
+ char *status_buffer, *status_content_type;
request_body_fd = -1;
SG(server_context) = (void *) &request;
init_request_info(TSRMLS_C);
CG(interactive) = 0;
- char *status_buffer, *status_content_type;
fpm_request_info();
@@ -1858,6 +1858,9 @@
}
}
+ STR_FREE(SG(request_info).path_translated);
+ SG(request_info).path_translated = NULL;
+
php_request_shutdown((void *) 0);
if (exit_status == 0) {
@@ -1869,9 +1872,6 @@
SG(request_info).query_string = NULL;
}
- STR_FREE(SG(request_info).path_translated);
- SG(request_info).path_translated = NULL;
-
requests++;
if (max_requests && (requests == max_requests)) {
fcgi_finish_request(&request, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
