From: Jérôme Loyet <fat@php.net>
Date: Sun, 9 Oct 2011 15:21:06 +0000 (+0000)
Subject: - ensure request_terminate_timeout >= request_slowlog_timeout
X-Git-Tag: php-5.3.9RC1~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92039e00b0e0ded9eeb795eda17c354727b7ea61;p=php

- ensure request_terminate_timeout >= request_slowlog_timeout
---

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 */