From c0ab2bbac2c7b7265e26a158672d9940d21b4cdc Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Wed, 25 Nov 2009 23:57:53 +0000
Subject: [PATCH] =?utf8?q?Bug=20329638:=20https=20login=20page=20switches?=
 =?utf8?q?=20to=20http=20on=20submit=20if=20ssl=5Fredirect=20=3D=20false?=
 =?utf8?q?=20-=20Patch=20by=20Fr=C3=83=C2=A9d=C3=83=C2=A9ric=20Buclin=20<L?=
 =?utf8?q?pSolit@gmail.com>=20r/a=3Dmkanat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Bugzilla/Util.pm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 {
-- 
2.47.2