From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 18 Dec 2011 18:00:02 +0000 (+0100)
Subject: In the test SSL server, also output the cipher name
X-Git-Tag: v3.3.0a1~573
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb0901c96898148bcd47aad2aa3ae59281af3b5a;p=thirdparty%2FPython%2Fcpython.git

In the test SSL server, also output the cipher name
---

diff --git a/Lib/test/ssl_servers.py b/Lib/test/ssl_servers.py
index 77c05426107b..77be3814e85a 100644
--- a/Lib/test/ssl_servers.py
+++ b/Lib/test/ssl_servers.py
@@ -94,7 +94,11 @@ class StatsRequestHandler(BaseHTTPRequestHandler):
         """Serve a GET request."""
         sock = self.rfile.raw._sock
         context = sock.context
-        body = pprint.pformat(context.session_stats())
+        stats = {
+            'session_cache': context.session_stats(),
+            'cipher': sock.cipher(),
+            }
+        body = pprint.pformat(stats)
         body = body.encode('utf-8')
         self.send_response(200)
         self.send_header("Content-type", "text/plain; charset=utf-8")