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

doh: fix curl handle option inheritance #4579

Closed
wants to merge 4 commits into from
Closed

doh: fix curl handle option inheritance #4579

wants to merge 4 commits into from

Commits on Nov 9, 2019

  1. doh: fix curl handle option inheritance 

    Prior to this change some doh handle options inherited from the user's
easy handle were only inherited if they were turned on, not if they were
off.

[API option] : [Default API setting]
CURLOPT_CERTINFO              : OFF
CURLOPT_NOSIGNAL              : OFF
CURLOPT_PROXY_SSL_VERIFYHOST  : ON    <-- affected
CURLOPT_PROXY_SSL_VERIFYPEER  : ON    <-- affected
CURLOPT_SSL_FALSESTART        : OFF
CURLOPT_SSL_VERIFYHOST        : ON    <-- affected
CURLOPT_SSL_VERIFYPEER        : ON    <-- affected
CURLOPT_SSL_VERIFYSTATUS      : OFF
CURLOPT_VERBOSE               : OFF

For example if CURLOPT_SSL_VERIFYPEER was turned off by the user then
that would not have been inherited by the doh handle and its verify peer
setting would have defaulted to on.

Prior to this change users were not able to disable SSL verification of
the DOH server.

Reported-by: 3dyd@users.noreply.github.com

Fixes curl#4578
Closes #xxxx
    @jay
    jay committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    1e1be6c View commit details
    Browse the repository at this point in the history

  2. squashme: ignore CURLE_NOT_BUILT_IN errors 

    now that the doh SSL options are always set there may be some that
return CURLE_NOT_BUILT_IN
    @jay
    jay committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    cab04aa View commit details
    Browse the repository at this point in the history

  3. squashme: Ignore errors on SSL options, since SSL/proxy may not be bu… 

    …ilt in
    @jay
    jay committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    0675657 View commit details
    Browse the repository at this point in the history

  4. squashme: take3, easier

    @jay
    jay committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    98bacf3 View commit details
    Browse the repository at this point in the history