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

Refine docker console, preview by players at the same server. v4.0.236

Browse source
This commit is contained in:
winlin 2022-01-30 22:36:01 +08:00
parent ba0b62fd37
commit 1d4fac0dbc
3 changed files with 7 additions and 2 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-01-30, Refine docker console, preview by players at the same server. v4.0.236
* v4.0, 2022-01-30, For docker, always use the console for logging. v4.0.235 * v4.0, 2022-01-30, For docker, always use the console for logging. v4.0.235
* v4.0, 2022-01-29, Merge [#2896](https://github.com/ossrs/srs/pull/2896): SRT: Reduce the SRT bug by limit the max times for retry. (#2896). v4.0.234 * v4.0, 2022-01-29, Merge [#2896](https://github.com/ossrs/srs/pull/2896): SRT: Reduce the SRT bug by limit the max times for retry. (#2896). v4.0.234
* v4.0, 2022-01-23, Merge [#2886](https://github.com/ossrs/srs/pull/2886): Fix bug when free addrinfo. (#2886). v4.0.233 * v4.0, 2022-01-23, Merge [#2886](https://github.com/ossrs/srs/pull/2886): Fix bug when free addrinfo. (#2886). v4.0.233

6
trunk/research/console/js/srs.console.js
View file

@ -570,7 +570,7 @@ scApp.filter('sc_filter_style_error', function(){
scApp.filter('sc_filter_preview_url', ['$sc_server', function($sc_server){ scApp.filter('sc_filter_preview_url', ['$sc_server', function($sc_server){
return function(v){ return function(v){
var page = $sc_server.schema + "://ossrs.net/players/srs_player.html"; var page = $sc_server.schema + `://${$sc_server.host}:${$sc_server.http}/players/srs_player.html`;
var http = $sc_server.http[$sc_server.http.length - 1]; var http = $sc_server.http[$sc_server.http.length - 1];
var query = "vhost=" + v.owner.name + "&app=" + v.app + "&stream=" + v.name + ".flv"; var query = "vhost=" + v.owner.name + "&app=" + v.app + "&stream=" + v.name + ".flv";
query += "&server=" + $sc_server.host +"&port=" + http + "&autostart=true&schema=" + $sc_server.schema; query += "&server=" + $sc_server.host +"&port=" + http + "&autostart=true&schema=" + $sc_server.schema;
@ -685,6 +685,10 @@ scApp.provider("$sc_server", [function(){
} else { } else {
self.port = $location.port(); self.port = $location.port();
} }
if ($location.search().http) {
self.http = [$location.search().http];
}
} }
}; };
return self; return self;

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 235 #define VERSION_REVISION 236
#endif #endif