From 3574807c3422851b98c85c581286efe754de85a2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 23 Jun 2017 11:30:13 +0530
Subject: [PATCH] Forgot the SSLWantRead is a subclass of socket.error

---
 src/calibre/srv/loop.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/srv/loop.py b/src/calibre/srv/loop.py
index 8cb074a316..c7500cb09c 100644
--- a/src/calibre/srv/loop.py
+++ b/src/calibre/srv/loop.py
@@ -232,6 +232,8 @@ class Connection(object):  # {{{
                 self.ready = False
                 return 0
             return bytes_read
+        except ssl.SSLWantReadError:
+            return 0
         except socket.error as e:
             if e.errno in socket_errors_nonblocking or e.errno in socket_errors_eintr:
                 return 0
@@ -239,8 +241,6 @@ class Connection(object):  # {{{
                 self.ready = False
                 return 0
             raise
-        except ssl.SSLWantReadError:
-            return 0
 
     def fill_read_buffer(self):
         try:
@@ -250,6 +250,8 @@ class Connection(object):  # {{{
                 # a closed connection is indicated by signaling
                 # a read condition, and having recv() return 0.
                 self.ready = False
+        except ssl.SSLWantReadError:
+            return
         except socket.error as e:
             if e.errno in socket_errors_nonblocking or e.errno in socket_errors_eintr:
                 return
@@ -257,8 +259,6 @@ class Connection(object):  # {{{
                 self.ready = False
                 return
             raise
-        except ssl.SSLWantReadError:
-            return
 
     def close(self):
         self.ready = False