diff options
| author | Chris Buechler <cmb@pfsense.org> | 2010-01-04 23:37:32 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2010-01-04 23:37:32 -0500 |
| commit | a978a0ffe9172cf51703feb0c426aa8958d3fabb (patch) | |
| tree | 506e16614d919520d8b6e18de36a7583d62f9de8 /etc | |
| parent | 4a3cb40c9a28e0a036a2373cd7bc3d0b994159df (diff) | |
| download | pfsense-a978a0ffe9172cf51703feb0c426aa8958d3fabb.zip pfsense-a978a0ffe9172cf51703feb0c426aa8958d3fabb.tar.gz | |
unbreak CP after HTTP > HTTPS redirect
Ticket #270
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/system.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 586ed5f..a41ae46 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -1023,8 +1023,9 @@ EOD; if($ca <> "") $lighty_config .= "ssl.ca-file = \"{$g['varetc_path']}/{$ca_location}\"\n\n"; } - - if ($config['system']['webgui']['protocol'] == "https" && !isset($config['system']['webgui']['disablehttpredirect'])) { + + // Add HTTP to HTTPS redirect + if ($captive_portal == false && $config['system']['webgui']['protocol'] == "https" && !isset($config['system']['webgui']['disablehttpredirect'])) { if($lighty_port != "443") $redirectport = ":{$lighty_port}"; $lighty_config .= <<<EOD @@ -1345,4 +1346,4 @@ function enable_watchdog() { } } -?> +?>
\ No newline at end of file |
