diff options
| author | Thomas Pointhuber <thomas.pointhuber@gmx.at> | 2014-09-14 14:17:12 +0200 |
|---|---|---|
| committer | Thomas Pointhuber <thomas.pointhuber@gmx.at> | 2014-10-15 14:05:42 +0200 |
| commit | 0616d26feb0f96b3d4fd6b2744ae0288c9fed96b (patch) | |
| tree | 61a7550cfde0055605b4bfe1ba36bf7d1ce2d918 /searx | |
| parent | 6e6dbc1bb4a3e6f8746ea3677cdbc190c762b511 (diff) | |
| download | searxng-0616d26feb0f96b3d4fd6b2744ae0288c9fed96b.tar.gz searxng-0616d26feb0f96b3d4fd6b2744ae0288c9fed96b.zip | |
improve https rewriting
Diffstat (limited to 'searx')
| -rw-r--r-- | searx/__init__.py | 6 | ||||
| -rw-r--r-- | searx/webapp.py | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/searx/__init__.py b/searx/__init__.py index 0acc61447..d4fc7f0bb 100644 --- a/searx/__init__.py +++ b/searx/__init__.py @@ -24,5 +24,7 @@ else: with open(settings_path) as settings_yaml: settings = load(settings_yaml) -# loade https rules -load_https_rules(https_rewrite_path) +# load https rules only if https rewrite is enabled +if settings.get('server', {}).get('https_rewrite'): + # loade https rules + load_https_rules(https_rewrite_path) diff --git a/searx/webapp.py b/searx/webapp.py index 7952415af..d9dc5f710 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -247,6 +247,9 @@ def index(): # set new 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 'content' in result: result['content'] = highlight_content(result['content'], |