From 3f51cd32630e4d843a468ee3886b2be45bef9327 Mon Sep 17 00:00:00 2001 From: robs Date: Mon, 4 Feb 2002 19:39:32 +0000 Subject: [PATCH] Prevent silly maxProcesses and processSlack combinations. Dmitry Dorofeev [dima@yasp.com] --- CHANGES | 3 +++ fcgi_config.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index ee8c807..e88bdfe 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,7 @@ 2.2.13 + + *) Prevent silly maxProcesses and processSlack combinations. + Dmitry Dorofeev [dima@yasp.com] *) Properly handle the killing of idle processes when one takes a long time to exit once signaled down (or the config is funky). diff --git a/fcgi_config.c b/fcgi_config.c index 322c84d..92030c9 100644 --- a/fcgi_config.c +++ b/fcgi_config.c @@ -1,5 +1,5 @@ /* - * $Id: fcgi_config.c,v 1.30 2001/11/17 00:50:20 robs Exp $ + * $Id: fcgi_config.c,v 1.31 2002/02/04 19:39:32 robs Exp $ */ #include "fcgi.h" @@ -920,6 +920,13 @@ const char *fcgi_config_set_config(cmd_parms *cmd, void *dummy, const char *arg) } } /* while */ + if (dynamicProcessSlack >= dynamicMaxProcs + 1) { + /* the kill policy would work unexpectedly */ + return ap_psprintf(tp, + "%s: processSlack (%u) must be less than maxProcesses (%u) + 1", + name, dynamicProcessSlack, dynamicMaxProcs); + } + /* Move env array to a surviving pool, leave an extra slot for WIN32 _FCGI_MUTEX_ */ ++envc; dynamicEnvp = (char **)ap_palloc(p, sizeof(char *) * ++envc); -- 2.11.4.GIT