aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2009-10-24 05:22:45 +0000
committermkanat%bugzilla.org <>2009-10-24 05:22:45 +0000
commitf9cd15c79202a50d7c0a3f9aa8de45c2c23cdb49 (patch)
tree8a45972d5cc074cd689c1a6215ebc5cbfa72ed2c /Bugzilla.pm
parentBug 520948: Use Bugzilla->feature and feature_enabled everywhere instead of c... (diff)
downloadbugzilla-f9cd15c79202a50d7c0a3f9aa8de45c2c23cdb49.tar.gz
bugzilla-f9cd15c79202a50d7c0a3f9aa8de45c2c23cdb49.tar.bz2
bugzilla-f9cd15c79202a50d7c0a3f9aa8de45c2c23cdb49.zip
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
Diffstat (limited to 'Bugzilla.pm')
-rw-r--r--Bugzilla.pm5
1 files changed, 4 insertions, 1 deletions
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