From: Victor Stinner <vstinner@python.org>
Date: Thu, 2 Apr 2020 01:42:05 +0000 (+0200)
Subject: bpo-40094: CGIHTTPRequestHandler logs exit code (GH-19285)
X-Git-Tag: v3.9.0a6~212
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a679a0e47d58aa73b7747d4e16140048c10baf5;p=thirdparty%2FPython%2Fcpython.git

bpo-40094: CGIHTTPRequestHandler logs exit code (GH-19285)

CGIHTTPRequestHandler of http.server now logs the CGI script exit
code, rather than the CGI script exit status of os.waitpid().

For example, if the script is killed by signal 11, it now logs:
"CGI script exit code -11."
---

diff --git a/Lib/http/server.py b/Lib/http/server.py
index 2d74b95586cf..fa204fbc15e3 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -1164,8 +1164,9 @@ class CGIHTTPRequestHandler(SimpleHTTPRequestHandler):
                 while select.select([self.rfile], [], [], 0)[0]:
                     if not self.rfile.read(1):
                         break
-                if sts:
-                    self.log_error("CGI script exit status %#x", sts)
+                exitcode = os.waitstatus_to_exitcode(sts)
+                if exitcode:
+                    self.log_error(f"CGI script exit code {exitcode}")
                 return
             # Child
             try:
diff --git a/Misc/NEWS.d/next/Library/2020-04-02-01-13-28.bpo-40094.AeZ34K.rst b/Misc/NEWS.d/next/Library/2020-04-02-01-13-28.bpo-40094.AeZ34K.rst
new file mode 100644
index 000000000000..ba13d3cdf4a8
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-04-02-01-13-28.bpo-40094.AeZ34K.rst
@@ -0,0 +1,3 @@
+CGIHTTPRequestHandler of http.server now logs the CGI script exit code,
+rather than the CGI script exit status of os.waitpid(). For example, if the
+script is killed by signal 11, it now logs: "CGI script exit code -11."