summaryrefslogtreecommitdiff
path: root/searx/webapp.py
diff options
context:
space:
mode:
authorAdam Tauber <asciimoo@gmail.com>2015-04-10 01:10:49 +0200
committerAdam Tauber <asciimoo@gmail.com>2015-04-10 01:10:49 +0200
commitb2e026dde22b3026fb01873c818b295b669025e3 (patch)
treefeb2cba44b3f01284e1d981ab831587f1ffcbbcf /searx/webapp.py
parent9d11b36b5bc62fd94f77e4d0f5119b4f8cb22fa3 (diff)
[mod] remove image proxy requests from the connection pool
Diffstat (limited to 'searx/webapp.py')
-rw-r--r--searx/webapp.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/searx/webapp.py b/searx/webapp.py
index 5530becc1..42d004e86 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -26,6 +26,7 @@ import json
import cStringIO
import os
import hashlib
+import requests
from searx import logger
logger = logger.getChild('webapp')
@@ -48,7 +49,6 @@ from flask import (
)
from flask.ext.babel import Babel, gettext, format_date
from searx import settings, searx_dir
-from searx.poolrequests import get as http_get
from searx.engines import (
categories, engines, get_engines_stats, engine_shortcuts
)
@@ -632,10 +632,10 @@ def image_proxy():
headers = dict_subset(request.headers, {'If-Modified-Since', 'If-None-Match'})
headers['User-Agent'] = gen_useragent()
- resp = http_get(url,
- stream=True,
- timeout=settings['server'].get('request_timeout', 2),
- headers=headers)
+ resp = requests.get(url,
+ stream=True,
+ timeout=settings['server'].get('request_timeout', 2),
+ headers=headers)
if resp.status_code == 304:
return '', resp.status_code