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

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

Issue 388493002: Revert 282307 "Map WebSocket URL schemes to HTTP URL schemes for..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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: trunk/src/net/tools/testserver/testserver.py
===================================================================
--- trunk/src/net/tools/testserver/testserver.py (revision 282330)
+++ trunk/src/net/tools/testserver/testserver.py (working copy)
@@ -103,7 +103,6 @@
self.tls_client_ca = None
self.tls_module = 'ssl'
self.use_basic_auth = False
- self.basic_auth_credential = 'Basic ' + base64.b64encode('test:test')
class RecordingSSLSessionCache(object):
@@ -2025,7 +2024,6 @@
print 'WebSocket server started on %s://%s:%d...' % \
(scheme, host, server.server_port)
server_data['port'] = server.server_port
- websocket_options.use_basic_auth = self.options.ws_basic_auth
elif self.options.server_type == SERVER_TCP_ECHO:
# Used for generating the key (randomly) that encodes the "echo request"
# message.
@@ -2207,10 +2205,6 @@
'support for exactly one protocol, http/1.1')
self.option_parser.add_option('--file-root-url', default='/files/',
help='Specify a root URL for files served.')
- # TODO(ricea): Generalize this to support basic auth for HTTP too.
- self.option_parser.add_option('--ws-basic-auth', action='store_true',
- dest='ws_basic_auth',
- help='Enable basic-auth for WebSocket')
if __name__ == '__main__':

Powered by Google App Engine
This is Rietveld 408576698