Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #16753 -- Supported network-path references in the syndication …

…framework. Thanks cato for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 40b9532668b5e4d956c7be15f721be41d3defa3e 1 parent 6f66b55
@aaugustin aaugustin authored
View
10 django/contrib/syndication/views.py
@@ -9,15 +9,15 @@
from django.utils.timezone import is_naive
def add_domain(domain, url, secure=False):
- if not (url.startswith('http://')
+ protocol = 'https' if secure else 'http'
+ if url.startswith('//'):
+ # Support network-path reference (see #16753) - RSS requires a protocol
+ url = '%s:%s' % (protocol, url)
+ elif not (url.startswith('http://')
or url.startswith('https://')
or url.startswith('mailto:')):
# 'url' must already be ASCII and URL-quoted, so no need for encoding
# conversions here.
- if secure:
- protocol = 'https'
- else:
- protocol = 'http'
url = iri_to_uri(u'%s://%s%s' % (protocol, domain, url))
return url
View
4 tests/regressiontests/syndication/tests.py
@@ -305,3 +305,7 @@ def test_add_domain(self):
views.add_domain('example.com', 'mailto:uhoh@djangoproject.com'),
'mailto:uhoh@djangoproject.com'
)
+ self.assertEqual(
+ views.add_domain('example.com', '//example.com/foo/?arg=value'),
+ 'http://example.com/foo/?arg=value'
+ )
Please sign in to comment.
Something went wrong with that request. Please try again.