From 9cec9770be27cf4fc47d1caa2bccc59d911c20c2 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 24 Aug 2015 11:03:06 +0200
Subject: [PATCH 1/4] [fix] show debug output when enabled

---
 searx/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/searx/__init__.py b/searx/__init__.py
index 2d545a809..ea21e8f13 100644
--- a/searx/__init__.py
+++ b/searx/__init__.py
@@ -40,7 +40,7 @@ else:
 with open(settings_path) as settings_yaml:
     settings = load(settings_yaml)
 
-if settings.get('server', {}).get('debug'):
+if settings.get('general', {}).get('debug'):
     logging.basicConfig(level=logging.DEBUG)
 else:
     logging.basicConfig(level=logging.WARNING)

From 5bffa9ca33f8ec98baebca13ee9b16262bfe4e8d Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 24 Aug 2015 11:18:58 +0200
Subject: [PATCH 2/4] [fix] rewrite scheme to http if there is no one, FIX #390

---
 searx/search.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/searx/search.py b/searx/search.py
index 6288a46eb..1bf05f7f9 100644
--- a/searx/search.py
+++ b/searx/search.py
@@ -206,6 +206,10 @@ def score_results(results):
         # if there is no duplicate found, append result
         else:
             res['score'] = score
+            # if the result has no scheme, use http as default
+            if res['parsed_url'].scheme == '':
+                res['parsed_url'] = res['parsed_url']._replace(scheme="http")
+
             results.append(res)
 
     results = sorted(results, key=itemgetter('score'), reverse=True)

From 23b9095cbf2d31a1495ee3d63a55bd81548cd367 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 24 Aug 2015 11:28:55 +0200
Subject: [PATCH 3/4] [fix] improve result handling of startpage engine

---
 searx/engines/startpage.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/searx/engines/startpage.py b/searx/engines/startpage.py
index 9d5b4befe..08e4f7a5b 100644
--- a/searx/engines/startpage.py
+++ b/searx/engines/startpage.py
@@ -66,7 +66,11 @@ def response(resp):
         url = link.attrib.get('href')
 
         # block google-ad url's
-        if re.match("^http(s|)://www.google.[a-z]+/aclk.*$", url):
+        if re.match("^http(s|)://(www\.)?google\.[a-z]+/aclk.*$", url):
+            continue
+
+        # block startpage search url's
+        if re.match("^http(s|)://(www\.)?startpage\.com/do/search\?.*$", url):
             continue
 
         title = escape(extract_text(link))

From 996c96fffff328497c2ba305c61e064256c84188 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 24 Aug 2015 11:31:30 +0200
Subject: [PATCH 4/4] [fix] block ixquick search url's

---
 searx/engines/startpage.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/searx/engines/startpage.py b/searx/engines/startpage.py
index 08e4f7a5b..7d58f7f01 100644
--- a/searx/engines/startpage.py
+++ b/searx/engines/startpage.py
@@ -73,6 +73,10 @@ def response(resp):
         if re.match("^http(s|)://(www\.)?startpage\.com/do/search\?.*$", url):
             continue
 
+        # block ixquick search url's
+        if re.match("^http(s|)://(www\.)?ixquick\.com/do/search\?.*$", url):
+            continue
+
         title = escape(extract_text(link))
 
         if result.xpath('./p[@class="desc"]'):