fix duplicate header (#99)

* fix duplicate header * consistency
minecraft-linux · Jul 8, 2024 · 87b6d3d · 87b6d3d
1 parent 92eda37
commit 87b6d3d
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/jni/lib_http_client.cpp b/src/jni/lib_http_client.cpp
@@ -6,6 +6,17 @@
 
 using namespace std::placeholders;
 
+bool slist_contains(struct curl_slist *list, const char *str) {
+    struct curl_slist *current = list;
+    while (current != nullptr) {
+        if (strcasecmp(current->data, str) == 0) {
+            return true;
+        }
+        current = current->next;
+    }
+    return false;
+}
+
 HttpClientRequest::HttpClientRequest() {
     curl = curl_easy_init();
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, this);
@@ -55,7 +66,7 @@ void HttpClientRequest::setHttpMethodAndBody(std::shared_ptr<FakeJni::JString> m
         curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, this->body.size());
     }
     auto conttype = contentType->asStdString();
-    if(conttype.length()) {
+    if(conttype.length() && !slist_contains(header, ("Content-Type: " + conttype).c_str())) {
         header = curl_slist_append(header, ("Content-Type: " + conttype).c_str());
         curl_easy_setopt(curl, CURLOPT_HTTPHEADER, header);
     }
@@ -113,7 +124,7 @@ void HttpClientRequest::setHttpMethodAndBody2(std::shared_ptr<FakeJni::JString>
     header = curl_slist_append(header, ("Content-Length: " + std::to_string(contentLength)).c_str());
     curl_easy_setopt(curl, CURLOPT_HTTPHEADER, header);
     auto conttype = contentType->asStdString();
-    if(conttype.length()) {
+    if(conttype.length() && !slist_contains(header, ("Content-Type: " + conttype).c_str())) {
         header = curl_slist_append(header, ("Content-Type: " + conttype).c_str());
         curl_easy_setopt(curl, CURLOPT_HTTPHEADER, header);
     }