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

SRT: Append vhost to stream, not app. v4.0.246

Browse source
This commit is contained in:
winlin 2022-03-07 15:52:46 +08:00
parent cd0599baeb
commit 107ca2cbb8
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/doc/CHANGELOG.md
View file

@ -8,6 +8,7 @@ The changelog for SRS.
## SRS 4.0 Changelog ## SRS 4.0 Changelog
* v4.0, 2022-03-07, SRT: Append vhost to stream, not app. v4.0.246
* v4.0, 2022-02-15, Fix warnings for uuid. v4.0.245 * v4.0, 2022-02-15, Fix warnings for uuid. v4.0.245
* v4.0, 2022-02-15, Merge [#2917](https://github.com/ossrs/srs/pull/2917): SRT: Close connection if RTMP failed. (#2917). v4.0.244 * v4.0, 2022-02-15, Merge [#2917](https://github.com/ossrs/srs/pull/2917): SRT: Close connection if RTMP failed. (#2917). v4.0.244
* v4.0, 2022-02-15, Refine build script for SRT to avoid warnings. v4.0.243 * v4.0, 2022-02-15, Refine build script for SRT to avoid warnings. v4.0.243

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

@ -9,6 +9,6 @@
#define VERSION_MAJOR 4 #define VERSION_MAJOR 4
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 245 #define VERSION_REVISION 246
#endif #endif

7
trunk/src/srt/srt_to_rtmp.cpp
View file

@ -279,10 +279,11 @@ rtmp_client::rtmp_client(std::string key_path):_key_path(key_path)
ss << "rtmp://" << SRS_CONSTS_LOCALHOST; ss << "rtmp://" << SRS_CONSTS_LOCALHOST;
ss << ":" << port; ss << ":" << port;
ss << "/" << _appname; ss << "/" << _appname;
if (_vhost != DEF_VHOST) {
ss << "?vhost=" << _vhost;
}
ss << "/" << _streamname; ss << "/" << _streamname;
ss << (_streamname.find("?") != std::string::npos ? "&" : "?") << "upstream=srt";
if (_vhost != DEF_VHOST) {
ss << "&vhost=" << _vhost;
}
_url = ss.str(); _url = ss.str();