@jthiltges - I can't apply patches directly to your branch, could you do the following: ``` --- a/src/XrdTpc/XrdTpcMultistream.cc +++ b/src/XrdTpc/XrdTpcMultistream.cc @@ -59,10 +59,6 @@ public: it++) { curl_multi_remove_handle(m_handle, *it); } - for (std::vector<CURL *>::const_iterator it = m_avail_handles.begin(); - it != m_avail_handles.end(); - it++) { - } curl_multi_cleanup(m_handle); } diff --git a/src/XrdTpc/XrdTpcTPC.cc b/src/XrdTpc/XrdTpcTPC.cc index 4e7bb99..8c96df6 100644 --- a/src/XrdTpc/XrdTpcTPC.cc +++ b/src/XrdTpc/XrdTpcTPC.cc @@ -615,8 +615,7 @@ int TPCHandler::ProcessPushReq(const std::string & resource, XrdHttpExtReq &req) if (name) rec.name = name; logTransferEvent(LogMask::Info, rec, "PUSH_START", "Starting a push request"); - auto curl_deleter = [](CURL *curl) { curl_easy_cleanup(curl); }; - std::unique_ptr<CURL, decltype(curl_deleter)> curlPtr(curl_easy_init(), curl_deleter); + std::unique_ptr<CURL, decltype(&curl_easy_cleanup)> curlPtr(curl_easy_init(), &curl_easy_cleanup); CURL *curl = curlPtr.get(); if (!curl) { char msg[] = "Failed to initialize internal transfer resources"; @@ -689,8 +688,7 @@ int TPCHandler::ProcessPullReq(const std::string &resource, XrdHttpExtReq &req) if (name) rec.name = name; logTransferEvent(LogMask::Info, rec, "PULL_START", "Starting a push request"); - auto curl_deleter = [](CURL *curl) { curl_easy_cleanup(curl); }; - std::unique_ptr<CURL, decltype(curl_deleter)> curlPtr(curl_easy_init(), curl_deleter); + std::unique_ptr<CURL, decltype(&curl_easy_cleanup)> curlPtr(curl_easy_init(), &curl_easy_cleanup); CURL *curl = curlPtr.get(); if (!curl) { char msg[] = "Failed to initialize internal transfer resources"; ``` Were you able to test multistreaming? If the multistream case looks good, I think it's ready to mereg. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/xrootd/xrootd/pull/1449#issuecomment-833211343 ######################################################################## Use REPLY-ALL to reply to list To unsubscribe from the XROOTD-DEV list, click the following link: https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=XROOTD-DEV&A=1