From: Jay Satiro <raysatiro@yahoo.com>
Date: Thu, 25 Feb 2021 20:49:00 +0000 (-0500)
Subject: doh: Inherit CURLOPT_STDERR from user's easy handle
X-Git-Tag: curl-7_76_0~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ba0d4bdb39e8fff541484afaee8a1f308a12018;p=thirdparty%2Fcurl.git

doh: Inherit CURLOPT_STDERR from user's easy handle

Prior to this change if the user set their easy handle's error stream
to something other than stderr it was not inherited by the doh handles,
which meant that they would still write to the default standard error
stream (stderr) for verbose output.

Bug: https://github.com/curl/curl/issues/6605
Reported-by: arvids-kokins-bidstack@users.noreply.github.com

Closes https://github.com/curl/curl/pull/6661
---

diff --git a/lib/doh.c b/lib/doh.c
index dcc1f6da68..15cdc35a46 100644
--- a/lib/doh.c
+++ b/lib/doh.c
@@ -285,6 +285,8 @@ static CURLcode dohprobe(struct Curl_easy *data,
 #endif
     ERROR_CHECK_SETOPT(CURLOPT_TIMEOUT_MS, (long)timeout_ms);
     ERROR_CHECK_SETOPT(CURLOPT_SHARE, data->share);
+    if(data->set.err && data->set.err != stderr)
+      ERROR_CHECK_SETOPT(CURLOPT_STDERR, data->set.err);
     if(data->set.verbose)
       ERROR_CHECK_SETOPT(CURLOPT_VERBOSE, 1L);
     if(data->set.no_signal)