diff options
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/testserver/run_testserver.cc | 2 | ||||
| -rw-r--r-- | net/tools/testserver/testserver.py | 25 |
2 files changed, 3 insertions, 24 deletions
diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc index 716e320..dc16a16 100644 --- a/net/tools/testserver/run_testserver.cc +++ b/net/tools/testserver/run_testserver.cc @@ -55,7 +55,7 @@ int main(int argc, const char* argv[]) { } else if (protocol == "ftp") { test_server = FTPTestServer::CreateServer(doc_root); } else if (protocol == "http") { - test_server = HTTPTestServer::CreateServer(doc_root, NULL); + test_server = HTTPTestServer::CreateServer(doc_root); } else { NOTREACHED(); } diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py index 8e3df5e..999cde7 100644 --- a/net/tools/testserver/testserver.py +++ b/net/tools/testserver/testserver.py @@ -82,16 +82,6 @@ class HTTPSServer(tlslite.api.TLSSocketServerMixIn, StoppableHTTPServer): print "Handshake failure:", str(error) return False -class ForkingHTTPServer(SocketServer.ForkingMixIn, StoppableHTTPServer): - """This is a specialization of of StoppableHTTPServer which serves each - request in a separate process""" - pass - -class ForkingHTTPSServer(SocketServer.ForkingMixIn, HTTPSServer): - """This is a specialization of of HTTPSServer which serves each - request in a separate process""" - pass - class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler): def __init__(self, request, client_address, socket_server): @@ -1200,18 +1190,10 @@ def main(options, args): if not os.path.isfile(options.cert): print 'specified cert file not found: ' + options.cert + ' exiting...' return - if options.forking: - server_class = ForkingHTTPSServer - else: - server_class = HTTPSServer - server = server_class(('127.0.0.1', port), TestPageHandler, options.cert) + server = HTTPSServer(('127.0.0.1', port), TestPageHandler, options.cert) print 'HTTPS server started on port %d...' % port else: - if options.forking: - server_class = ForkingHTTPServer - else: - server_class = StoppableHTTPServer - server = server_class(('127.0.0.1', port), TestPageHandler) + server = StoppableHTTPServer(('127.0.0.1', port), TestPageHandler) print 'HTTP server started on port %d...' % port server.data_dir = MakeDataDir() @@ -1263,9 +1245,6 @@ if __name__ == '__main__': const=SERVER_FTP, default=SERVER_HTTP, dest='server_type', help='FTP or HTTP server: default is HTTP.') - option_parser.add_option('--forking', action='store_true', default=False, - dest='forking', - help='Serve each request in a separate process.') option_parser.add_option('', '--port', default='8888', type='int', help='Port used by the server.') option_parser.add_option('', '--data-dir', dest='data_dir', |