diff options
| author | Jérôme Loyet <fat@php.net> | 2011-01-29 11:41:45 +0000 |
|---|---|---|
| committer | Jérôme Loyet <fat@php.net> | 2011-01-29 11:41:45 +0000 |
| commit | 5bab8ea920ae09cd6be9f05fdd7ffc23f2ca8d65 (patch) | |
| tree | 9f8fab535df12c94704e0c2fc5ac81428463fc6c /sapi | |
| parent | 977d79a7242e434da5409f4498ce4a140eea16dd (diff) | |
| download | php-git-5bab8ea920ae09cd6be9f05fdd7ffc23f2ca8d65.tar.gz | |
- Fixed bug #53434 (php-fpm slowlog now also logs the original request).
- Fixed the missing peace of code on revision 307842
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/fpm/fpm/fpm_request.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c index 9a2f66bcec..9dcf08aa0a 100644 --- a/sapi/fpm/fpm/fpm_request.c +++ b/sapi/fpm/fpm/fpm_request.c @@ -152,8 +152,9 @@ void fpm_request_check_timed_out(struct fpm_child_s *child, struct timeval *now, str_purify_filename(purified_script_filename, slot_c.script_filename, sizeof(slot_c.script_filename)); fpm_pctl_kill(child->pid, FPM_PCTL_TERM); - zlog(ZLOG_WARNING, "[pool %s] child %d, script '%s' execution timed out (%d.%06d sec), terminating", - child->wp->config->name, (int) child->pid, purified_script_filename, (int) tv.tv_sec, (int) tv.tv_usec); + zlog(ZLOG_WARNING, "[pool %s] child %d, script '%s' (request: \"%s %s\") execution timed out (%d.%06d sec), terminating", + child->wp->config->name, (int) child->pid, purified_script_filename, slot_c.request_method, slot_c.request_uri, + (int) tv.tv_sec, (int) tv.tv_usec); } } } |