From bcbdc95e90794794081927b81006ce8563974969 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 17 Oct 2001 06:45:56 +0000 Subject: SF patch #467430. - replace some log_error() calls with log_message() - flush self.rfile before forking too (hope this works on Windows) --- Lib/CGIHTTPServer.py | 7 ++++--- Misc/ACKS | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Lib/CGIHTTPServer.py b/Lib/CGIHTTPServer.py index 809cab7..e8abd22 100644 --- a/Lib/CGIHTTPServer.py +++ b/Lib/CGIHTTPServer.py @@ -192,6 +192,7 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): if '=' not in decoded_query: args.append(decoded_query) nobody = nobody_uid() + self.rfile.flush() # Always flush before forking self.wfile.flush() # Always flush before forking pid = os.fork() if pid != 0: @@ -226,7 +227,7 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): cmdline = "%s -u %s" % (interp, cmdline) if '=' not in query and '"' not in query: cmdline = '%s "%s"' % (cmdline, query) - self.log_error("command: %s", cmdline) + self.log_message("command: %s", cmdline) try: nbytes = int(length) except: @@ -241,7 +242,7 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): if sts: self.log_error("CGI script exit status %#x", sts) else: - self.log_error("CGI script exited OK") + self.log_message("CGI script exited OK") else: # Other O.S. -- execute script in this process @@ -266,7 +267,7 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): except SystemExit, sts: self.log_error("CGI script exit status %s", str(sts)) else: - self.log_error("CGI script exited OK") + self.log_message("CGI script exited OK") nobody = None diff --git a/Misc/ACKS b/Misc/ACKS index 074fa94..0ae72c3 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -301,6 +301,7 @@ Oscar Nierstrasz Hrvoje Niksic Bill Noon Stefan Norberg +Joe Norton Neal Norwitz Jeffrey Ollie Nigel O'Brian -- cgit v0.12