From: Senthil Kumaran <orsenthil@gmail.com>
Date: Fri, 17 Dec 2010 04:54:43 +0000 (+0000)
Subject: Merged revisions 87329 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3396e8671d15ff90f0197a4215bb14e48a593837;p=python

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

........
  r87329 | senthil.kumaran | 2010-12-17 12:48:45 +0800 (Fri, 17 Dec 2010) | 3 lines

  Fix Issue9721 - urljoin behavior when the relative url starts with ';'
........
---

diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
index ec2df3c8b7..1c6c501d67 100644
--- a/Lib/test/test_urlparse.py
+++ b/Lib/test/test_urlparse.py
@@ -293,6 +293,9 @@ class UrlParseTestCase(unittest.TestCase):
         #self.checkJoin(RFC3986_BASE, 'http:g','http:g') # strict parser
         self.checkJoin(RFC3986_BASE, 'http:g','http://a/b/c/g') #relaxed parser
 
+        # Test for issue9721
+        self.checkJoin('http://a/b/c/de', ';x','http://a/b/c/;x')
+
     def test_urljoins(self):
         self.checkJoin(SIMPLE_BASE, 'g:h','g:h')
         self.checkJoin(SIMPLE_BASE, 'http:g','http://a/b/c/g')
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index cfd47f9d92..e8e9cc7b92 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -249,14 +249,9 @@ def urljoin(base, url, allow_fragments=True):
     if path[:1] == '/':
         return urlunparse((scheme, netloc, path,
                            params, query, fragment))
-    if not path:
+    if not path and not params:
         path = bpath
-        if not params:
-            params = bparams
-        else:
-            path = path[:-1]
-            return urlunparse((scheme, netloc, path,
-                                params, query, fragment))
+        params = bparams
         if not query:
             query = bquery
         return urlunparse((scheme, netloc, path,
diff --git a/Misc/NEWS b/Misc/NEWS
index 2b09d5fc67..a49b34488c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -20,6 +20,8 @@ Core and Builtins
 
 Library
 -------
+- Issue #9721: Fix the behavior of urljoin when the relative url starts with a
+  ';' character. Patch by Wes Chow.
 
 - Issue #10714: Limit length of incoming request in http.server to 65536 bytes
   for security reasons.  Initial patch by Ross Lagerwall.