From e82fca056db2c62a7b1bde42966cc0c6b66770b8 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Tue, 18 Jan 2011 15:00:05 +0200 Subject: [PATCH] websrv_lib: flush at plain http, too Since the write-buffering was enabled, it is now needed to flush. Fixes static http, at least. bzr revid: p_christ@hol.gr-20110118130005-tk5rz84po3q7qofu --- bin/service/websrv_lib.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/service/websrv_lib.py b/bin/service/websrv_lib.py index 03b0032542b..dff77fa6a87 100644 --- a/bin/service/websrv_lib.py +++ b/bin/service/websrv_lib.py @@ -396,6 +396,7 @@ class MultiHTTPHandler(FixSendError, HttpOptions, BaseHTTPRequestHandler): return if not self.parse_rawline(): self.log_message("Could not parse rawline.") + self.wfile.flush() return # self.parse_request(): # Do NOT parse here. the first line should be the only @@ -404,6 +405,7 @@ class MultiHTTPHandler(FixSendError, HttpOptions, BaseHTTPRequestHandler): if not self.parse_request(): return self.do_OPTIONS() + self.wfile.flush() return for vdir in self.server.vdirs: @@ -430,9 +432,11 @@ class MultiHTTPHandler(FixSendError, HttpOptions, BaseHTTPRequestHandler): "client closed connection", self.rlpath.rstrip()) else: raise + self.wfile.flush() return # if no match: self.send_error(404, "Path not found: %s" % self.path) + self.wfile.flush() return def _get_ignore_body(self,fore): @@ -481,10 +485,6 @@ class SecureMultiHTTPHandler(MultiHTTPHandler): except Exception: pass - def handle_one_request(self): - MultiHTTPHandler.handle_one_request(self) - self.wfile.flush() - import threading class ConnThreadingMixIn: """Mix-in class to handle each _connection_ in a new thread.