From 726b42562b9e521a145a1f8780078038c4b2b404 Mon Sep 17 00:00:00 2001
From: AiraYumi <aira.youme@airanyumi.net>
Date: Sat, 16 Nov 2024 09:32:15 +0900
Subject: [PATCH] enable HTTP multiplexing (for HTTP/2)

---
 indra/llcorehttp/_httplibcurl.cpp | 6 +++---
 indra/newview/llappcorehttp.cpp   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/llcorehttp/_httplibcurl.cpp b/indra/llcorehttp/_httplibcurl.cpp
index 6a15f080119..dd2de38b217 100644
--- a/indra/llcorehttp/_httplibcurl.cpp
+++ b/indra/llcorehttp/_httplibcurl.cpp
@@ -487,12 +487,12 @@ void HttpLibcurl::policyUpdated(unsigned int policy_class)
         policy.stallPolicy(policy_class, false);
         mDirtyPolicy[policy_class] = false;
 
-        if (options.mPipelining > 1)
+        if (options.mPipelining)
         {
             // We'll try to do pipelining on this multihandle
             check_curl_multi_setopt(multi_handle,
                                      CURLMOPT_PIPELINING,
-                                     1L);
+                                     CURLPIPE_MULTIPLEX | CURLPIPE_HTTP1);
             check_curl_multi_setopt(multi_handle,
                                      CURLMOPT_MAX_PIPELINE_LENGTH,
                                      long(options.mPipelining));
@@ -507,7 +507,7 @@ void HttpLibcurl::policyUpdated(unsigned int policy_class)
         {
             check_curl_multi_setopt(multi_handle,
                                      CURLMOPT_PIPELINING,
-                                     0L);
+                                     CURLPIPE_NOTHING);
             check_curl_multi_setopt(multi_handle,
                                      CURLMOPT_MAX_HOST_CONNECTIONS,
                                      0L);
diff --git a/indra/newview/llappcorehttp.cpp b/indra/newview/llappcorehttp.cpp
index f73afbec5c8..f4f19906f13 100644
--- a/indra/newview/llappcorehttp.cpp
+++ b/indra/newview/llappcorehttp.cpp
@@ -69,7 +69,7 @@ static const struct
         "other"
     },
     { // AP_TEXTURE
-        8,      1,      12,     0,      false,
+        8,      1,      12,     0,      true,
         "TextureFetchConcurrency",
         "texture fetch"
     },
@@ -79,7 +79,7 @@ static const struct
         "mesh fetch"
     },
     { // AP_MESH2
-        8,      1,      32,     0,      false,
+        8,      1,      32,     0,      true,
         "Mesh2MaxConcurrentRequests",
         "mesh2 fetch"
     },