fix: FillHost adapt ipv6 (#683)

ithewei · Feb 26, 2025 · a1baf87 · a1baf87
1 parent 9a3c19c
commit a1baf87
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/cpputil/hstring.cpp b/cpputil/hstring.cpp
@@ -217,11 +217,12 @@ void NetAddr::from_string(const std::string& ipport) {
 }
 
 std::string NetAddr::to_string() {
-    const char* fmt = "%s:%d";
-    if (ip.find(':') != std::string::npos) {
-        fmt = "[%s]:%d";
-    }
-    return hv::asprintf(fmt, ip.c_str(), port);
+    return NetAddr::to_string(ip.c_str(), port);
+}
+
+std::string NetAddr::to_string(const char* ip, int port) {
+    const char* fmt = strchr(ip, ':') ? "[%s]:%d" : "%s:%d";
+    return hv::asprintf(fmt, ip, port);
 }
 
 } // end namespace hv
diff --git a/cpputil/hstring.h b/cpputil/hstring.h
@@ -85,6 +85,7 @@ struct HV_EXPORT NetAddr {
 
     void from_string(const std::string& ipport);
     std::string to_string();
+    static std::string to_string(const char* ip, int port);
 };
 
 } // end namespace hv

diff --git a/cpputil/hurl.h b/cpputil/hurl.h
@@ -31,7 +31,7 @@ class HV_EXPORT HUrl {
 namespace hv {
 
 HV_INLINE std::string escapeURL(const std::string& url) {
-    return HUrl::escape(url, ":/@?=&#+");
+    return HUrl::escape(url, ":/@[]?=&#+");
 }
 
 HV_EXPORT std::string escapeHTML(const std::string& str);

diff --git a/http/HttpMessage.cpp b/http/HttpMessage.cpp
@@ -746,7 +746,7 @@ void HttpRequest::FillHost(const char* host, int port) {
             port == DEFAULT_HTTPS_PORT) {
             headers["Host"] = host;
         } else {
-            headers["Host"] = asprintf("%s:%d", host, port);
+            headers["Host"] = hv::NetAddr::to_string(host, port);
         }
     }
 }