Changeset 46

Timestamp:

10/05/06 21:56:43 (2 years ago)

Author:

verbosus

Message:

Fixed flawed logic, this is getting ridiculous: five revisions just go get things right (but now it works, really, for sure!)

Files:

• django/trunk/middleware/sslmiddleware.py (modified) (2 diffs)

django/trunk/middleware/sslmiddleware.py

@@ -22 +22 @@
 class SSLMiddleware:
     def process_request(self, request):
+        _to_redir = False
         if hasattr(settings, "HTTPS_PATHS"):
             for path in getattr(settings, "HTTPS_PATHS"):
@@ -28 +29 @@
                         # Redirect to https://
                         return self._redirect(request, "https")
+                    else:
+                        return None
                 else:
-                    if request.is_secure():
-                        return self._redirect(request, "http")
+                    _to_redir = True
+            if _to_redir:
+                if request.is_secure():
+                    return self._redirect(request, "http")
 
     def _redirect(self, request, protocol):