CherryPy 8.1.2 - Fix last SSL-bug

sabnzbd · Oct 3, 2016 · 1e72304 · 1e72304
1 parent 692ed8f
commit 1e72304
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/INSTALL.txt b/INSTALL.txt
@@ -83,7 +83,7 @@ Optional modules Unix/Linux/OSX
                             If not, you cannot use the NotifyOSD feature.
 
 Embedded modules (preferably use the included version)
-    CherryPy-8.1.0 with patches http://www.cherrypy.org
+    CherryPy-8.1.2 with patches http://www.cherrypy.org
 
 
 Unpack the ZIP-file containing the SABnzbd sources to any folder of your liking.

diff --git a/SABnzbd.py b/SABnzbd.py
@@ -53,7 +53,7 @@
 
 import cherrypy
 if [int(n) for n in cherrypy.__version__.split('.')] < [8, 1, 2]:
-    print 'Sorry, requires Python module Cherrypy 8.1.0+ (use the included version)'
+    print 'Sorry, requires Python module Cherrypy 8.1.2+ (use the included version)'
     sys.exit(1)
 
 from cherrypy import _cpserver

diff --git a/cherrypy/VERSION.txt b/cherrypy/VERSION.txt
@@ -1,4 +1,4 @@
-CherryPy 8.1.0 
+CherryPy 8.1.2 
 Official distribution: https://github.com/cherrypy/cherrypy/releases
 The folders 'tutorial', 'test' and 'scaffold' have been removed.
 This file has been added.

diff --git a/cherrypy/wsgiserver/__init__.py b/cherrypy/wsgiserver/__init__.py
@@ -1070,6 +1070,9 @@ def recv(self, size):
                 self.bytes_read += len(data)
                 return data
             except socket.error as e:
+                # Catch 'unknown ca' errors from builtin SSL-adapter
+                if len(e.args) > 1 and 'unknown ca' in e.args[1]:
+                    return
                 if (e.args[0] not in socket_errors_nonblocking
                         and e.args[0] not in socket_error_eintr):
                     raise