From: Wyatt O'Day <wyatt@wyday.com>
Date: Wed, 6 Nov 2019 22:39:49 +0000 (-0500)
Subject: build: fix for CURL_DISABLE_DOH
X-Git-Tag: curl-7_68_0~191
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93738efe162a1646a98d0c9b649d5cafedabf1ea;p=thirdparty%2Fcurl.git

build: fix for CURL_DISABLE_DOH

Fixes https://github.com/curl/curl/issues/4565
Closes https://github.com/curl/curl/pull/4566
---

diff --git a/lib/url.c b/lib/url.c
index 8285474fd7..4f4120146a 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -403,9 +403,11 @@ CURLcode Curl_close(struct Curl_easy **datap)
     Curl_share_unlock(data, CURL_LOCK_DATA_SHARE);
   }
 
+#ifndef CURL_DISABLE_DOH
   free(data->req.doh.probe[0].serverdoh.memory);
   free(data->req.doh.probe[1].serverdoh.memory);
   curl_slist_free_all(data->req.doh.headers);
+#endif
 
   /* destruct wildcard structures if it is needed */
   Curl_wildcard_dtor(&data->wildcard);
@@ -1987,8 +1989,11 @@ void Curl_free_request_state(struct Curl_easy *data)
 {
   Curl_safefree(data->req.protop);
   Curl_safefree(data->req.newurl);
+
+#ifndef CURL_DISABLE_DOH
   Curl_close(&data->req.doh.probe[0].easy);
   Curl_close(&data->req.doh.probe[1].easy);
+#endif
 }