Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Unified Diff: net/tools/testserver/testserver_base.py

Issue 210323002: Update tlslite to 0.4.6. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Executable bit and --similarity=80 Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/tools/testserver/testserver.py ('k') | third_party/tlslite/LICENSE » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/testserver/testserver_base.py
diff --git a/net/tools/testserver/testserver_base.py b/net/tools/testserver/testserver_base.py
index 455ca5c32023fd082feeb20f28991de82fead7d3..0d3f65fdca95a2482530367083ba8d7f6df4f0a4 100644
--- a/net/tools/testserver/testserver_base.py
+++ b/net/tools/testserver/testserver_base.py
@@ -14,6 +14,8 @@ import struct
import sys
import warnings
+import tlslite.errors
+
# Ignore deprecation warnings, they make our output more cluttered.
warnings.filterwarnings("ignore", category=DeprecationWarning)
@@ -71,6 +73,9 @@ class BrokenPipeHandlerMixIn:
def handle_error(self, request, client_address):
value = sys.exc_info()[1]
+ if isinstance(value, tlslite.errors.TLSClosedConnectionError):
+ print "testserver.py: Closed connection"
+ return
if isinstance(value, socket.error):
err = value.args[0]
if sys.platform in ('win32', 'cygwin'):
@@ -81,6 +86,9 @@ class BrokenPipeHandlerMixIn:
if err == pipe_err:
print "testserver.py: Broken pipe"
return
+ if err == errno.ECONNRESET:
+ print "testserver.py: Connection reset by peer"
+ return
SocketServer.BaseServer.handle_error(self, request, client_address)
« no previous file with comments | « net/tools/testserver/testserver.py ('k') | third_party/tlslite/LICENSE » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698