- Fixed bug #53434 (php-fpm slowlog now also logs the original request).

- Fixed the missing peace of code on revision 307842

diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c
index 9a2f66bcecdad9655c37b656c47248c5a6e9dc05..9dcf08aa0a6d5b28d71b15a85fc14f3b41895be7 100644 (file)
--- 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);
                }
        }
 }