Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-14 20:15:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch2' of github.com:alexliyu7352/ZLMediaKit

Browse Source
This commit is contained in:
xiongziliang
2022-01-09 14:54:21 +08:00
parent 26d458d067 6f9f93cb97
commit a4c69e61cd
8 changed files with 369 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Http/HttpClient.cpp
View File

@@ -15,7 +15,8 @@
namespace mediakit {
void HttpClient::sendRequest(const string &url, float timeout_sec) {
void HttpClient::sendRequest(const string &url, float timeout_sec, float recv_timeout_sec) {
_recv_timeout_second = recv_timeout_sec;
clearResponse();
_url = url;
auto protocol = FindField(url.data(), NULL, "://");
@@ -189,7 +190,7 @@ ssize_t HttpClient::onRecvHeader(const char *data, size_t len) {
}
if (onRedirectUrl(new_url, _parser.Url() == "302")) {
setMethod("GET");
HttpClient::sendRequest(new_url, _timeout_second);
HttpClient::sendRequest(new_url, _timeout_second, _recv_timeout_second);
return 0;
}
}
@@ -279,7 +280,7 @@ void HttpClient::onFlush() {
}
void HttpClient::onManager() {
if (_recv_timeout_ticker.elapsedTime() > 3 * 1000 && _total_body_size < 0 && !_chunked_splitter) {
if (_recv_timeout_ticker.elapsedTime() > _recv_timeout_second * 1000 && _total_body_size < 0 && !_chunked_splitter) {
//如果Content-Length未指定 但接收数据超时
//则认为本次http请求完成
onResponseCompleted_l();