Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

url: Fix NO_PROXY env var to work properly with --proxy option. #1140

Closed
wants to merge 3 commits into from
Closed

url: Fix NO_PROXY env var to work properly with --proxy option. #1140

wants to merge 3 commits into from

Commits on Jan 6, 2017

  1. url: Fix NO_PROXY env var to work properly with --proxy option. 

    The combination of --noproxy option and http_proxy env var works well
both for proxied hosts and non-proxied hosts.

However, when combining NO_PROXY env var with --proxy option,
non-proxied hosts are not reachable while proxied host is OK.

This patch allows us to access non-proxied hosts even if using NO_PROXY
env var with --proxy option.
    @eramoto
    eramoto committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    795306d View commit details
    Browse the repository at this point in the history

  2. url: Refactor detect_proxy() 

    If defined CURL_DISABLE_HTTP, detect_proxy() returned NULL. If not
defined CURL_DISABLE_HTTP, detect_proxy() checked noproxy list.

Thus refactor to set proxy to NULL instead of calling detect_proxy() if
define CURL_DISABLE_HTTP, and refactor to call detect_proxy() if not
define CURL_DISABLE_HTTP and the host is not in the noproxy list.
    @eramoto
    eramoto committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    b6722df View commit details
    Browse the repository at this point in the history

  3. url: --noproxy option overrides NO_PROXY environment variable 

    Under condition using http_proxy env var, noproxy list was the combination
of --noproxy option and NO_PROXY env var previously. Since this commit,
--noproxy option overrides NO_PROXY environment variable even if use
http_proxy env var.
    @eramoto
    eramoto committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    59fa2ed View commit details
    Browse the repository at this point in the history