fix: curl return code could be 7 when there is DNS error redirection …

…for bad hosts (issue libcpr#1165)
Jerry-Terrasse · Jan 25, 2025 · 35eedb8 · 35eedb8
1 parent 0e6bf15
commit 35eedb8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/test/error_tests.cpp b/test/error_tests.cpp
@@ -76,7 +76,7 @@ TEST(ErrorTests, ProxyFailure) {
     Response response = cpr::Get(url, cpr::Proxies{{"http", "http://bad_host.libcpr.org"}});
     EXPECT_EQ(url, response.url);
     EXPECT_EQ(0, response.status_code);
-    EXPECT_EQ(ErrorCode::COULDNT_RESOLVE_PROXY, response.error.code);
+    EXPECT_TRUE(response.error.code == ErrorCode::COULDNT_RESOLVE_PROXY || response.error.code == ErrorCode::COULDNT_CONNECT);
 }
 
 TEST(ErrorTests, BoolFalseTest) {

diff --git a/test/get_tests.cpp b/test/get_tests.cpp
@@ -1,4 +1,5 @@
 #include <chrono>
+#include <cpr/error.h>
 #include <gtest/gtest.h>
 
 #include <memory>
@@ -112,7 +113,7 @@ TEST(BasicTests, BadHostTest) {
     EXPECT_EQ(std::string{}, response.text);
     EXPECT_EQ(url, response.url);
     EXPECT_EQ(0, response.status_code);
-    EXPECT_EQ(ErrorCode::COULDNT_RESOLVE_HOST, response.error.code);
+    EXPECT_TRUE(response.error.code == ErrorCode::COULDNT_RESOLVE_HOST || response.error.code == ErrorCode::COULDNT_CONNECT);
 }
 
 TEST(CookiesTests, BasicCookiesTest) {

diff --git a/test/head_tests.cpp b/test/head_tests.cpp
@@ -47,7 +47,7 @@ TEST(HeadTests, BadHostHeadTest) {
     EXPECT_EQ(std::string{}, response.text);
     EXPECT_EQ(url, response.url);
     EXPECT_EQ(0, response.status_code);
-    EXPECT_EQ(ErrorCode::COULDNT_RESOLVE_HOST, response.error.code);
+    EXPECT_TRUE(response.error.code == ErrorCode::COULDNT_RESOLVE_HOST || response.error.code == ErrorCode::COULDNT_CONNECT);
 }
 
 TEST(HeadTests, CookieHeadTest) {

diff --git a/test/post_tests.cpp b/test/post_tests.cpp
@@ -119,7 +119,7 @@ TEST(UrlEncodedPostTests, UrlPostBadHostTest) {
     EXPECT_EQ(url, response.url);
     EXPECT_EQ(std::string{}, response.header["content-type"]);
     EXPECT_EQ(0, response.status_code);
-    EXPECT_EQ(ErrorCode::COULDNT_RESOLVE_HOST, response.error.code);
+    EXPECT_TRUE(response.error.code == ErrorCode::COULDNT_RESOLVE_HOST || response.error.code == ErrorCode::COULDNT_CONNECT);
 }
 
 TEST(UrlEncodedPostTests, FormPostSingleTest) {

diff --git a/test/raw_body_tests.cpp b/test/raw_body_tests.cpp
@@ -110,7 +110,7 @@ TEST(BodyPostTests, UrlPostBadHostTest) {
     EXPECT_EQ(url, response.url);
     EXPECT_EQ(std::string{}, response.header["content-type"]);
     EXPECT_EQ(0, response.status_code);
-    EXPECT_EQ(ErrorCode::COULDNT_RESOLVE_HOST, response.error.code);
+    EXPECT_TRUE(response.error.code == ErrorCode::COULDNT_RESOLVE_HOST || response.error.code == ErrorCode::COULDNT_CONNECT);
 }
 
 TEST(BodyPostTests, StringMoveBodyTest) {