From a98bbefbcf89ad8d5959c0ddd1c02ab65b92913d Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sun, 25 Dec 2016 23:02:57 +0100 Subject: [enh] configurable listening http protocol version --- searx/webapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index 096e1f269..f8253ec00 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -81,7 +81,7 @@ except ImportError: # serve pages with HTTP/1.1 from werkzeug.serving import WSGIRequestHandler -WSGIRequestHandler.protocol_version = "HTTP/1.1" +WSGIRequestHandler.protocol_version = "HTTP/{}".format(settings['server']['http_protocol_version']) static_path, templates_path, themes =\ get_themes(settings['ui']['themes_path'] -- cgit v1.2.3 From 14f58bdaecb288ac65782b2025e765c514b1844e Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sun, 25 Dec 2016 23:31:51 +0100 Subject: [fix] robot tests ++ set default value for server http protocol version --- searx/webapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index f8253ec00..8f02a034e 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -81,7 +81,7 @@ except ImportError: # serve pages with HTTP/1.1 from werkzeug.serving import WSGIRequestHandler -WSGIRequestHandler.protocol_version = "HTTP/{}".format(settings['server']['http_protocol_version']) +WSGIRequestHandler.protocol_version = "HTTP/{}".format(settings['server'].get('http_protocol_version', '1.0')) static_path, templates_path, themes =\ get_themes(settings['ui']['themes_path'] -- cgit v1.2.3 From a605377c40e5f9d5ce80a222df65b605dfcd3907 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 27 Dec 2016 17:25:19 +0100 Subject: [enh] explicit engine init --- searx/webapp.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index 8f02a034e..8a720fdc6 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -53,7 +53,7 @@ from flask_babel import Babel, gettext, format_date, format_decimal from flask.json import jsonify from searx import settings, searx_dir, searx_debug from searx.engines import ( - categories, engines, get_engines_stats, engine_shortcuts + categories, engines, engine_shortcuts, get_engines_stats, initialize_engines ) from searx.utils import ( UnicodeWriter, highlight_content, html_to_text, get_themes, @@ -765,6 +765,7 @@ def page_not_found(e): def run(): + initialize_engines(settings['engines']) app.run( debug=searx_debug, use_debugger=searx_debug, -- cgit v1.2.3 From 68cbf0448f0b24ec9d15301659576ace695e06ef Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Tue, 27 Dec 2016 17:26:25 +0100 Subject: [fix] do not reload engines twice if started with debug mode --- searx/webapp.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index 8a720fdc6..6ad9ef06e 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -765,7 +765,9 @@ def page_not_found(e): def run(): - initialize_engines(settings['engines']) + if not searx_debug or os.environ.get("WERKZEUG_RUN_MAIN") == "true": + initialize_engines(settings['engines']) + app.run( debug=searx_debug, use_debugger=searx_debug, -- cgit v1.2.3