@@ -4,17 +4,25 @@
 import BaseHTTPServer
 import httplib
 import os
+import socket
 
 
 class StoppableHttpRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
     """http request handler with QUIT stopping the server"""
 
+    def setup(self):
+        SimpleHTTPServer.SimpleHTTPRequestHandler.setup(self)
+        self.rfile.close()
+        self.wfile.close()
+        self.rfile = HttpEchoer(self.connection._sock, 'rb', self.rbufsize)
+        self.wfile = HttpEchoer(self.connection._sock, 'wb', self.wbufsize)
+
     def do_QUIT(self):
         """send 200 OK response, and set server.stop to True"""
         self.send_response(200)
         self.end_headers()
         self.server.stop = True
-        
+
     def do_POST(self):
         # We could also process paremeters here using something like below.
         # length = self.headers['Content-Length']
@@ -63,7 +71,11 @@ def send_head(self):
         self.send_response(200)
         self.send_header("Content-type", ctype)
         fs = os.fstat(f.fileno())
-        self.send_header("Content-Length", str(fs[6]))
+        # chrome hangs if this server runs on windows
+        # it probably waits for more data -> os.fstat() does not return correct
+        # length? We are responding with HTTP 1.0 = we do not need
+        # content-length header:
+        # self.send_header("Content-Length", str(fs[6]))
         self.send_header("Last-Modified", self.date_time_string(fs.st_mtime))
         self.end_headers()
         return f
@@ -78,27 +90,53 @@ def serve_forever(self):
         while not self.stop:
             self.handle_request()
 
+
+class HttpEchoer(socket._fileobject):
+    # echoes all HTTP traffic to a file if
+    # the server output is set to a file in run_tests.py
+    def read(self, size=-1):
+        data = super(HttpEchoer, self).read(size)
+        sys.stdout.write("-->: %s" % data)
+        sys.stdout.flush()
+        return data
+
+    def readline(self, size=-1):
+        data = super(HttpEchoer, self).readline(size)
+        sys.stdout.write("-->: %s" % data)
+        sys.stdout.flush()
+        return data
+
+    def readlines(self, sizehint=0):
+        data = super(HttpEchoer, self).readlines(sizehint)
+        sys.stdout.write("-->: %s" % data)
+        sys.stdout.flush()
+        return data
+
+    def write(self, data):
+        sys.stdout.write("<--: %s" % data)
+        sys.stdout.flush()
+        super(HttpEchoer, self).write(data)
+
+
 def stop_server(port=7000):
     """send QUIT request to http server running on localhost:<port>"""
     conn = httplib.HTTPConnection("localhost:%d" % port)
     conn.request("QUIT", "/")
     conn.getresponse()
 
+
 def start_server(port=7000):
     import os
     os.chdir(os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), '..'))
     server = StoppableHttpServer(('', port), StoppableHttpRequestHandler)
     server.serve_forever()
-    
-    
+
 if __name__ == '__main__':
     import sys
-    if len(sys.argv) != 2 or sys.argv[1] not in [ 'start', 'stop' ]:
+    if len(sys.argv) != 2 or sys.argv[1] not in ['start', 'stop']:
         print('usage: %s start|stop' % sys.argv[0])
         sys.exit(1)
     if sys.argv[1] == 'start':
         start_server()
     else:
         stop_server()
-
-
 
@@ -46,8 +46,9 @@ def acceptance_tests(interpreter, browser, args):
 
 def start_http_server():
     server_output = TemporaryFile()
+    #server_output = open("server.log", 'w+', buffering=False)
     Popen(['python', env.HTTP_SERVER_FILE ,'start'],
-          stdout=server_output, stderr=server_output)
+          bufsize=0, stdout=server_output, stderr=server_output)
 
 def execute_tests(runner, args):
     if not os.path.exists(env.RESULTS_DIR):