From da110e2065d9a45756194051a9f02637e5d6fbf7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Loyet?= Date: Sun, 9 Oct 2011 15:21:06 +0000 Subject: [PATCH] - ensure request_terminate_timeout >= request_slowlog_timeout --- sapi/fpm/fpm/fpm_conf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 3c7a73a8bf..5ad7c96dd2 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -918,6 +918,11 @@ static int fpm_conf_process_all_pools() /* {{{ */ } fpm_globals.heartbeat = fpm_globals.heartbeat ? MIN(fpm_globals.heartbeat, (wp->config->request_slowlog_timeout * 1000) / 3) : (wp->config->request_slowlog_timeout * 1000) / 3; + + if (wp->config->request_terminate_timeout && wp->config->request_slowlog_timeout > wp->config->request_terminate_timeout) { + zlog(ZLOG_ERROR, "[pool %s] 'request_slowlog_timeout' (%d) can't be greater than 'request_terminate_timeout' (%d)", wp->config->name, wp->config->request_slowlog_timeout, wp->config->request_terminate_timeout); + return -1; + } } /* chroot */ -- 2.50.1