From 1e72304c254970dab14fad945dfb7891296c0581 Mon Sep 17 00:00:00 2001
From: Safihre <safihre@sabnzbd.org>
Date: Sat, 1 Oct 2016 17:23:11 +0200
Subject: [PATCH] CherryPy 8.1.2 - Fix last SSL-bug

---
 INSTALL.txt                     | 2 +-
 SABnzbd.py                      | 2 +-
 cherrypy/VERSION.txt            | 2 +-
 cherrypy/wsgiserver/__init__.py | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/INSTALL.txt b/INSTALL.txt
index b168eb6cd67..3cb586bd8ef 100644
--- 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
index b2f5dbe5608..e6c29835911 100755
--- 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
index 621da11812e..376c1a6e3ae 100644
--- 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
index 3b347ccaa1c..0a54beec3d6 100644
--- 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