Support the use of an unpatched release of CherryPy.

Use the '"redirect_url" patch only when actually present. Only needed to support https on zeroconfig/Bonjour systems.
10 years ago · bf46ba035c
3 changed files with 5 additions and 3 deletions
--- a/SABnzbd.py
+++ b/SABnzbd.py
@ -1555,7 +1555,8 @@ def main():
        browser_url = "http://%s:%s/sabnzbd" % (browserhost, cherryport)

    sabnzbd.BROWSER_URL = browser_url
-    cherrypy.wsgiserver.redirect_url(browser_url)
+    if hasattr(cherrypy.wsgiserver, 'redirect_url'):
+        cherrypy.wsgiserver.redirect_url(browser_url)

    if not autorestarted:
        launch_a_browser(browser_url)
--- a/sabnzbd/panic.py
+++ b/sabnzbd/panic.py
@ -285,4 +285,4 @@ def error_page_404(status, message, traceback, version):
    </head>
    <body><br/></body>
 </html>
-''' % cherrypy.wsgiserver.redirect_url()
+''' % sabnzbd.BROWSER_URL
--- a/sabnzbd/zconfig.py
+++ b/sabnzbd/zconfig.py
@ -84,7 +84,8 @@ def set_bonjour(host=None, port=None):
        suffix = ''
    else:
        suffix = '.local'
-    cherrypy.wsgiserver.redirect_url("https://%s%s:%s/sabnzbd" % (name, suffix, port))
+    if hasattr(cherrypy.wsgiserver, 'redirect_url'):
+        cherrypy.wsgiserver.redirect_url("https://%s%s:%s/sabnzbd" % (name, suffix, port))
    logging.debug('Try to publish in Bonjour as "%s" (%s:%s)', name, host, port)
    try:
        refObject = pybonjour.DNSServiceRegister(