diff options
author | Jérôme Loyet <fat@php.net> | 2011-10-09 15:21:06 +0000 |
---|---|---|
committer | Jérôme Loyet <fat@php.net> | 2011-10-09 15:21:06 +0000 |
commit | da110e2065d9a45756194051a9f02637e5d6fbf7 (patch) | |
tree | a674a306566a548ce6bde721b79be6424e095f82 | |
parent | 891ca5cae3de82cad8d909bb8b83b9717f0aa111 (diff) | |
download | php-git-da110e2065d9a45756194051a9f02637e5d6fbf7.tar.gz |
- ensure request_terminate_timeout >= request_slowlog_timeout
-rw-r--r-- | sapi/fpm/fpm/fpm_conf.c | 5 |
1 files changed, 5 insertions, 0 deletions
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 */ |