kallithea Changeset - 2065fe5bab67

Changeset - 2065fe5bab67

Parent rev.

Child rev.

[Not reviewed]

stable

0 1 0

Mads Kiilerich (mads) - 3 years ago 2022-09-14 08:47:48
mads@kiilerich.com

middleware: use config consistently in https_fixup

070b8c39736f did for unknown reasons introduce a use of the global
kallithea.CONFIG . Instead, consistently use the application config object that
has been passed.

1 file changed with 1 insertions and 2 deletions:

kallithea/config/middleware/https_fixup.py

0 comments (0 inline, 0 general)

kallithea/config/middleware/https_fixup.py

➞

Show inline comments

@@ @@ -23,13 +23,12 @@ Original author and date, and relevant c @@
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import kallithea
 from kallithea.lib.utils2 import asbool
 class HttpsFixup(object):
     def __init__(self, app, config):
@@ @@ -59,13 +58,13 @@ class HttpsFixup(object): @@
         # if we have force, just override
         if asbool(self.config.get('force_https')):
             proto = 'https'
         else:
             # get protocol from configured WSGI environment variable
-            url_scheme_variable = kallithea.CONFIG.get('url_scheme_variable')
+            url_scheme_variable = self.config.get('url_scheme_variable')
             if url_scheme_variable:
                 proto = environ.get(url_scheme_variable)
         if proto:
             environ['wsgi._org_proto'] = environ.get('wsgi.url_scheme')
             environ['wsgi.url_scheme'] = proto

0 comments (0 inline, 0 general)