summaryrefslogtreecommitdiffstats
path: root/src/etc
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-12-31 14:03:19 -0600
committerRenato Botelho <renato@netgate.com>2016-01-05 09:08:10 -0200
commit57cc06af8f8086dfcc3b30a036290a75ea59fd04 (patch)
treeb37d60ff1010b3303b7a8607dd1c58710edb5ac6 /src/etc
parent4877ae1e5fff7d1460755c12dc9022da4a239f92 (diff)
downloadpfsense-57cc06af8f8086dfcc3b30a036290a75ea59fd04.zip
pfsense-57cc06af8f8086dfcc3b30a036290a75ea59fd04.tar.gz
un-break SVG graphs
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/inc/captiveportal.inc2
-rw-r--r--src/etc/inc/system.inc1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc
index 5602785..8b9d33e 100644
--- a/src/etc/inc/captiveportal.inc
+++ b/src/etc/inc/captiveportal.inc
@@ -310,7 +310,7 @@ EOD;
/* write elements */
captiveportal_write_elements();
- /* kill any running mini_httpd */
+ /* kill any running CP nginx instances */
killbypid("{$g['varrun_path']}/nginx-{$cpzone}-CaptivePortal.pid");
killbypid("{$g['varrun_path']}/nginx-{$cpzone}-CaptivePortal-SSL.pid");
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 181c68c..07ee098 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -1323,7 +1323,6 @@ EOD;
$nginx_config .= "\t\tssl_ciphers \"EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH\";\n";
$nginx_config .= "\t\tssl_prefer_server_ciphers on;\n";
$nginx_config .= "\t\tadd_header Strict-Transport-Security \"max-age=31536000; preload\";\n";
- $nginx_config .= "\t\tadd_header X-Frame-Options DENY;\n";
$nginx_config .= "\t\tadd_header X-Content-Type-Options nosniff;\n";
$nginx_config .= "\t\tssl_session_tickets off;\n";
$nginx_config .= "\t\tssl_stapling on;\n";
OpenPOWER on IntegriCloud