Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efcf4dd3 authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Merge branch 'dev/fix-proxy-init-with-https' into 'master' 

Fix proxy init with https pattern

See merge request !191
parents 2523ef28 7dcf88e8

docker-compose.prod.yml

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ services: 
    environment:

      SEARX_SECRET: "${SEARX_SECRET}"

      SEARX_PROXY_HTTP: "${SEARX_PROXY_HTTP}"

      SEARX_PROXY_HTTPS: "${SEARX_PROXY_HTTPS}"

      SEARX_REDIS_HOST: "${SEARX_REDIS_HOST}"

      SEARXNG_REDIS_URL: "redis://${SEARX_REDIS_HOST}:6379"

      SEARX_UI_DEFAULT_THEME: "${SEARX_UI_DEFAULT_THEME}"

searx/network/network.py

+1 −0
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ def initialize(settings_engines=None, settings_outgoing=None): 
    settings_outgoing["proxies"] = {}

    if 'SEARX_PROXY_HTTP' in environ:

        settings_outgoing["proxies"]["http"] = environ['SEARX_PROXY_HTTP'].split(",")

        settings_outgoing["proxies"]["https"] = settings_outgoing["proxies"]["http"]



    # default parameters for AsyncHTTPTransport

    # see https://github.com/encode/httpx/blob/e05a5372eb6172287458b37447c30f650047e1b8/httpx/_transports/default.py#L108-L121  # pylint: disable=line-too-long