浏览代码

[enh] useragent forwarding

asciimoo 11 年前
父节点
当前提交
492e0b74c0
共有 1 个文件被更改,包括 6 次插入3 次删除
  1. 6
    3
      searx/webapp.py

+ 6
- 3
searx/webapp.py 查看文件

38
         query = request.form['q']
38
         query = request.form['q']
39
         requests = []
39
         requests = []
40
         results = []
40
         results = []
41
+        user_agent = request.headers.get('User-Agent', '')
41
         for engine in engines:
42
         for engine in engines:
42
-            request_params = engine.request(query, default_request_params())
43
+            headers = default_request_params()
44
+            headers['User-Agent'] = user_agent
45
+            request_params = engine.request(query, headers)
43
             callback = make_callback(results, engine.response)
46
             callback = make_callback(results, engine.response)
44
             if request_params['method'] == 'GET':
47
             if request_params['method'] == 'GET':
45
                 req = grequests.get(request_params['url']
48
                 req = grequests.get(request_params['url']
46
-                                   ,headers=request_params['headers']
49
+                                   ,headers=headers
47
                                    ,hooks=dict(response=callback)
50
                                    ,hooks=dict(response=callback)
48
                                    )
51
                                    )
49
             else:
52
             else:
50
                 req = grequests.post(request_params['url']
53
                 req = grequests.post(request_params['url']
51
                                     ,data=request_params['data']
54
                                     ,data=request_params['data']
52
-                                    ,headers=request_params['headers']
55
+                                    ,headers=headers
53
                                     ,hooks=dict(response=callback)
56
                                     ,hooks=dict(response=callback)
54
                                     )
57
                                     )
55
             requests.append(req)
58
             requests.append(req)