From eaa694fb7d0e47b943bc6d6edb6cb6a40ab2d85e Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Thu, 18 Mar 2021 19:59:01 +0100 Subject: [enh] replace requests by httpx --- searx/settings.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'searx/settings.yml') diff --git a/searx/settings.yml b/searx/settings.yml index c289cde5c..742492c3c 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -67,11 +67,13 @@ ui: # key : !!binary "your_morty_proxy_key" outgoing: # communication with search engines - request_timeout : 2.0 # default timeout in seconds, can be override by engine + request_timeout : 3.0 # default timeout in seconds, can be override by engine # max_request_timeout: 10.0 # the maximum timeout in seconds useragent_suffix : "" # suffix of searx_useragent, could contain informations like an email address to the administrator - pool_connections : 100 # Number of different hosts - pool_maxsize : 10 # Number of simultaneous requests by host + pool_connections : 100 # The maximum number of concurrent connections that may be established. + pool_maxsize : 20 # Allow the connection pool to maintain keep-alive connections below this point. + keepalive_expiry: 30.0 # Number of seconds to keep a connection in the pool + http2: True # Enable HTTP/2 (experimental) # uncomment below section if you want to use a proxy # see https://2.python-requests.org/en/latest/user/advanced/#proxies # SOCKS proxies are also supported: see https://2.python-requests.org/en/latest/user/advanced/#socks -- cgit v1.2.3 From d14994dc73ba5c95382812581dac146d9eceaafa Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Mon, 5 Apr 2021 10:43:33 +0200 Subject: [httpx] replace searx.poolrequests by searx.network settings.yml: * outgoing.networks: * can contains network definition * propertiers: enable_http, verify, http2, max_connections, max_keepalive_connections, keepalive_expiry, local_addresses, support_ipv4, support_ipv6, proxies, max_redirects, retries * retries: 0 by default, number of times searx retries to send the HTTP request (using different IP & proxy each time) * local_addresses can be "192.168.0.1/24" (it supports IPv6) * support_ipv4 & support_ipv6: both True by default see https://github.com/searx/searx/pull/1034 * each engine can define a "network" section: * either a full network description * either reference an existing network * all HTTP requests of engine use the same HTTP configuration (it was not the case before, see proxy configuration in master) --- searx/settings.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'searx/settings.yml') diff --git a/searx/settings.yml b/searx/settings.yml index 742492c3c..60e6dd5aa 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -72,16 +72,12 @@ outgoing: # communication with search engines useragent_suffix : "" # suffix of searx_useragent, could contain informations like an email address to the administrator pool_connections : 100 # The maximum number of concurrent connections that may be established. pool_maxsize : 20 # Allow the connection pool to maintain keep-alive connections below this point. - keepalive_expiry: 30.0 # Number of seconds to keep a connection in the pool - http2: True # Enable HTTP/2 (experimental) + enable_http2: True # See https://www.python-httpx.org/http2/ # uncomment below section if you want to use a proxy # see https://2.python-requests.org/en/latest/user/advanced/#proxies # SOCKS proxies are also supported: see https://2.python-requests.org/en/latest/user/advanced/#socks # proxies: -# http: -# - http://proxy1:8080 -# - http://proxy2:8080 -# https: +# all://: # - http://proxy1:8080 # - http://proxy2:8080 # using_tor_proxy : True @@ -91,6 +87,7 @@ outgoing: # communication with search engines # source_ips: # - 1.1.1.1 # - 1.1.1.2 +# - fe80::/126 # External plugin configuration # See http://searx.github.io/searx/dev/plugins.html for more details @@ -855,11 +852,13 @@ engines: engine : qwant shortcut : qwi categories : images + network: qwant - name : qwant news engine : qwant shortcut : qwn categories : news + network: qwant # - name: library # engine: recoll -- cgit v1.2.3