Revert 121572 - Add client for background testing of HTTP pipelining.

net/tools/testserver/testserver.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This is a simple HTTP/FTP/SYNC/TCP/UDP/ server used for testing Chrome.
 
 It supports several test URLs, as specified by the handlers in TestPageHandler.
 By default, it listens on an ephemeral port and sends the port number back to
 the originating process over a pipe. The originating process can specify an
@@ skipping 360 matching lines @@
       self.AuthDigestHandler,
       self.SlowServerHandler,
       self.ChunkedServerHandler,
       self.ContentTypeHandler,
       self.NoContentHandler,
       self.ServerRedirectHandler,
       self.ClientRedirectHandler,
       self.MultipartHandler,
       self.MultipartSlowHandler,
       self.GetSSLSessionCacheHandler,
-      self.CloseSocketHandler,
       self.DefaultResponseHandler]
     post_handlers = [
       self.EchoTitleHandler,
       self.EchoHandler,
       self.DeviceManagementHandler,
       self.PostOnlyFileHandler] + get_handlers
     put_handlers = [
       self.EchoTitleHandler,
       self.EchoHandler] + get_handlers
     head_handlers = [
@@ skipping 524 matching lines @@
 
   def PostOnlyFileHandler(self):
     """This handler sends the contents of the requested file on a POST."""
     prefix = urlparse.urljoin(self.server.file_root_url, 'post/')
     if not self.path.startswith(prefix):
       return False
     self.ReadRequestBody()
     return self._FileHandlerHelper(prefix)
 
   def _FileHandlerHelper(self, prefix):
-    old_protocol_version = self.protocol_version
     _, _, url_path, _, query, _ = urlparse.urlparse(self.path)
     sub_path = url_path[len(prefix):]
     entries = sub_path.split('/')
     file_path = os.path.join(self.server.data_dir, *entries)
     if os.path.isdir(file_path):
       file_path = os.path.join(file_path, 'index.html')
 
     if not os.path.isfile(file_path):
       print "File not found " + sub_path + " full path:" + file_path
       self.send_error(404)
       return True
 
     f = open(file_path, "rb")
     data = f.read()
     f.close()
 
     data = self._ReplaceFileData(data, query)
 
     # If file.mock-http-headers exists, it contains the headers we
     # should send.  Read them in and parse them.
     headers_path = file_path + '.mock-http-headers'
     if os.path.isfile(headers_path):
       f = open(headers_path, "r")
 
       # "HTTP/1.1 200 OK"
       response = f.readline()
-      http_major, http_minor, status_code = re.findall(
-          'HTTP/(\d+).(\d+) (\d+)', response)[0]
-      self.protocol_version = "HTTP/%s.%s" % (http_major, http_minor)
+      status_code = re.findall('HTTP/\d+.\d+ (\d+)', response)[0]
       self.send_response(int(status_code))
 
       for line in f:
         header_values = re.findall('(\S+):\s*(.*)', line)
         if len(header_values) > 0:
           # "name: value"
           name, value = header_values[0]
           self.send_header(name, value)
       f.close()
     else:
@@ skipping 21 matching lines @@
 
       self.send_header('Content-Type', self.GetMIMETypeFromName(file_path))
       self.send_header('Accept-Ranges', 'bytes')
       self.send_header('Content-Length', len(data))
       self.send_header('ETag', '\'' + file_path + '\'')
     self.end_headers()
 
     if (self.command != 'HEAD'):
       self.wfile.write(data)
 
-    self.protocol_version = old_protocol_version
     return True
 
   def SetCookieHandler(self):
     """This handler just sets a cookie, for testing cookie handling."""
 
     if not self._ShouldHandleRequest("/set-cookie"):
       return False
 
     query_char = self.path.find('?')
     if query_char != -1:
@@ skipping 417 matching lines @@
     self.send_header('Content-Type', 'text/plain')
     self.end_headers()
     try:
       for (action, sessionID) in self.server.session_cache.log:
         self.wfile.write('%s\t%s\n' % (action, sessionID.encode('hex')))
     except AttributeError, e:
       self.wfile.write('Pass --https-record-resume in order to use' +
                        ' 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.
     Note that we specify the content-length as without it the https connection
     is not closed properly (and the browser keeps expecting data)."""
 
     contents = "Default response given for path: " + self.path
     self.send_response(200)
     self.send_header('Content-Type', 'text/html')
     self.send_header('Content-Length', len(contents))
@@ skipping 565 matching lines @@
                            'random key if none is specified on the command '
                            'line.')
   option_parser.add_option('', '--policy-user', default='user@example.com',
                            dest='policy_user',
                            help='Specify the user name the server should '
                            'report back to the client as the user owning the '
                            'token used for making the policy request.')
   options, args = option_parser.parse_args()
 
   sys.exit(main(options, args))