clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-27 12:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

- ensure request_terminate_timeout >= request_slowlog_timeout

Browse Source
This commit is contained in:
Jérôme Loyet 2011-10-09 15:21:06 +00:00
parent c15987bdd4
commit 280a177a97
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sapi/fpm/fpm/fpm_conf.c
View File

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