diff --git a/README.md b/README.md index 9cf98d8b8..44789b094 100755 --- a/README.md +++ b/README.md @@ -92,6 +92,7 @@ A big `THANK YOU` also goes to: ## Releases +* 2021-10-12, Release [v4.0.176](https://github.com/ossrs/srs/releases/tag/v4.0.176), 4.0 dev6, v4.0.176, 143675 lines. * 2021-09-05, Release [v4.0.161](https://github.com/ossrs/srs/releases/tag/v4.0.161), 4.0 dev5, v4.0.161, 145865 lines. * 2021-08-15, Release [v4.0.156](https://github.com/ossrs/srs/releases/tag/v4.0.156), 4.0 dev4, v4.0.156, 145490 lines. * 2021-08-14, Release [v4.0.153](https://github.com/ossrs/srs/releases/tag/v4.0.153), 4.0 dev3, v4.0.153, 145506 lines. diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index f681e675a..1ec33f8d0 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -27,6 +27,7 @@ The changelog for SRS. ## SRS 4.0 Changelog +* v4.0, 2021-10-12, Merge [#2549](https://github.com/ossrs/srs/pull/2549): Fix duration issue for HLS on_hls. v4.0.176 * v4.0, 2021-10-11, Fix [#1641](https://github.com/ossrs/srs/issues/1641), HLS/RTC picture corrupt for SPS/PPS lost. v4.0.175 * v4.0, 2021-10-11, RTC: Refine config, aac to rtmp_to_rtc, bframe to keep_bframe. v4.0.174 * v4.0, 2021-10-10, For [#1641](https://github.com/ossrs/srs/issues/1641), Support RTMP publish and play regression test. v4.0.173 diff --git a/trunk/scripts/git.commit.sh b/trunk/scripts/git.commit.sh index 653a09a04..509da3c3c 100755 --- a/trunk/scripts/git.commit.sh +++ b/trunk/scripts/git.commit.sh @@ -1,5 +1,5 @@ #!/bin/bash #for file in $(git remote); do echo ""; git push $file $@; done -for file in $(git remote -v|grep -v https|grep push|awk '{print $1}'); do echo ""; git push $file $@; done +for file in $(git remote -v|grep -v https|grep push|awk '{print $1}'); do echo ""; echo "git push $file $@"; git push $file $@; done diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 33b1a492b..09f875ad6 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -1984,6 +1984,16 @@ srs_error_t SrsConfig::parse_options(int argc, char** argv) if (config_file.empty()) { return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "no config, read help: %s -h", argv[0]); } + + // For docker, if config is not specified, try srs.conf instead. + string try_config = srs_string_replace(config_file, "docker.conf", "srs.conf"); + if (!srs_path_exists(config_file) && try_config != config_file) { + if (!srs_path_exists(try_config)) { + return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "no config file %s or %s", config_file.c_str(), try_config.c_str()); + } + srs_warn("user config %s does not exists, use %s instead", config_file.c_str(), try_config.c_str()); + config_file = try_config; + } err = parse_file(config_file.c_str()); diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index cc8c1977d..5721b5e03 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 175 +#define VERSION_REVISION 176 #endif