When Java Servlet parses the request header host, it will split the IP and port. When using the default port (not passed by default), if there is no [] distinction, Java will use the last colon of IPv6 as the port delimiter, and Java parsing will report an error

Author: lifw555

httplib.h

@@ -8510,8 +8510,8 @@ inline ClientImpl::ClientImpl(const std::string &host, int port)
 inline ClientImpl::ClientImpl(const std::string &host, int port,
                               const std::string &client_cert_path,
                               const std::string &client_key_path)
-    : host_(adjust_host_string(detail::escape_abstract_namespace_unix_domain(host))), port_(port),
-      host_and_port_(host_ + ":" + std::to_string(port)),
+    : host_(detail::escape_abstract_namespace_unix_domain(host)), port_(port),
+      host_and_port_(adjust_host_string(host_) + ":" + std::to_string(port)),
       client_cert_path_(client_cert_path), client_key_path_(client_key_path) {}
 
 inline ClientImpl::~ClientImpl() {
@@ -9122,13 +9122,13 @@ inline bool ClientImpl::write_request(Stream &strm, Request &req,
       req.set_header("Host", "localhost");
     } else if (is_ssl()) {
       if (port_ == 443) {
-        req.set_header("Host", host_);
+        req.set_header("Host", adjust_host_string(host_));
       } else {
         req.set_header("Host", host_and_port_);
       }
     } else {
       if (port_ == 80) {
-        req.set_header("Host", host_);
+        req.set_header("Host", adjust_host_string(host_));
       } else {
         req.set_header("Host", host_and_port_);
       }

test/test.cc

@@ -4987,15 +4987,15 @@ TEST_F(ServerTest, GetMethodRemoteAddr) {
   ASSERT_TRUE(res);
   EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_TRUE(res->body == "[::1]" || res->body == "127.0.0.1");
+  EXPECT_TRUE(res->body == "::1" || res->body == "127.0.0.1");
 }
 
 TEST_F(ServerTest, GetMethodLocalAddr) {
   auto res = cli_.Get("/local_addr");
   ASSERT_TRUE(res);
   EXPECT_EQ(StatusCode::OK_200, res->status);
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
-  EXPECT_TRUE(res->body == std::string("[::1]:").append(to_string(PORT)) ||
+  EXPECT_TRUE(res->body == std::string("::1:").append(to_string(PORT)) ||
               res->body == std::string("127.0.0.1:").append(to_string(PORT)));
 }
 
@@ -10285,12 +10285,41 @@ TEST(UniversalClientImplTest, Ipv6LiteralAddress) {
   EXPECT_EQ(cli.port(), port);
 }
 
-TEST(UniversalClientImplTest, Ipv6LiteralAddressHost) {
-  std::string host  = "[::1]";
-  std::string ipV6TestURL = "http://" + host;
+TEST(UniversalClientImplTest, Ipv6LiteralAddressHostDefaultPort) {
+  /*
+    When Java Servlet parses the request header host, it will split the IP and port. 
+    When using the default port (not passed by default), if there is no [] distinction, 
+    Java will use the last colon of IPv6 as the port delimiter, and Java parsing will report an error
+  */
+  httplib::Server svr;
+  svr.Get("/", [&](const httplib::Request & req, httplib::Response &res) {
+    res.status = httplib::StatusCode::OK_200;
+    res.set_content(req.get_header_value("Host", ""), "text/plain");
+  });
+
+  auto thread = std::thread([&]() { svr.listen("[::1]", 80); });
+  auto se = httplib::detail::scope_exit([&] {
+    svr.stop();
+    thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
 
-  Client cli(ipV6TestURL);
-  EXPECT_EQ(cli.host(), host);
+  svr.wait_until_ready();
+
+  {
+    httplib::Client cli("http://[::1]");
+    cli.set_keep_alive(true);
+
+    EXPECT_EQ(cli.socket(), INVALID_SOCKET);
+
+    auto res = cli.Get("/");
+    ASSERT_TRUE(res);
+
+    std::cout << "status:" << res->status << ", body:" << res->body << std::endl; 
+
+    EXPECT_EQ(httplib::StatusCode::OK_200, res->status);
+    EXPECT_EQ("[::1]", res->body);
+  }
 }
 
 TEST(FileSystemTest, FileAndDirExistenceCheck) {