Refine curl handle lifetime.

Author: kinyoklion

libs/internal/src/network/curl_requester.cpp

@@ -225,7 +225,7 @@ void CurlRequester::PerformRequestWithMulti(std::shared_ptr<CurlMultiManager> mu
 
     // Add handle to multi manager for async processing
     // Headers will be freed automatically by CurlMultiManager
-    multi_manager->add_handle(curl, headers, [ctx](CURL* easy, CURLcode result) {
+    multi_manager->add_handle(curl, headers, [ctx](std::shared_ptr<CURL> easy, CURLcode result) {
         // This callback runs on the executor when the request completes
 
         // Check for errors
@@ -238,7 +238,7 @@ void CurlRequester::PerformRequestWithMulti(std::shared_ptr<CurlMultiManager> mu
 
         // Get HTTP response code
         long response_code = 0;
-        curl_easy_getinfo(easy, CURLINFO_RESPONSE_CODE, &response_code);
+        curl_easy_getinfo(easy.get(), CURLINFO_RESPONSE_CODE, &response_code);
 
         // Invoke the user's callback with the result
         ctx->callback(HttpResult(

libs/networking/include/launchdarkly/network/curl_multi_manager.hpp

@@ -37,7 +37,7 @@ class CurlMultiManager : public std::enable_shared_from_this<CurlMultiManager> {
      * Callback invoked when an easy handle completes (success or error).
      * Parameters: CURL* easy handle, CURLcode result
      */
-    using CompletionCallback = std::function<void(CURL*, CURLcode)>;
+    using CompletionCallback = std::function<void(std::shared_ptr<CURL>, CURLcode)>;
 
     /**
      * Create a CurlMultiManager on the given executor.
@@ -64,12 +64,6 @@ class CurlMultiManager : public std::enable_shared_from_this<CurlMultiManager> {
                     curl_slist* headers,
                     CompletionCallback callback);
 
-    /**
-     * Remove an easy handle from management.
-     * @param easy The CURL easy handle to remove
-     */
-    void remove_handle(CURL* easy);
-
 private:
     explicit CurlMultiManager(boost::asio::any_io_executor executor);
 

libs/networking/src/curl_multi_manager.cpp

@@ -70,22 +70,6 @@ void CurlMultiManager::add_handle(const std::shared_ptr<CURL>& easy,
     }
 }
 
-void CurlMultiManager::remove_handle(CURL* easy) {
-    curl_multi_remove_handle(multi_handle_.get(), easy);
-
-    std::lock_guard lock(mutex_);
-
-    // Free headers if they exist
-    if (const auto header_it = headers_.find(easy);
-        header_it != headers_.end() && header_it->second) {
-        curl_slist_free_all(header_it->second);
-    }
-
-    callbacks_.erase(easy);
-    headers_.erase(easy);
-    handles_.erase(easy);
-}
-
 int CurlMultiManager::socket_callback(CURL* easy,
                                       curl_socket_t s,
                                       int what,
@@ -193,8 +177,6 @@ void CurlMultiManager::check_multi_info() {
                     headers = header_it->second;
                     headers_.erase(header_it);
                 }
-
-                handles_.erase(easy);
             }
 
             // Remove from multi handle
@@ -205,11 +187,17 @@ void CurlMultiManager::check_multi_info() {
                 curl_slist_free_all(headers);
             }
 
+            // We don't need to keep the curl handle alive any longer, but we
+            // do want the handle to remain active for the duration of the
+            // callback.
+            auto handle = handles_[easy];
+            handles_.erase(easy);
+
             // Invoke completion callback
             if (callback) {
                 boost::asio::post(executor_, [callback = std::move(callback),
-                                      easy, result]() {
-                                      callback(easy, result);
+                                      easy, result, handle]() {
+                                      callback(handle, result);
                                   });
             }
         }

libs/server-sent-events/src/curl_client.cpp

@@ -441,15 +441,15 @@ void CurlClient::PerformRequestWithMulti(
     // Add handle to multi manager for async processing
     // Headers will be freed automatically by CurlMultiManager
     std::weak_ptr<RequestContext> weak_context = context;
-    multi_manager->add_handle(curl, headers, [weak_context](CURL* easy, CURLcode res) {
+    multi_manager->add_handle(curl, headers, [weak_context](std::shared_ptr<CURL> easy, CURLcode res) {
         auto context = weak_context.lock();
         if (!context) {
             return;
         }
 
         // Get response code
         long response_code = 0;
-        curl_easy_getinfo(easy, CURLINFO_RESPONSE_CODE, &response_code);
+        curl_easy_getinfo(easy.get(), CURLINFO_RESPONSE_CODE, &response_code);
 
         // Handle HTTP status codes
         auto status = static_cast<http::status>(response_code);