Merge branch 'master' into nolurk

This commit is contained in:
Joseph Schorr 2015-06-02 13:55:16 -04:00
commit c0e995c1d4
43 changed files with 1091 additions and 127 deletions

View file

@ -29,6 +29,7 @@ def no_cache(f):
@wraps(f)
def add_no_cache(*args, **kwargs):
response = f(*args, **kwargs)
response.headers['Cache-Control'] = 'no-cache, no-store, must-revalidate'
if response is not None:
response.headers['Cache-Control'] = 'no-cache, no-store, must-revalidate'
return response
return add_no_cache

View file

@ -11,7 +11,7 @@ def parse_basic_auth(header_value):
return None
try:
basic_parts = base64.b64decode(parts[1]).split(':')
basic_parts = base64.b64decode(parts[1]).split(':', 1)
if len(basic_parts) != 2:
return None