From 0616d26feb0f96b3d4fd6b2744ae0288c9fed96b Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sun, 14 Sep 2014 14:17:12 +0200
Subject: [PATCH] improve https rewriting

---
 searx/__init__.py | 6 ++++--
 searx/webapp.py   | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/searx/__init__.py b/searx/__init__.py
index 0acc614..d4fc7f0 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 7952415..d9dc5f7 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'],