From 5f134798b69264a9f2bb7c61a29fafd77d6522b1 Mon Sep 17 00:00:00 2001 From: Lukas <89481353+Lukas-Kaufmann@users.noreply.github.com> Date: Fri, 21 Mar 2025 12:18:11 +0100 Subject: [PATCH] Typo: "forked" process in log output. v7.0.30 (#4292) --------- Co-authored-by: Haibo Chen <495810242@qq.com> Co-authored-by: winlin Co-authored-by: Haibo Chen <495810242@qq.com> --- trunk/doc/CHANGELOG.md | 1 + trunk/src/app/srs_app_process.cpp | 2 +- trunk/src/core/srs_core_version7.hpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 7d10a018c..e1dcd6ae9 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 7.0 Changelog +* v7.0, 2025-03-21, Merge [#4292](https://github.com/ossrs/srs/pull/4292): Typo: "forked" process in log output. v7.0.30 (#4292) * v7.0, 2025-03-21, Merge [#4294](https://github.com/ossrs/srs/pull/4294): Build: update build version to v7. v7.0.29 (#4294) * v7.0, 2025-03-21, Merge [#4303](https://github.com/ossrs/srs/pull/4303): replace values with enums. v7.0.28 (#4303) * v7.0, 2025-03-21, Merge [#4303](https://github.com/ossrs/srs/pull/4303): replace values with enums. v7.0.27 (#4303) diff --git a/trunk/src/app/srs_app_process.cpp b/trunk/src/app/srs_app_process.cpp index 4a5dc5f0e..8bc8ec6f6 100644 --- a/trunk/src/app/srs_app_process.cpp +++ b/trunk/src/app/srs_app_process.cpp @@ -251,7 +251,7 @@ srs_error_t SrsProcess::start() srs_usleep(10 * SRS_UTIME_MILLISECONDS); is_started = true; - srs_trace("fored process, pid=%d, bin=%s, stdout=%s, stderr=%s, argv=%s", + srs_trace("forked process, pid=%d, bin=%s, stdout=%s, stderr=%s, argv=%s", pid, bin.c_str(), stdout_file.c_str(), stderr_file.c_str(), actual_cli.c_str()); return err; } diff --git a/trunk/src/core/srs_core_version7.hpp b/trunk/src/core/srs_core_version7.hpp index 4044c53f2..111b0d0a4 100644 --- a/trunk/src/core/srs_core_version7.hpp +++ b/trunk/src/core/srs_core_version7.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 7 #define VERSION_MINOR 0 -#define VERSION_REVISION 29 +#define VERSION_REVISION 30 #endif \ No newline at end of file