Merge branch 'develop' into hevc_over_rtc

duiniuluantanqin · web-flow · commit 83e8877623a8 · 2025-02-20T16:00:15.000+08:00
diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md
@@ -7,6 +7,7 @@ The changelog for SRS.
 <a name="v7-changes"></a>
 
 ## SRS 7.0 Changelog
+* v7.0, 2025-02-20, Merge [#4253](https://github.com/ossrs/srs/pull/4253): fix typo about heartbeat. v7.0.23 (#4253)
 * v7.0, 2025-02-19, Merge [#4291](https://github.com/ossrs/srs/pull/4291): fix ci error. v7.0.22 (#4291)
 * v7.0, 2025-01-14, Merge [#4271](https://github.com/ossrs/srs/pull/4271): update copyright to 2025. v7.0.21 (#4271)
 * v7.0, 2024-10-31, Merge [#4218](https://github.com/ossrs/srs/pull/4218): fix Unit test: StUtimeInMicroseconds. v7.0.20 (#4218)
@@ -34,6 +35,7 @@ The changelog for SRS.
 <a name="v6-changes"></a>
 
 ## SRS 6.0 Changelog
+* v6.0, 2025-02-20, Merge [#4253](https://github.com/ossrs/srs/pull/4253): fix typo about heartbeat. v6.0.161 (#4253)
 * v6.0, 2025-02-19, Merge [#4291](https://github.com/ossrs/srs/pull/4291): fix ci error. v6.0.160 (#4291)
 * v6.0, 2025-01-14, Merge [#4271](https://github.com/ossrs/srs/pull/4271): update copyright to 2025. v6.0.159 (#4271)
 * v6.0, 2024-10-31, Merge [#4216](https://github.com/ossrs/srs/pull/4216): fix hls error when stream has extension. v6.0.158 (#4216)
@@ -198,6 +200,7 @@ The changelog for SRS.
 <a name="v5-changes"></a>
 
 ## SRS 5.0 Changelog
+* v5.0, 2025-02-20, Merge [#4253](https://github.com/ossrs/srs/pull/4253): fix typo about heartbeat. v5.0.220 (#4253)
 * v5.0, 2025-02-19, Merge [#4291](https://github.com/ossrs/srs/pull/4291): fix ci error. v5.0.219 (#4291)
 * v5.0, 2025-01-14, Merge [#4271](https://github.com/ossrs/srs/pull/4271): update copyright to 2025. v5.0.218 (#4271)
 * v5.0, 2024-10-31, Merge [#4216](https://github.com/ossrs/srs/pull/4216): fix hls error when stream has extension. v5.0.217 (#4216)
diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp
@@ -2405,7 +2405,7 @@ srs_error_t SrsConfig::check_normal_config()
         }
     }
     if (true) {
-        SrsConfDirective* conf = get_heartbeart();
+        SrsConfDirective* conf = get_heartbeat();
         for (int i = 0; conf && i < (int)conf->directives.size(); i++) {
             string n = conf->at(i)->name;
             if (n != "enabled" && n != "interval" && n != "url"
@@ -8708,7 +8708,7 @@ string SrsConfig::get_vhost_http_remux_mount(string vhost)
     return conf->arg0();
 }
 
-SrsConfDirective* SrsConfig::get_heartbeart()
+SrsConfDirective* SrsConfig::get_heartbeat()
 {
     return root->get("heartbeat");
 }
@@ -8719,7 +8719,7 @@ bool SrsConfig::get_heartbeat_enabled()
 
     static bool DEFAULT = false;
     
-    SrsConfDirective* conf = get_heartbeart();
+    SrsConfDirective* conf = get_heartbeat();
     if (!conf) {
         return DEFAULT;
     }
@@ -8738,7 +8738,7 @@ srs_utime_t SrsConfig::get_heartbeat_interval()
 
     static srs_utime_t DEFAULT = (srs_utime_t)(10 * SRS_UTIME_SECONDS);
     
-    SrsConfDirective* conf = get_heartbeart();
+    SrsConfDirective* conf = get_heartbeat();
     if (!conf) {
         return DEFAULT;
     }
@@ -8757,7 +8757,7 @@ string SrsConfig::get_heartbeat_url()
 
     static string DEFAULT = "http://" SRS_CONSTS_LOCALHOST ":8085/api/v1/servers";
     
-    SrsConfDirective* conf = get_heartbeart();
+    SrsConfDirective* conf = get_heartbeat();
     if (!conf) {
         return DEFAULT;
     }
@@ -8776,7 +8776,7 @@ string SrsConfig::get_heartbeat_device_id()
 
     static string DEFAULT = "";
     
-    SrsConfDirective* conf = get_heartbeart();
+    SrsConfDirective* conf = get_heartbeat();
     if (!conf) {
         return DEFAULT;
     }
@@ -8795,7 +8795,7 @@ bool SrsConfig::get_heartbeat_summaries()
 
     static bool DEFAULT = false;
 
-    SrsConfDirective* conf = get_heartbeart();
+    SrsConfDirective* conf = get_heartbeat();
     if (!conf) {
         return DEFAULT;
     }
@@ -8814,7 +8814,7 @@ bool SrsConfig::get_heartbeat_ports()
 
     static bool DEFAULT = false;
 
-    SrsConfDirective* conf = get_heartbeart();
+    SrsConfDirective* conf = get_heartbeat();
     if (!conf) {
         return DEFAULT;
     }
diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp
@@ -1104,10 +1104,10 @@ class SrsConfig
     // Get the http flv live stream mount point for vhost.
     // used to generate the flv stream mount path.
     virtual std::string get_vhost_http_remux_mount(std::string vhost);
-// http heartbeart section
+// http heartbeat section
 private:
     // Get the heartbeat directive.
-    virtual SrsConfDirective* get_heartbeart();
+    virtual SrsConfDirective* get_heartbeat();
 public:
     // Whether heartbeat enabled.
     virtual bool get_heartbeat_enabled();
diff --git 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    219
+#define VERSION_REVISION    220
 
 #endif
diff --git 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    160
+#define VERSION_REVISION    161
 
 #endif
diff --git 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    22
+#define VERSION_REVISION    23
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -2405,7 +2405,7 @@ srs_error_t SrsConfig::check_normal_config()`
`2405`	`2405`	`}`
`2406`	`2406`	`}`
`2407`	`2407`	`if (true) {`
`2408`		`- SrsConfDirective* conf = get_heartbeart();`
	`2408`	`+ SrsConfDirective* conf = get_heartbeat();`
`2409`	`2409`	`for (int i = 0; conf && i < (int)conf->directives.size(); i++) {`
`2410`	`2410`	`string n = conf->at(i)->name;`
`2411`	`2411`	`if (n != "enabled" && n != "interval" && n != "url"`
`@@ -8708,7 +8708,7 @@ string SrsConfig::get_vhost_http_remux_mount(string vhost)`
`8708`	`8708`	`return conf->arg0();`
`8709`	`8709`	`}`
`8710`	`8710`
`8711`		`-SrsConfDirective* SrsConfig::get_heartbeart()`
	`8711`	`+SrsConfDirective* SrsConfig::get_heartbeat()`
`8712`	`8712`	`{`
`8713`	`8713`	`return root->get("heartbeat");`
`8714`	`8714`	`}`
`@@ -8719,7 +8719,7 @@ bool SrsConfig::get_heartbeat_enabled()`
`8719`	`8719`
`8720`	`8720`	`static bool DEFAULT = false;`
`8721`	`8721`
`8722`		`- SrsConfDirective* conf = get_heartbeart();`
	`8722`	`+ SrsConfDirective* conf = get_heartbeat();`
`8723`	`8723`	`if (!conf) {`
`8724`	`8724`	`return DEFAULT;`
`8725`	`8725`	`}`
`@@ -8738,7 +8738,7 @@ srs_utime_t SrsConfig::get_heartbeat_interval()`
`8738`	`8738`
`8739`	`8739`	`static srs_utime_t DEFAULT = (srs_utime_t)(10 * SRS_UTIME_SECONDS);`
`8740`	`8740`
`8741`		`- SrsConfDirective* conf = get_heartbeart();`
	`8741`	`+ SrsConfDirective* conf = get_heartbeat();`
`8742`	`8742`	`if (!conf) {`
`8743`	`8743`	`return DEFAULT;`
`8744`	`8744`	`}`
`@@ -8757,7 +8757,7 @@ string SrsConfig::get_heartbeat_url()`
`8757`	`8757`
`8758`	`8758`	`static string DEFAULT = "http://" SRS_CONSTS_LOCALHOST ":8085/api/v1/servers";`
`8759`	`8759`
`8760`		`- SrsConfDirective* conf = get_heartbeart();`
	`8760`	`+ SrsConfDirective* conf = get_heartbeat();`
`8761`	`8761`	`if (!conf) {`
`8762`	`8762`	`return DEFAULT;`
`8763`	`8763`	`}`
`@@ -8776,7 +8776,7 @@ string SrsConfig::get_heartbeat_device_id()`
`8776`	`8776`
`8777`	`8777`	`static string DEFAULT = "";`
`8778`	`8778`
`8779`		`- SrsConfDirective* conf = get_heartbeart();`
	`8779`	`+ SrsConfDirective* conf = get_heartbeat();`
`8780`	`8780`	`if (!conf) {`
`8781`	`8781`	`return DEFAULT;`
`8782`	`8782`	`}`
`@@ -8795,7 +8795,7 @@ bool SrsConfig::get_heartbeat_summaries()`
`8795`	`8795`
`8796`	`8796`	`static bool DEFAULT = false;`
`8797`	`8797`
`8798`		`- SrsConfDirective* conf = get_heartbeart();`
	`8798`	`+ SrsConfDirective* conf = get_heartbeat();`
`8799`	`8799`	`if (!conf) {`
`8800`	`8800`	`return DEFAULT;`
`8801`	`8801`	`}`
`@@ -8814,7 +8814,7 @@ bool SrsConfig::get_heartbeat_ports()`
`8814`	`8814`
`8815`	`8815`	`static bool DEFAULT = false;`
`8816`	`8816`
`8817`		`- SrsConfDirective* conf = get_heartbeart();`
	`8817`	`+ SrsConfDirective* conf = get_heartbeat();`
`8818`	`8818`	`if (!conf) {`
`8819`	`8819`	`return DEFAULT;`
`8820`	`8820`	`}`