Compare commits

..

No commits in common. "dfca520857fdc67c431bf811c14d174b123a88a6" and "56fe66da7cb61044c4ca93f504101ea52787a6c5" have entirely different histories.

4 changed files with 3 additions and 21 deletions

View File

@ -228,9 +228,6 @@ bash build_docker_images.sh
- [java sdk](https://github.com/lidaofu-hub/j_zlm_sdk) 本项目c sdk完整java包装库
- [c# sdk](https://github.com/malegend/ZLMediaKit.Autogen) 本项目c sdk完整c#包装库
- [metaRTC](https://github.com/metartc/metaRTC) 全国产纯c webrtc sdk
- 监控与运维
- [ZLMediaKit_exporter](https://github.com/guohuachan/ZLMediaKit_exporter) 一个用于采集 ZLMediaKit 核心指标的 Prometheus Exporter搭配 Grafana 即可快速构建实时监控面板
- 其他项目(已停止更新)
- [NodeJS实现的GB28181平台](https://gitee.com/hfwudao/GB28181_Node_Http)

View File

@ -404,8 +404,6 @@ bash build_docker_images.sh
- [GB28181 player implemented in C++](https://github.com/any12345com/BXC_gb28181Player)
- [Android RTCPlayer](https://github.com/leo94666/RTCPlayer)
- Monitor
- [Prometheus Exporter for ZLMediaKit](https://github.com/guohuachan/ZLMediaKit_exporter)
## License

View File

@ -133,10 +133,6 @@ void HlsPlayer::fetchSegment() {
if (!(*this)[Client::kNetAdapter].empty()) {
_http_ts_player->setNetAdapter((*this)[Client::kNetAdapter]);
}
} else {
// 每次请求新的ts片段时重置HttpTSPlayer状态
_http_ts_player->clear();
_http_ts_player->setProxyUrl((*this)[Client::kProxyUrl]);
}
Ticker ticker;

View File

@ -103,8 +103,6 @@ void HttpClient::clear() {
_user_set_header.clear();
_body.reset();
_method.clear();
// 重置代理连接状态
_proxy_connected = false;
clearResponse();
}
@ -184,8 +182,6 @@ void HttpClient::onConnect_l(const SockException &ex) {
_path.clear();
} else {
printer << "CONNECT " << _last_host << " HTTP/1.1\r\n";
printer << "Host: " << _last_host << "\r\n";
printer << "User-Agent: " << kServerName << "\r\n";
printer << "Proxy-Connection: keep-alive\r\n";
if (!_proxy_auth.empty()) {
printer << "Proxy-Authorization: Basic " << _proxy_auth << "\r\n";
@ -486,14 +482,9 @@ void HttpClient::setProxyUrl(string proxy_url) {
}
bool HttpClient::checkProxyConnected(const char *data, size_t len) {
string response(data, len);
if (response.find("HTTP/1.1 200") != string::npos || response.find("HTTP/1.0 200") != string::npos) {
_proxy_connected = true;
return true;
}
_proxy_connected = false;
return false;
auto ret = strstr(data, "HTTP/1.1 200 Connection established");
_proxy_connected = ret != nullptr;
return _proxy_connected;
}
void HttpClient::setAllowResendRequest(bool allow) {