From: Senthil Kumaran <orsenthil@gmail.com>
Date: Wed, 11 Nov 2009 04:21:22 +0000 (+0000)
Subject: Merged revisions 76210 via svnmerge from
X-Git-Tag: v3.1.2rc1~352
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca5130cba373702931f4e5ffee973e446a6763cc;p=python

Merged revisions 76210 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76210 | senthil.kumaran | 2009-11-11 09:47:53 +0530 (Wed, 11 Nov 2009) | 10 lines

  Merged revisions 76208 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76208 | senthil.kumaran | 2009-11-11 07:04:44 +0530 (Wed, 11 Nov 2009) | 3 lines

    CGIHTTPRequestHandler.run_cgi() to use subprocess for Non Unix platforms. Fix
    based on Issue1235.
  ........
................
---

diff --git a/Lib/http/server.py b/Lib/http/server.py
index 2163e748e6..797179aa31 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -1063,16 +1063,16 @@ class CGIHTTPRequestHandler(SimpleHTTPRequestHandler):
         else:
             # Non-Unix -- use subprocess
             import subprocess
-            cmdline = scriptfile
+            cmdline = [scriptfile]
             if self.is_python(scriptfile):
                 interp = sys.executable
                 if interp.lower().endswith("w.exe"):
                     # On Windows, use python.exe, not pythonw.exe
                     interp = interp[:-5] + interp[-4:]
-                cmdline = "%s -u %s" % (interp, cmdline)
-            if '=' not in query and '"' not in query:
-                cmdline = '%s "%s"' % (cmdline, query)
-            self.log_message("command: %s", cmdline)
+                cmdline = [interp, '-u'] + cmdline
+            if '=' not in query:
+                cmdline.append(query)
+            self.log_message("command: %s", subprocess.list2cmdline(cmdline))
             try:
                 nbytes = int(length)
             except (TypeError, ValueError):
@@ -1080,7 +1080,7 @@ class CGIHTTPRequestHandler(SimpleHTTPRequestHandler):
             p = subprocess.Popen(cmdline,
                                  stdin=subprocess.PIPE,
                                  stdout=subprocess.PIPE,
-                                 stderr=subprocess.PIPE,
+                                 stderr=subprocess.PIPE
                                  )
             if self.command.lower() == "post" and nbytes > 0:
                 data = self.rfile.read(nbytes)