Merge branch 'master' into unstable

This commit is contained in:
Julien Duponchelle committed 2015-06-11 16:55:09 +02:00
commit 04e62e429c
3 files changed
+7 -3

No files matched your search

+3
View File
@@ -90,6 +90,9 @@ class Route(object):
:returns: Response if you need to auth the user otherwise None
"""
if not server_config.getboolean("auth", False):
return
user = server_config.get("user", "").strip()
password = server_config.get("password", "").strip()