Chromium Code Reviews| Index: net/tools/testserver/testserver.py |
| diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py |
| index b116e2ee33d75e09cce00dce63a826e84cb9852c..4f841991ebe6447b42015759643924bea15ca5b3 100755 |
| --- a/net/tools/testserver/testserver.py |
| +++ b/net/tools/testserver/testserver.py |
| @@ -298,6 +298,7 @@ class BasePageHandler(BaseHTTPServer.BaseHTTPRequestHandler): |
| self, request, client_address, socket_server) |
| def log_request(self, *args, **kwargs): |
| + print '%s %s %s' % (self.path, args, kwargs) |
|
mmenke
2012/02/01 19:08:07
You only added this for your own debugging, right?
James Simonsen
2012/02/07 00:01:37
Oops. Yeah.
|
| # Disable request logging to declutter test log output. |
| pass |
| @@ -378,6 +379,7 @@ class TestPageHandler(BasePageHandler): |
| self.MultipartHandler, |
| self.MultipartSlowHandler, |
| self.GetSSLSessionCacheHandler, |
| + self.CloseSocketHandler, |
| self.DefaultResponseHandler] |
| post_handlers = [ |
| self.EchoTitleHandler, |
| @@ -926,6 +928,7 @@ class TestPageHandler(BasePageHandler): |
| sub_path = url_path[len(prefix):] |
| entries = sub_path.split('/') |
| file_path = os.path.join(self.server.data_dir, *entries) |
| + print 'file_path %s' % file_path |
|
mmenke
2012/02/01 19:08:07
This was just for your own debugging, right?
James Simonsen
2012/02/07 00:01:37
Done.
|
| if os.path.isdir(file_path): |
| file_path = os.path.join(file_path, 'index.html') |
| @@ -1427,6 +1430,15 @@ class TestPageHandler(BasePageHandler): |
| ' this request') |
| return True |
| + def CloseSocketHandler(self): |
| + """Closes the socket without sending anything.""" |
| + |
| + if not self._ShouldHandleRequest('/close-socket'): |
| + return False |
| + |
| + self.wfile.close() |
| + return True |
| + |
| def DefaultResponseHandler(self): |
| """This is the catch-all response handler for requests that aren't handled |
| by one of the special handlers above. |