Merge branch 'master' into Develop

2020-05-01 17:16:28 +02:00
parent 99cc69c67d 700cb3b553
commit 547bbecef1
34 changed files with 5950 additions and 4787 deletions
@@ -82,7 +82,7 @@ from . import services
 def create_app():
    try:
        app.wsgi_app = ReverseProxied(ProxyFix(app.wsgi_app, x_for=1, x_host=1))
-    except TypeError:
+    except (ValueError, TypeError):
        app.wsgi_app = ReverseProxied(ProxyFix(app.wsgi_app))
    # For python2 convert path to unicode
    if sys.version_info < (3, 0):