[fix] https issue in request url

This commit is contained in:
Pratik Vyas 2013-11-27 16:50:50 +05:30 committed by Anand Doshi
parent 62323cd9e0
commit c3dc7fa0bd

View file

@ -70,7 +70,7 @@ def get_request_site_address(full_address=False):
if not host_name:
if webnotes.request:
protocol = 'HTTPS' in webnotes.get_request_header('SERVER_PROTOCOL', "") and 'https://' or 'http://'
protocol = 'https' == webnotes.get_request_header('X-Forwarded-Proto', "") and 'https://' or 'http://'
host_name = protocol + webnotes.request.host
else:
return "http://localhost"
@ -925,4 +925,4 @@ def expand_partial_links(html):
url = get_url()
if not url.endswith("/"): url += "/"
return re.sub('(href|src){1}([\s]*=[\s]*[\'"]?)((?!http)[^\'" >]+)([\'"]?)',
'\g<1>\g<2>{}\g<3>\g<4>'.format(url), html)
'\g<1>\g<2>{}\g<3>\g<4>'.format(url), html)