diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 9d89fb99a..2f2adc594 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 6.0 Changelog +* v6.0, 2025-08-14, Merge [#4161](https://github.com/ossrs/srs/pull/4161): fix hls & dash segments cleanup. v6.0.173 (#4161) * v6.0, 2025-08-12, Merge [#4230](https://github.com/ossrs/srs/pull/4230): MP4 DVR: Fix audio/video synchronization issues in WebRTC recordings. v6.0.172 (#4230) * v6.0, 2025-08-11, Merge [#4432](https://github.com/ossrs/srs/pull/4432): AI: HTTP-FLV: Fix heap-use-after-free crash during stream unmount. v6.0.171 (#4432) * v6.0, 2025-07-28, Merge [#4245](https://github.com/ossrs/srs/pull/4245): Allow Forward to be configured with Env Var. v6.0.170 (#4245) diff --git a/trunk/src/app/srs_app_dash.cpp b/trunk/src/app/srs_app_dash.cpp index 8bd67212d..6a5e278ee 100644 --- a/trunk/src/app/srs_app_dash.cpp +++ b/trunk/src/app/srs_app_dash.cpp @@ -738,10 +738,6 @@ srs_error_t SrsDash::cycle() srs_utime_t SrsDash::cleanup_delay() { - if (!enabled) { - return 0; - } - // We use larger timeout to cleanup the HLS, after disposed it if required. return _srs_config->get_dash_dispose(req->vhost) * 1.1; } diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index 47022b9ae..efcb7787f 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -1237,10 +1237,6 @@ srs_error_t SrsHls::cycle() { srs_error_t err = srs_success; - if (!enabled) { - return err; - } - if (last_update_time <= 0) { last_update_time = srs_get_system_time(); } @@ -1278,10 +1274,6 @@ srs_error_t SrsHls::cycle() srs_utime_t SrsHls::cleanup_delay() { - if (!enabled) { - return 0; - } - // We use larger timeout to cleanup the HLS, after disposed it if required. return _srs_config->get_hls_dispose(req->vhost) * 1.1; } diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index 89a09a264..47b66a86f 100644 --- a/trunk/src/core/srs_core_version6.hpp +++ b/trunk/src/core/srs_core_version6.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 6 #define VERSION_MINOR 0 -#define VERSION_REVISION 172 +#define VERSION_REVISION 173 #endif