[CalendarServer-changes] [11444] CalendarServer/trunk/calendarserver/tap/caldav.py

[source_changes at macosforge.org]

Revision: 11444
          http://trac.calendarserver.org//changeset/11444
Author:   sagen at apple.com
Date:     2013-06-28 13:21:00 -0700 (Fri, 28 Jun 2013)
Log Message:
-----------
Only redirect if we actually have SSL enabled

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2013-06-27 18:47:39 UTC (rev 11443)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2013-06-28 20:21:00 UTC (rev 11444)
@@ -948,7 +948,7 @@
 
         requestFactory = underlyingSite
 
-        if config.RedirectHTTPToHTTPS:
+        if config.EnableSSL and config.RedirectHTTPToHTTPS:
             self.log.info("Redirecting to HTTPS port %s" % (config.SSLPort,))
             def requestFactory(*args, **kw):
                 return SSLRedirectRequest(site=underlyingSite, *args, **kw)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130628/9a8bc15f/attachment.html>