summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-06-03 00:51:13 -0500
committerChris Buechler <cmb@pfsense.org>2016-06-03 00:51:13 -0500
commitdbc5fd33c9de6bd4f6caf7af4d29546d63e06ded (patch)
treed36b7243755d42fb715b2c9f1201c33f9a320b64
parent99c4d90dc167921596aa50c7e962daf05ac11852 (diff)
downloadpfsense-dbc5fd33c9de6bd4f6caf7af4d29546d63e06ded.zip
pfsense-dbc5fd33c9de6bd4f6caf7af4d29546d63e06ded.tar.gz
Set keepalive_timeout 0 where captive portal in use, and update otherwise to nginx's current default of 75. Ticket #6421
-rw-r--r--src/etc/inc/system.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 87c83fd..4f81d80 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -1297,7 +1297,6 @@ http {
server_tokens off;
sendfile on;
- keepalive_timeout 65;
access_log syslog:server=unix:/var/run/log,facility=local5 combined;
@@ -1305,6 +1304,9 @@ EOD;
if ($captive_portal !== false) {
$nginx_config .= "\tlimit_conn_zone \$binary_remote_addr zone=addr:10m;\n";
+ $nginx_config .= "\tkeepalive_timeout 0;\n";
+ } else {
+ $nginx_config .= "\tkeepalive_timeout 75;\n";
}
if ($cert <> "" and $key <> "") {
OpenPOWER on IntegriCloud