Bug 329638: https login page switches to http on submit if ssl_redirect = false ...

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 48ac0650283edb5837405119e531e1f8d8cc8c94..00f9b0a05bab55a70db2e789a922e6621b04ba57 100644 (file)
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -277,7 +277,16 @@ sub correct_urlbase {
     my $urlbase = Bugzilla->params->{'urlbase'};
     my $sslbase = Bugzilla->params->{'sslbase'};
 
-    return ($ssl && $sslbase) ? $sslbase : $urlbase;
+    if (!$sslbase) {
+        return $urlbase;
+    }
+    elsif ($ssl) {
+        return $sslbase;
+    }
+    else {
+        # Return what the user currently uses.
+        return (uc($ENV{HTTPS} || '') eq 'ON') ? $sslbase : $urlbase;
+    }
 }
 
 sub use_attachbase {