fat Sun, 09 Oct 2011 15:21:06 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=317938
Log:
- ensure request_terminate_timeout >= request_slowlog_timeout
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c 2011-10-09
15:12:26 UTC (rev 317937)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c 2011-10-09
15:21:06 UTC (rev 317938)
@@ -918,6 +918,11 @@
}
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 */
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c 2011-10-09
15:12:26 UTC (rev 317937)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c 2011-10-09
15:21:06 UTC (rev 317938)
@@ -918,6 +918,11 @@
}
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 */
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2011-10-09 15:12:26 UTC (rev
317937)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2011-10-09 15:21:06 UTC (rev
317938)
@@ -918,6 +918,11 @@
}
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 */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
