Ticket #8020: t8020-http11-r7956.2.diff

trac/web/standalone.py

@@ -102 +102 @@
 
 class TracHTTPServer(ThreadingMixIn, WSGIServer):
 
-    def __init__(self, server_address, application, env_parent_dir, env_paths):
+    def __init__(self, server_address, application, env_parent_dir, env_paths,
+                 use_http_11=False):
+        request_handlers = (TracHTTPRequestHandler, TracHTTP11RequestHandler)
         WSGIServer.__init__(self, server_address, application,
-                            request_handler=TracHTTPRequestHandler)
+                            request_handler=request_handlers[bool(use_http_11)])
 
 
 class TracHTTPRequestHandler(WSGIRequestHandler):
@@ -115 +117 @@
         # Disable reverse name lookups
         return self.client_address[:2][0]
 
+class TracHTTP11RequestHandler(TracHTTPRequestHandler):
+    protocol_version = 'HTTP/1.1'
 
+
 def main():
     from optparse import OptionParser, OptionValueError
     parser = OptionParser(usage='usage: %prog [options] [projenv] ...',
@@ -161 +166 @@
     parser.add_option('-q', '--unquote', action='store_true',
                       dest='unquote',
                       help='unquote PATH_INFO (may be needed when using ajp')
+    parser.add_option('--http11', action='store_true', dest='http11',
+                      help='use HTTP/1.1 protocol version instead of HTTP/1.0')
     parser.add_option('-e', '--env-parent-dir', action='store',
                       dest='env_parent_dir', metavar='PARENTDIR',
                       help='parent directory of the project environments')
@@ -237 +244 @@
     if options.protocol == 'http':
         def serve():
             httpd = TracHTTPServer(server_address, wsgi_app,
-                                   options.env_parent_dir, args)
+                                   options.env_parent_dir, args,
+                                   use_http_11=options.http11)
+
             print 'Server starting in PID %i.' % os.getpid()
             addr, port = server_address
             if not addr or addr == '0.0.0.0':
@@ -245 +254 @@
                        % (port, port, base_path)
             else:
                 print 'Serving on http://%s:%s/%s' % (addr, port, base_path)
+            if options.http11:
+                print 'Using HTTP/1.1 protocol version'
             httpd.serve_forever()
     elif options.protocol in ('scgi', 'ajp'):
         def serve():