From 77af3dc8c4e6db6195048bc72206cb1327654936 Mon Sep 17 00:00:00 2001 From: john Date: Mon, 5 Feb 2024 12:14:22 +0800 Subject: [PATCH] Configure: print enabled/disable sanitizer. v5.0.206 v6.0.110 (#3923) --------- Co-authored-by: chundonglinlin --- trunk/configure | 6 ++++++ trunk/doc/CHANGELOG.md | 2 ++ trunk/src/core/srs_core_version5.hpp | 2 +- trunk/src/core/srs_core_version6.hpp | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/trunk/configure b/trunk/configure index 471a7eac1..39aaed164 100755 --- a/trunk/configure +++ b/trunk/configure @@ -846,6 +846,12 @@ if [[ $SRS_VALGRIND == YES ]]; then else echo -e "${GREEN}Note: The valgrind is disabled.${BLACK}" fi +if [[ $SRS_SANITIZER == YES ]]; then + echo -e "${GREEN}The sanitizer is enabled.${BLACK}" +else + echo -e "${GREEN}Note: The sanitizer is disabled.${BLACK}" +fi + # add each modules for application for SRS_MODULE in ${SRS_MODULES[*]}; do echo -e "${GREEN}Enable module: $SRS_MODULE${BLACK}" diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 78e6b572c..00c3eae55 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, 2024-02-05, Merge [#3923](https://github.com/ossrs/srs/pull/3923): Configure: print enabled/disable sanitizer. v6.0.110 (#3923) * v6.0, 2023-12-30, Merge [#3916](https://github.com/ossrs/srs/pull/3916): Enhancing the compatibility of options.sh. v6.0.108 (#3916) * v6.0, 2023-12-30, Merge [#3914](https://github.com/ossrs/srs/pull/3914): Forward: when unpublish crash caused by uninitialized forward connection. v6.0.107 (#3914) * 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) @@ -120,6 +121,7 @@ The changelog for SRS. ## SRS 5.0 Changelog +* v5.0, 2024-02-05, Merge [#3923](https://github.com/ossrs/srs/pull/3923): Configure: print enabled/disable sanitizer. v5.0.206 (#3923) * v5.0, 2023-12-30, Merge [#3916](https://github.com/ossrs/srs/pull/3916): Enhancing the compatibility of options.sh. v5.0.204 (#3916) * v5.0, 2023-12-14, Merge [#3910](https://github.com/ossrs/srs/pull/3910): RTC: Support OPUS stereo SDP option. v5.0.203 (#3910) * v5.0, 2023-12-14, Merge [#3902](https://github.com/ossrs/srs/pull/3902): Security: Support IP whitelist for HTTP-FLV, HLS, WebRTC, and SRT. v5.0.202 (#3902) diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index 9ccc79177..d6b30f77a 100644 --- a/trunk/src/core/srs_core_version5.hpp +++ b/trunk/src/core/srs_core_version5.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 0 -#define VERSION_REVISION 205 +#define VERSION_REVISION 206 #endif diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index 90afb37d6..55270cf32 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 109 +#define VERSION_REVISION 110 #endif