external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Improve test coverage for HTTP service

Browse source
This commit is contained in:
winlin 2020-01-03 13:31:08 +08:00
parent 646eeb05e9
commit 79314f7d4a
2 changed files with 84 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
trunk/src/service/srs_service_http_conn.cpp
View file

@ -296,9 +296,13 @@ SrsHttpMessage::SrsHttpMessage(ISrsReader* reader, SrsFastStream* buffer) : ISrs
jsonp = false;
_method = 0;
_status = 0;
// As 0 is DELETE, so we use GET as default.
_method = SRS_CONSTS_HTTP_GET;
// 200 is ok.
_status = SRS_CONSTS_HTTP_OK;
// -1 means infinity chunked mode.
_content_length = -1;
// From HTTP/1.1, default to keep alive.
_keep_alive = true;
}
@ -338,18 +342,21 @@ srs_error_t SrsHttpMessage::set_url(string url, bool allow_jsonp)
_url = url;
// use server public ip when host not specified.
// to make telnet happy.
std::string host = _header.get("Host");
if (host.empty()) {
host= srs_get_public_internet_address();
}
// parse uri from schema/server:port/path?query
std::string uri = _url;
if (!host.empty()) {
uri = "http://" + host + _url;
if (!srs_string_contains(uri, "://")) {
// use server public ip when host not specified.
// to make telnet happy.
std::string host = _header.get("Host");
if (host.empty()) {
host= srs_get_public_internet_address();
}
if (!host.empty()) {
uri = "http://" + host + _url;
}
}
if ((err = _uri->initialize(uri)) != srs_success) {
return srs_error_wrap(err, "init uri %s", uri.c_str());
}