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

Fix #1255, support vhost/domain in query string for HTTP streaming. 3.0.90

Browse source
This commit is contained in:
winlin 2019-12-29 18:56:35 +08:00
parent 8a28a11648
commit eb8e7ad479
5 changed files with 77 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/core/srs_core.hpp
View file

@ -27,7 +27,7 @@
// The version config.
#define VERSION_MAJOR 3
#define VERSION_MINOR 0
#define VERSION_REVISION 89
#define VERSION_REVISION 90
// The macros generated by configure script.
#include <srs_auto_headers.hpp>

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

@ -491,6 +491,16 @@ string SrsHttpMessage::url()
string SrsHttpMessage::host()
{
std::map<string, string>::iterator it = _query.find("vhost");
if (it != _query.end() && !it->second.empty()) {
return it->second;
}
it = _query.find("domain");
if (it != _query.end() && !it->second.empty()) {
return it->second;
}
return _uri->get_host();
}

6
trunk/src/utest/srs_utest_config.cpp
View file

@ -1820,9 +1820,9 @@ VOID TEST(ConfigUnitTest, CheckDefaultValuesVhost)
if (true) {
EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF));
EXPECT_EQ(3 * SRS_UTIME_SECONDS, conf.get_dash_fragment(""));
EXPECT_EQ(30 * SRS_UTIME_SECONDS, conf.get_dash_update_period(""));
EXPECT_EQ(60 * SRS_UTIME_SECONDS, conf.get_dash_timeshift(""));
EXPECT_EQ(30 * SRS_UTIME_SECONDS, conf.get_dash_fragment(""));
EXPECT_EQ(150 * SRS_UTIME_SECONDS, conf.get_dash_update_period(""));
EXPECT_EQ(300 * SRS_UTIME_SECONDS, conf.get_dash_timeshift(""));
EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF"vhost v{dash{dash_fragment 4;dash_update_period 40;dash_timeshift 70;}}"));
EXPECT_EQ(4 * SRS_UTIME_SECONDS, conf.get_dash_fragment("v"));

61
trunk/src/utest/srs_utest_http.cpp
View file

@ -1550,10 +1550,71 @@ VOID TEST(ProtocolHTTPTest, HTTPMessageParser)
}
}
VOID TEST(ProtocolHTTPTest, VhostInQuery)
{
srs_error_t err;
if (true) {
SrsHttpHeader h;
SrsHttpMessage m;
HELPER_ASSERT_SUCCESS(m.set_url("/api/v1?vhost=rt.ossrs.net&token=xxx", false));
m.set_header(&h, false);
EXPECT_STREQ("rt.ossrs.net", m.host().c_str());
}
if (true) {
SrsHttpHeader h;
SrsHttpMessage m;
HELPER_ASSERT_SUCCESS(m.set_url("/api/v1?vhost=rt.ossrs.net&&token=xxx", false));
m.set_header(&h, false);
EXPECT_STREQ("rt.ossrs.net", m.host().c_str());
}
if (true) {
SrsHttpHeader h;
h.set("Host", "ossrs.net:-1");
SrsHttpMessage m;
HELPER_ASSERT_SUCCESS(m.set_url("/api/v1?vhost=rt.ossrs.net", false));
m.set_header(&h, false);
EXPECT_STREQ("rt.ossrs.net", m.host().c_str());
}
if (true) {
SrsHttpHeader h;
SrsHttpMessage m;
HELPER_ASSERT_SUCCESS(m.set_url("/api/v1?vhost=ossrs.net", false));
m.set_header(&h, false);
EXPECT_STREQ("ossrs.net", m.host().c_str());
}
if (true) {
SrsHttpHeader h;
h.set("Host", "ossrs.net");
SrsHttpMessage m;
m.set_header(&h, false);
HELPER_ASSERT_SUCCESS(m.set_url("/api/v1", false));
EXPECT_STREQ("ossrs.net", m.host().c_str());
}
}
VOID TEST(ProtocolHTTPTest, HTTPMessageUpdate)
{
srs_error_t err;
if (true) {
SrsHttpHeader h;
SrsHttpMessage m;
HELPER_ASSERT_SUCCESS(m.set_url("/api/v1?vhost=ossrs.net", false));
m.set_header(&h, false);
EXPECT_STRNE("ossrs.net", m.host().c_str());
}
if (true) {
SrsHttpHeader h;
h.set("Host", "ossrs.net:-1");