b0682d1 HBSD: Resolve merge conflict — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

HBSD: Resolve merge conflict

Shawn Webb committed 4 months ago

commit b0682d11ce0b09230702fd7032e24785681b9f18
parent eacbab2

1 file changed +0 -10

modified external/curl/lib/hostip.c

@@ -858,18 +858,8 @@ CURLcode Curl_resolv(struct Curl_easy *data,

   if(!dnscache)
     goto error;
   /* We should intentionally error and not resolve .onion TLDs */
   hostname_len = strlen(hostname);
 <<<<<<< HEAD
 =======
   DEBUGASSERT(hostname_len);
   if(hostname_len >= 7 &&
      (curl_strequal(&hostname[hostname_len - 6], ".onion") ||
       curl_strequal(&hostname[hostname_len - 7], ".onion."))) {
     failf(data, "Not resolving .onion address (RFC 7686)");
     goto error;
   }
 >>>>>>> 2d18505bf79a2eb87e2e72bbc3e30b0cf7f6b15c
   /* Let's check our DNS cache first */
   dnscache_lock(data, dnscache);