merge: Use/enforce sane max-connection values (#1803)

git-svn-id: svn://svn.lighttpd.net/lighttpd/trunk@2453 152afb58-edef-0310-8abb-c4023f1b3aa9

1 files changed, 6 insertions, 5 deletions

diff --git a/src/server.c b/src/server.c
index 3d37e29d..b053a9c3 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1416,15 +1416,16 @@ int main (int argc, char **argv, char **envp) {
 	}
 
 	/* set max-conns */
-	if (srv->srvconf.max_conns > srv->max_fds) {
-		/* we can't have more connections than max-fds */
-		srv->max_conns = srv->max_fds;
+	if (srv->srvconf.max_conns > srv->max_fds/2) {
+		/* we can't have more connections than max-fds/2 */
+		log_error_write(srv, __FILE__, __LINE__, "sdd", "can't have more connections than fds/2: ", srv->srvconf.max_conns, srv->max_fds);
+		srv->max_conns = srv->max_fds/2;
 	} else if (srv->srvconf.max_conns) {
 		/* otherwise respect the wishes of the user */
 		srv->max_conns = srv->srvconf.max_conns;
 	} else {
-		/* or use the default */
-		srv->max_conns = srv->max_fds;
+		/* or use the default: we really don't want to hit max-fds */
+		srv->max_conns = srv->max_fds/3;
 	}
 
 	if (HANDLER_GO_ON != plugins_call_init(srv)) {