enable HTTP multiplexing (for HTTP/2)

secondlife · Nov 16, 2024 · d064c80 · d064c80
1 parent 8ab247f
commit d064c80
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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"
     },
@@ -277,7 +277,7 @@ void LLAppCoreHttp::init()
     if (gSavedSettings.controlExists(http_pipelining))
     {
         // Default to true (in ctor) if absent.
-        mPipelined = gSavedSettings.getBOOL(http_pipelining);
+        mPipelined = gSavedSettings.getU32(http_pipelining);
         LL_INFOS("Init") << "HTTP Pipelining " << (mPipelined ? "enabled" : "disabled") << "!" << LL_ENDL;
     }