aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2007-05-29 19:37:48 +0000
committerScott Ullrich <sullrich@pfsense.org>2007-05-29 19:37:48 +0000
commita2e245e5a0d44c100fea836b04fac1ad73c75c18 (patch)
tree04e23f96789362056c238d4f7a8e3103b0e574d5
parentb21eebcfe9421825f6b6b968c3bd03f410516f9d (diff)
downloadpfsense-packages-a2e245e5a0d44c100fea836b04fac1ad73c75c18.tar.gz
pfsense-packages-a2e245e5a0d44c100fea836b04fac1ad73c75c18.tar.bz2
pfsense-packages-a2e245e5a0d44c100fea836b04fac1ad73c75c18.zip
Check for https as well as a conflicting port. Ticket #1336
-rw-r--r--packages/squid/squid.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/squid/squid.inc b/packages/squid/squid.inc
index ecefe813..9f3790e6 100644
--- a/packages/squid/squid.inc
+++ b/packages/squid/squid.inc
@@ -288,6 +288,10 @@ function squid_validate_general($post, $input_errors) {
if(($config['system']['webgui']['port'] == "") && ($config['system']['webgui']['protocol'] == "http")) {
$webgui_port = 80;
}
+ if(($config['system']['webgui']['port'] == "") && ($config['system']['webgui']['protocol'] == "https")) {
+ $webgui_port = 443;
+ }
+
if (($post['transparent_proxy'] != 'on') && ($port == $webgui_port)) {
$input_errors[] = "You can not run squid on the same port as the webgui";