From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 20 Jun 2011 15:45:54 +0000 (+0200)
Subject: Close #12289: Fix "is executable?" test in the CGI server
X-Git-Tag: v3.3.0a1~2079
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb25ba9b073ddcec602700484ff5fc2b1bea1a59;p=python

Close #12289: Fix "is executable?" test in the CGI server

Use os.access(path, os.X_OK) instead of (os.stat(path).st_mode & 0o111 != 0),
and ignore the test on Windows.
---

diff --git a/Lib/http/server.py b/Lib/http/server.py
index 1d193f8b2a..e571418cc0 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -897,11 +897,7 @@ def nobody_uid():
 
 def executable(path):
     """Test for executable file."""
-    try:
-        st = os.stat(path)
-    except os.error:
-        return False
-    return st.st_mode & 0o111 != 0
+    return os.access(path, os.X_OK)
 
 
 class CGIHTTPRequestHandler(SimpleHTTPRequestHandler):
@@ -1015,7 +1011,7 @@ class CGIHTTPRequestHandler(SimpleHTTPRequestHandler):
                             scriptname)
             return
         ispy = self.is_python(scriptname)
-        if not ispy:
+        if self.have_fork or not ispy:
             if not self.is_executable(scriptfile):
                 self.send_error(403, "CGI script is not executable (%r)" %
                                 scriptname)