From f9cd15c79202a50d7c0a3f9aa8de45c2c23cdb49 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Sat, 24 Oct 2009 05:22:45 +0000
Subject: Bug 523495: Re-work attachment.cgi and the general
 attachment_base-checking code to prevent an infinite redirect loop when
 ssl_redirect is on and Bugzilla has an attachment_base set. Patch by Max
 Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit

---
 Bugzilla.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Bugzilla.pm')

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 62b1af659..67ec611a9 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -113,7 +113,10 @@ sub init_page {
         };
     }
 
-    do_ssl_redirect_if_required();
+    # Because of attachment_base, attachment.cgi handles this itself.
+    if (basename($0) ne 'attachment.cgi') {
+        do_ssl_redirect_if_required();
+    }
 
     # If Bugzilla is shut down, do not allow anything to run, just display a
     # message to the user about the downtime and log out.  Scripts listed in 
-- 
cgit v1.2.3-24-g4f1b