mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-12-03 23:06:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

SF patch #467430.

Browse Source 
- replace some log_error() calls with log_message()

- flush self.rfile before forking too (hope this works on Windows)
This commit is contained in:
Guido van Rossum 2001-10-17 06:45:56 +00:00
parent b33e789cb8
commit bcbdc95e90
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/CGIHTTPServer.py
View File

@ -192,6 +192,7 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
if '=' not in decoded_query: if '=' not in decoded_query:
args.append(decoded_query) args.append(decoded_query)
nobody = nobody_uid() nobody = nobody_uid()
self.rfile.flush() # Always flush before forking
self.wfile.flush() # Always flush before forking self.wfile.flush() # Always flush before forking
pid = os.fork() pid = os.fork()
if pid != 0: if pid != 0:
@ -226,7 +227,7 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
cmdline = "%s -u %s" % (interp, cmdline) cmdline = "%s -u %s" % (interp, cmdline)
if '=' not in query and '"' not in query: if '=' not in query and '"' not in query:
cmdline = '%s "%s"' % (cmdline, query) cmdline = '%s "%s"' % (cmdline, query)
self.log_error("command: %s", cmdline) self.log_message("command: %s", cmdline)
try: try:
nbytes = int(length) nbytes = int(length)
except: except:
@ -241,7 +242,7 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
if sts: if sts:
self.log_error("CGI script exit status %#x", sts) self.log_error("CGI script exit status %#x", sts)
else: else:
self.log_error("CGI script exited OK") self.log_message("CGI script exited OK")
else: else:
# Other O.S. -- execute script in this process # Other O.S. -- execute script in this process
@ -266,7 +267,7 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
except SystemExit, sts: except SystemExit, sts:
self.log_error("CGI script exit status %s", str(sts)) self.log_error("CGI script exit status %s", str(sts))
else: else:
self.log_error("CGI script exited OK") self.log_message("CGI script exited OK")
nobody = None nobody = None

1
Misc/ACKS
View File

@ -301,6 +301,7 @@ Oscar Nierstrasz
Hrvoje Niksic Hrvoje Niksic
Bill Noon Bill Noon
Stefan Norberg Stefan Norberg
Joe Norton
Neal Norwitz Neal Norwitz
Jeffrey Ollie Jeffrey Ollie
Nigel O'Brian Nigel O'Brian