Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Typo: line 263 - srs_app_srt_conn.cpp. v6.0.106 #3854

Merged
merged 9 commits into from
Dec 15, 2023
+4 −3
Merged

Typo: line 263 - srs_app_srt_conn.cpp. v6.0.106 #3854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ab1fc74
Typo: line 263 - srs_app_srt_conn.cpp
laurfb Oct 29, 2023
b253a1b
Fix log error for HTTPS API.
winlinvip Nov 6, 2023
cd2c9c4
Merge branch 'develop' into patch-1
laurfb Nov 18, 2023
b55aaaf
Merge branch 'develop' into pr-patch-1
xiaozhihong Dec 15, 2023
4b26044
Update release to v5.0.204 v6.0.106
xiaozhihong Dec 15, 2023
7964555
Update release to v6.0.107
xiaozhihong Dec 15, 2023
e996c9f
Update release to v6.0.108
xiaozhihong Dec 15, 2023
e68ea80
revert wrong merge
xiaozhihong Dec 15, 2023
bde05f3
Update release to v6.0.106
xiaozhihong Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions trunk/doc/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The changelog for SRS.
<a name="v6-changes"></a>

## SRS 6.0 Changelog
* v6.0, 2023-12-15, Merge [#3854](https://github.com/ossrs/srs/pull/3854): Typo: line 263 - srs_app_srt_conn.cpp. v6.0.106 (#3854)
* v6.0, 2023-12-14, Merge [#3910](https://github.com/ossrs/srs/pull/3910): RTC: Support OPUS stereo SDP option. v6.0.105 (#3910)
* v6.0, 2023-12-14, Merge [#3902](https://github.com/ossrs/srs/pull/3902): Security: Support IP whitelist for HTTP-FLV, HLS, WebRTC, and SRT. v6.0.104 (#3902)
* v6.0, 2023-11-22, Merge [#3891](https://github.com/ossrs/srs/pull/3891): fix 'sed' error in options.sh. v6.0.103 (#3891)
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ srs_error_t SrsServer::listen()
// Create HTTPS API listener.
if (_srs_config->get_https_api_enabled()) {
if (reuse_api_over_server_) {
srs_trace("HTTPS-API: Reuse listen to http server %s", _srs_config->get_http_stream_listen().c_str());
srs_trace("HTTPS-API: Reuse listen to http server %s", _srs_config->get_https_stream_listen().c_str());
} else {
apis_listener_->set_endpoint(_srs_config->get_https_api_listen())->set_label("HTTPS-API");
if ((err = apis_listener_->listen()) != srs_success) {
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_srt_conn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ srs_error_t SrsMpegtsSrtConn::do_cycle()
// If streamid empty, using default streamid instead.
if (streamid.empty()) {
streamid = "#!::r=live/livestream,m=publish";
srs_warn("srt get empty streamid, using default steramid %s instead", streamid.c_str());
srs_warn("srt get empty streamid, using default streamid %s instead", streamid.c_str());
}

// Detect streamid of srt to request.
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/core/srs_core_version6.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

#define VERSION_MAJOR 6
#define VERSION_MINOR 0
#define VERSION_REVISION 105
#define VERSION_REVISION 106

#endif