From cde37be4f594451c1b791b7a3a66d78c2bc44d54 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Sat, 25 Apr 2015 11:44:53 +0200 Subject: [enh] basic support for http proxy (see #236) --- 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 52ced1363..8a0adefd5 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -110,6 +110,7 @@ _category_names = (gettext('files'), gettext('news'), gettext('map')) +outgoing_proxies = settings.get('outgoing_proxies', None) @babel.localeselector def get_locale(): @@ -638,7 +639,8 @@ def image_proxy(): resp = requests.get(url, stream=True, timeout=settings['server'].get('request_timeout', 2), - headers=headers) + headers=headers, + proxies=outgoing_proxies) if resp.status_code == 304: return '', resp.status_code -- cgit v1.2.3 From 83e48fa89bd28a38b46a717d786cc7bfad26ff21 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Sat, 25 Apr 2015 12:05:35 +0200 Subject: flake8 fix --- searx/webapp.py | 1 + 1 file changed, 1 insertion(+) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index 8a0adefd5..3b6ac6591 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -112,6 +112,7 @@ _category_names = (gettext('files'), outgoing_proxies = settings.get('outgoing_proxies', None) + @babel.localeselector def get_locale(): locale = request.accept_languages.best_match(settings['locales'].keys()) -- cgit v1.2.3