Merge branch 'v3.5.0' into v3.6.0_merge_v3.5

This commit is contained in:
minggo
2022-04-24 13:41:27 +08:00
418 changed files with 5125 additions and 2519 deletions
-20
View File
@@ -935,26 +935,6 @@ void HttpClient::decreaseThreadCountAndMayDeleteThis() {
}
}
void HttpClient::setTimeoutForConnect(int value) {
std::lock_guard<std::mutex> lock(_timeoutForConnectMutex);
_timeoutForConnect = value;
}
int HttpClient::getTimeoutForConnect() {
std::lock_guard<std::mutex> lock(_timeoutForConnectMutex);
return _timeoutForConnect;
}
void HttpClient::setTimeoutForRead(int value) {
std::lock_guard<std::mutex> lock(_timeoutForReadMutex);
_timeoutForRead = value;
}
int HttpClient::getTimeoutForRead() {
std::lock_guard<std::mutex> lock(_timeoutForReadMutex);
return _timeoutForRead;
}
const ccstd::string &HttpClient::getCookieFilename() {
std::lock_guard<std::mutex> lock(_cookieFileMutex);
return _cookieFilename;