Commit 00c044c2 authored by Frank Bergmann's avatar Frank Bergmann

- added a non-redirect clause when accessing via HTTPS

parent 3e4517ae
...@@ -2730,9 +2730,6 @@ ad_proc -public util_current_location {{}} { ...@@ -2730,9 +2730,6 @@ ad_proc -public util_current_location {{}} {
@author Lars Pind (lars@collaboraid.biz) @author Lars Pind (lars@collaboraid.biz)
@author Peter Marklund @author Peter Marklund
} { } {
set default_port(http) 80
set default_port(https) 443
switch [ad_conn driver] { switch [ad_conn driver] {
nssock { nssock {
set proto http set proto http
...@@ -2778,7 +2775,7 @@ ad_proc -public util_current_location {{}} { ...@@ -2778,7 +2775,7 @@ ad_proc -public util_current_location {{}} {
} }
} }
if { ![empty_string_p $port] && ![string equal $port $default_port($proto)] } { if { ![empty_string_p $port] && ![string equal $port 80] && ![string equal $port 443]} {
return "$proto://$hostname:$port" return "$proto://$hostname:$port"
} else { } else {
return "$proto://$hostname" return "$proto://$hostname"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment