Merge pull request #297 from dalf/proxies

[enh] Implement http proxies for outgoing requests. (see #236)
This commit is contained in:
Adam Tauber 2015-04-26 12:19:15 -04:00
commit 1f0e6ce65b
3 changed files with 14 additions and 2 deletions

View file

@ -111,6 +111,8 @@ _category_names = (gettext('files'),
gettext('news'),
gettext('map'))
outgoing_proxies = settings.get('outgoing_proxies', None)
@babel.localeselector
def get_locale():
@ -645,7 +647,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