Bug #1394565: SimpleHTTPServer now doesn't choke on query paramters

any more.

diff --git a/Lib/SimpleHTTPServer.py b/Lib/SimpleHTTPServer.py
index 4b27d17005d18291a91bb6821ae429e8996ab759..fe0c46653f4a81bf7d389f3ad353d9d9739f7df1 100644 (file)
--- a/Lib/SimpleHTTPServer.py
+++ b/Lib/SimpleHTTPServer.py
@@ -14,6 +14,7 @@ import os
 import posixpath
 import BaseHTTPServer
 import urllib
+import urlparse
 import cgi
 import shutil
 import mimetypes
@@ -132,6 +133,8 @@ class SimpleHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         probably be diagnosed.)
 
         """
+        # abandon query parameters
+        path = urlparse.urlparse(path)[2]
         path = posixpath.normpath(urllib.unquote(path))
         words = path.split('/')
         words = filter(None, words)

diff --git a/Misc/NEWS b/Misc/NEWS
index ca9317163a215734b54d7a7bb4985507d310abce..b1a938b9be857c615b7619a013c98185ef48c39c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -68,6 +68,9 @@ Extension Modules
 Library
 -------
 
+- Bug #1394565: SimpleHTTPServer now doesn't choke on query paramters
+  any more.
+  
 - Bug #1403410: The warnings module now doesn't get confused
   when it can't find out the module name it generates a warning for.