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 #1059, merge from 2.0, supports url with vhost in stream. 3.0.27

Browse source
This commit is contained in:
winlin 2018-02-13 08:52:57 +08:00
parent 93d3e1464a
commit 681138d2af
14 changed files with 164 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -589,7 +589,7 @@ SrsRequest* SrsHttpMessage::to_request(string vhost)
req->pageUrl = get_request_header("Referer");
req->objectEncoding = 0;
srs_discovery_tc_url(req->tcUrl, req->schema, req->host, req->vhost, req->app, req->port, req->param);
srs_discovery_tc_url(req->tcUrl, req->schema, req->host, req->vhost, req->app, req->stream, req->port, req->param);
req->strip();
// reset the host to http request host.

2
trunk/src/service/srs_service_rtmp_conn.cpp
View file

@ -43,7 +43,7 @@ SrsBasicRtmpClient::SrsBasicRtmpClient(string u, int64_t ctm, int64_t stm)
req = new SrsRequest();
srs_parse_rtmp_url(url, req->tcUrl, req->stream);
srs_discovery_tc_url(req->tcUrl, req->schema, req->host, req->vhost, req->app, req->port, req->param);
srs_discovery_tc_url(req->tcUrl, req->schema, req->host, req->vhost, req->app, req->stream, req->port, req->param);
transport = NULL;
client = NULL;