Merge branch 'dev'

This commit is contained in:
JonnyWong16 2016-05-22 16:24:23 -07:00
commit cfc7d529e1
3 changed files with 7 additions and 2 deletions

View file

@ -1,5 +1,10 @@
# Changelog
## v1.4.3 (2016-05-22)
* Fix: PlexPy not starting without any authentication method.
## v1.4.2 (2016-05-22)
* New: Option to use HTTP basic authentication instead of the HTML login form.

View file

@ -1,2 +1,2 @@
PLEXPY_VERSION = "master"
PLEXPY_RELEASE_VERSION = "1.4.2"
PLEXPY_RELEASE_VERSION = "1.4.3"

View file

@ -74,7 +74,7 @@ def initialize(options):
basic_auth_enabled = False
cherrypy.tools.auth = cherrypy.Tool('before_handler', webauth.check_auth)
else:
auth_enabled = session_enabled = False
auth_enabled = session_enabled = basic_auth_enabled = False
if not options['http_root'] or options['http_root'] == '/':
plexpy.HTTP_ROOT = options['http_root'] = '/'