Skip to content

Commit b3304d1

Browse files
AnohkkaCOM8
authored andcommitted
Call curl_multi_remove_handle earlier into ReadMultiInfo
1 parent 5db20fb commit b3304d1

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

cpr/multiperform.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,13 @@ std::vector<Response> MultiPerform::ReadMultiInfo(const std::function<Response(S
162162
}
163163
} while (info);
164164

165+
for (const auto& [session, _] : sessions_) {
166+
const CURLMcode error_code = curl_multi_remove_handle(multicurl_->handle, session->curl_->handle);
167+
if (error_code) {
168+
std::cerr << "curl_multi_remove_handle() failed, code " << static_cast<int>(error_code) << '\n';
169+
}
170+
}
171+
165172
// Sort response objects to match order of added sessions
166173
std::vector<Response> sorted_responses;
167174
for (const auto& [session, _] : sessions_) {
@@ -172,13 +179,6 @@ std::vector<Response> MultiPerform::ReadMultiInfo(const std::function<Response(S
172179
responses.erase(it);
173180
sorted_responses.push_back(current_response);
174181
}
175-
176-
for (const auto& [session, _] : sessions_) {
177-
const CURLMcode error_code = curl_multi_remove_handle(multicurl_->handle, session->curl_->handle);
178-
if (error_code) {
179-
std::cerr << "curl_multi_remove_handle() failed, code " << static_cast<int>(error_code) << '\n';
180-
}
181-
}
182182
return sorted_responses;
183183
}
184184

0 commit comments

Comments
 (0)