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

for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.

Browse source
This commit is contained in:
winlin 2015-03-14 19:45:13 +08:00
parent 995b130090
commit 27cb62b7aa
8 changed files with 123 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -296,12 +296,14 @@ int SrsRtmpConn::service_cycle()
// do token traverse before serve it.
// @see https://github.com/winlinvip/simple-rtmp-server/pull/239
bool vhost_is_edge = _srs_config->get_vhost_is_edge(req->vhost);
bool edge_traverse = _srs_config->get_vhost_edge_token_traverse(req->vhost);
if (vhost_is_edge && edge_traverse) {
if ((ret = check_edge_token_traverse_auth()) != ERROR_SUCCESS) {
srs_warn("token auth failed, ret=%d", ret);
return ret;
if (true) {
bool vhost_is_edge = _srs_config->get_vhost_is_edge(req->vhost);
bool edge_traverse = _srs_config->get_vhost_edge_token_traverse(req->vhost);
if (vhost_is_edge && edge_traverse) {
if ((ret = check_edge_token_traverse_auth()) != ERROR_SUCCESS) {
srs_warn("token auth failed, ret=%d", ret);
return ret;
}
}
}