Index: Lib/http/server.py
===================================================================
--- Lib/http/server.py	(revision 75595)
+++ Lib/http/server.py	(working copy)
@@ -1077,7 +1077,7 @@
                 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)
+                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)