From: lpsolit%gmail.com <>
Date: Wed, 25 Nov 2009 23:57:53 +0000 (+0000)
Subject: Bug 329638: https login page switches to http on submit if ssl_redirect = false ... 
X-Git-Tag: bugzilla-3.5.3~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0ab2bbac2c7b7265e26a158672d9940d21b4cdc;p=thirdparty%2Fbugzilla.git

Bug 329638: https login page switches to http on submit if ssl_redirect = false - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat
---

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 48ac065028..00f9b0a05b 100644
--- 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 {