improve https rewriting

Browse Source
This commit is contained in:
Thomas Pointhuber 2014-09-14 14:17:12 +02:00
parent 6e6dbc1bb4
commit 0616d26feb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
searx/__init__.py
View File

@ -24,5 +24,7 @@ else:
with open(settings_path) as settings_yaml: with open(settings_path) as settings_yaml:
settings = load(settings_yaml) settings = load(settings_yaml)
# loade https rules # load https rules only if https rewrite is enabled
load_https_rules(https_rewrite_path) if settings.get('server', {}).get('https_rewrite'):
# loade https rules
load_https_rules(https_rewrite_path)

3
searx/webapp.py
View File

@ -247,6 +247,9 @@ def index():
# set new url # set new url
result['url'] = new_result_url result['url'] = new_result_url
# target has matched, do not search over the other rules
break
if search.request_data.get('format', 'html') == 'html': if search.request_data.get('format', 'html') == 'html':
if 'content' in result: if 'content' in result:
result['content'] = highlight_content(result['content'], result['content'] = highlight_content(result['content'],