summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2010-01-29 11:45:01 +0000
committerAntony Dovgal <tony2001@php.net>2010-01-29 11:45:01 +0000
commit7baa1b0a6e5ba1c96fd368c84fec272c161c250e (patch)
tree16657f94220e86b5f21209c6a2d7d4b95e6afc5c
parent799b3b4f4abbccf32700389cb185e87ae6c1e362 (diff)
downloadphp-git-7baa1b0a6e5ba1c96fd368c84fec272c161c250e.tar.gz
revert wrong slowlog fix, zend MM is already shut down at the moment
-rw-r--r--sapi/fpm/fpm/fpm_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index fffa609cc8..1d593c7b08 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -1764,11 +1764,11 @@ consult the installation file that came with this distribution, or visit \n\
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 @@ fastcgi_request_done:
}
}
+ 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 @@ fastcgi_request_done:
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);