Bug #1457264: parse http://host?query correctly in urllib

diff --git a/Lib/urllib.py b/Lib/urllib.py
index aeca3f1007343e31b1418c75ef3d43c69d10ad19..d1c50f61920d01762f6b6d59d1511519172e32e6 100644 (file)
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -1031,7 +1031,7 @@ def splithost(url):
     global _hostprog
     if _hostprog is None:
         import re
-        _hostprog = re.compile('^//([^/]*)(.*)$')
+        _hostprog = re.compile('^//([^/?]*)(.*)$')
 
     match = _hostprog.match(url)
     if match: return match.group(1, 2)