Ticket #11826: rfc2616-ticket11826.patch

django/forms/fields.py

@@ -537 +537 @@
     r'localhost|' #localhost...
     r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip
     r'(?::\d+)?' # optional port
-    r'(?:/?|/\S+)$', re.IGNORECASE)
+    r'(?:/?|[/?]\S+)$', re.IGNORECASE)
 
 class URLField(RegexField):
     default_error_messages = {
@@ -553 +553 @@
         self.user_agent = validator_user_agent
 
     def clean(self, value):
-        # If no URL scheme given, assume http://
-        if value and '://' not in value:
-            value = u'http://%s' % value
-        # If no URL path given, assume /
-        if value and not urlparse.urlsplit(value)[2]:
-            value += '/'
+        if value:
+            if '://' not in value:
+                # If no URL scheme given, assume http://
+                value = u'http://%s' % value
+            url_fields = list(urlparse.urlsplit(value))
+            if not url_fields[2]:
+                # the path portion may need to be added before query params
+                url_fields[2] = '/'
+                value = urlparse.urlunsplit(url_fields)
         value = super(URLField, self).clean(value)
         if value == u'':
             return value

tests/regressiontests/forms/fields.py

@@ -972 +972 @@
 Traceback (most recent call last):
 ...
 ValidationError: [u'Enter a valid URL.']
+>>> f.clean('http://example.com?some_param=some_value')  # RFC 2616 3.2.3
+u'http://example.com/?some_param=some_value'
 >>> f.clean('http://.com')
 Traceback (most recent call last):
 ...