moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-11-16 14:25:02 -05:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
echel0n 2014-11-30 03:43:52 -08:00
commit fdfd564f52
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sickbeard/webserve.py
View File

@ -99,7 +99,7 @@ def authenticated(handler_class):
if not (sickbeard.WEB_USERNAME and sickbeard.WEB_PASSWORD): if not (sickbeard.WEB_USERNAME and sickbeard.WEB_PASSWORD):
return True return True
elif (handler.request.uri.startswith(sickbeard.WEB_ROOT + '/api') and elif (handler.request.uri.startswith(sickbeard.WEB_ROOT + '/api') and
'/api/builder' not in handler.request.uri): sickbeard.WEB_ROOT + '/api/builder' not in handler.request.uri):
return True return True
elif (handler.request.uri.startswith(sickbeard.WEB_ROOT + '/calendar') and elif (handler.request.uri.startswith(sickbeard.WEB_ROOT + '/calendar') and
sickbeard.CALENDAR_UNPROTECTED): sickbeard.CALENDAR_UNPROTECTED):
@ -107,7 +107,7 @@ def authenticated(handler_class):
auth_hdr = handler.request.headers.get('Authorization') auth_hdr = handler.request.headers.get('Authorization')
if auth_hdr == None: if auth_hdr is None:
return _request_basic_auth(handler) return _request_basic_auth(handler)
if not auth_hdr.startswith('Basic '): if not auth_hdr.startswith('Basic '):
return _request_basic_auth(handler) return _request_basic_auth(handler)