Browse Source

[fix] https issue in request url

version-14
Pratik Vyas 11 years ago
committed by Anand Doshi
parent
commit
c3dc7fa0bd
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      webnotes/utils/__init__.py

+ 2
- 2
webnotes/utils/__init__.py 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)

Loading…
Cancel
Save