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

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

Issue 863253002: Update from https://crrev.com/312600 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
Index: net/tools/testserver/testserver.py
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index 93de5cab3970c5ccfce3f9c588d34753125fe3fb..3098cc06873138f397e008d8750ef4579b39a2b9 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -193,6 +193,8 @@ class HTTPSServer(tlslite.api.TLSSocketServerMixIn,
}[cert_type])
self.ssl_handshake_settings = tlslite.api.HandshakeSettings()
+ # Enable SSLv3 for testing purposes.
+ self.ssl_handshake_settings.minVersion = (3, 0)
if ssl_bulk_ciphers is not None:
self.ssl_handshake_settings.cipherNames = ssl_bulk_ciphers
if ssl_key_exchanges is not None:
@@ -674,7 +676,12 @@ class TestPageHandler(testserver_base.BasePageHandler):
if not self._ShouldHandleRequest("/echo"):
return False
- self.send_response(200)
+ _, _, _, _, query, _ = urlparse.urlparse(self.path)
+ query_params = cgi.parse_qs(query, True)
+ if 'status' in query_params:
+ self.send_response(int(query_params['status'][0]))
+ else:
+ self.send_response(200)
self.send_header('Content-Type', 'text/html')
self.end_headers()
self.wfile.write(self.ReadRequestBody())

Powered by Google App Engine
This is Rietveld 408576698