Mercurial > kallithea

changeset 5119:15ac6f39f963 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
middleware: apply HttpsFixup to Hg/Git operations too (Issue #132) Fix regression from 6a0964373a30. 'Require SSL for vcs operations' might make the protocol operations depend on the protocol type reported by a proxy even though they don't generate URLs.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 13 May 2015 01:16:48 +0200
parents beeb69476cc4
children 67ffe5427fd5
files kallithea/config/middleware.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/config/middleware.py	Wed May 13 01:16:48 2015 +0200
+++ b/kallithea/config/middleware.py	Wed May 13 01:16:48 2015 +0200
@@ -87,15 +87,15 @@
         else:
             app = StatusCodeRedirect(app, [400, 401, 403, 404, 500])
 
-        # Enable https redirects based on HTTP_X_URL_SCHEME set by proxy
-        if any(asbool(config.get(x)) for x in ['https_fixup', 'force_https', 'use_htsts']):
-            app = HttpsFixup(app, config)
-
         # we want our low level middleware to get to the request ASAP. We don't
         # need any pylons stack middleware in them - especially no StatusCodeRedirect buffering
         app = SimpleHg(app, config)
         app = SimpleGit(app, config)
 
+        # Enable https redirects based on HTTP_X_URL_SCHEME set by proxy
+        if any(asbool(config.get(x)) for x in ['https_fixup', 'force_https', 'use_htsts']):
+            app = HttpsFixup(app, config)
+
         app = RequestWrapper(app, config) # logging
 
     # Establish the Registry for this application