Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #7494 -- Fixed build_absolute_url() for some types of (uncommon…

…) URLs.

Patch from tom@almostobsolete.net and RobotAdam.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8490 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 646f2f6101cda3e20908928de44739dfff596b0f 1 parent 3dd69a9
Malcolm Tredinnick malcolmt authored
5 django/http/__init__.py
View
@@ -1,4 +1,5 @@
import os
+import re
from Cookie import SimpleCookie, CookieError
from pprint import pformat
from urllib import urlencode
@@ -18,6 +19,8 @@
RESERVED_CHARS="!*'();:@&=+$,/?%#[]"
+absolute_http_url_re = re.compile(r"^https?://", re.I)
+
class Http404(Exception):
pass
@@ -65,7 +68,7 @@ def build_absolute_uri(self, location=None):
"""
if not location:
location = self.get_full_path()
- if not ':' in location:
+ if not absolute_http_url_re.match(location):
current_uri = '%s://%s%s' % (self.is_secure() and 'https' or 'http',
self.get_host(), self.path)
location = urljoin(current_uri, location)
8 tests/regressiontests/requests/tests.py
View
@@ -36,4 +36,12 @@
>>> from django.http import parse_cookie
>>> parse_cookie('invalid:key=true')
{}
+
+>>> request = HttpRequest()
+>>> print request.build_absolute_uri(location="https://www.example.com/asdf")
+https://www.example.com/asdf
+>>> request.get_host = lambda: 'www.example.com'
+>>> request.path = ''
+>>> print request.build_absolute_uri(location="/path/with:colons")
+http://www.example.com/path/with:colons
"""
Please sign in to comment.
Something went wrong with that request. Please try again.