From 0808be18adca3c7fe1c72fa39ad1a58b17bb91f3 Mon Sep 17 00:00:00 2001 From: john Date: Thu, 23 Nov 2023 13:32:42 +0800 Subject: [PATCH] fix 'sed' error in options.sh. v5.0.201 (#3891) The `-` character, when placed in the middle of a regular expression, is interpreted as a range. It must be placed at the beginning or end to be interpreted as a literal character. --------- `TRANS_BY_GPT4` --------- Co-authored-by: john --- trunk/auto/options.sh | 2 +- trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version5.hpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 2cfb89ad57..4f91236534 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -442,7 +442,7 @@ function parse_user_option_to_value_and_option() { case "$option" in -*=*) value=`echo "$option" | sed -e 's|[-_a-zA-Z0-9/]*=||'` - option=`echo "$option" | sed -e 's|=[,-_a-zA-Z0-9/. +]*||'` + option=`echo "$option" | sed -e 's|=[-_a-zA-Z0-9/. +,]*||'` ;; *) value="" ;; esac diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index de43bd6909..26662e81d3 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 5.0 Changelog +* v5.0, 2023-11-22, Merge [#3891](https://github.com/ossrs/srs/pull/3891): fix 'sed' error in options.sh. v5.0.201 (#3891) * v5.0, 2023-11-19, Merge [#3886](https://github.com/ossrs/srs/pull/3886): Change the hls_aof_ratio to 2.1. v5.0.200 (#3886) * v5.0, 2023-11-15, Merge [#3879](https://github.com/ossrs/srs/pull/3879): Add --extra-ldflags. v5.0.199 (#3879) * v5.0, 2023-11-06, Merge [#3851](https://github.com/ossrs/srs/pull/3851): Don't compile libopus when enable sys-ffmpeg. v5.0.198 (#3851) diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index 52b119dcef..df62ddc6b5 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 200 +#define VERSION_REVISION 201 #endif