|
@@ -26,6 +26,7 @@ import json
|
26
|
26
|
import cStringIO
|
27
|
27
|
import os
|
28
|
28
|
import hashlib
|
|
29
|
+import requests
|
29
|
30
|
|
30
|
31
|
from searx import logger
|
31
|
32
|
logger = logger.getChild('webapp')
|
|
@@ -48,7 +49,6 @@ from flask import (
|
48
|
49
|
)
|
49
|
50
|
from flask.ext.babel import Babel, gettext, format_date
|
50
|
51
|
from searx import settings, searx_dir
|
51
|
|
-from searx.poolrequests import get as http_get
|
52
|
52
|
from searx.engines import (
|
53
|
53
|
categories, engines, get_engines_stats, engine_shortcuts
|
54
|
54
|
)
|
|
@@ -632,10 +632,10 @@ def image_proxy():
|
632
|
632
|
headers = dict_subset(request.headers, {'If-Modified-Since', 'If-None-Match'})
|
633
|
633
|
headers['User-Agent'] = gen_useragent()
|
634
|
634
|
|
635
|
|
- resp = http_get(url,
|
636
|
|
- stream=True,
|
637
|
|
- timeout=settings['server'].get('request_timeout', 2),
|
638
|
|
- headers=headers)
|
|
635
|
+ resp = requests.get(url,
|
|
636
|
+ stream=True,
|
|
637
|
+ timeout=settings['server'].get('request_timeout', 2),
|
|
638
|
+ headers=headers)
|
639
|
639
|
|
640
|
640
|
if resp.status_code == 304:
|
641
|
641
|
return '', resp.status_code
|