Skip to content

Allow Forward to be configured with Env Var. v6.0.170 v7.0.49 #4245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
winlinvip merged 7 commits into from
Jul 28, 2025
Merged

Allow Forward to be configured with Env Var. v6.0.170 v7.0.49 #4245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb3d700
Allow env var to configure forward
ssysm Nov 29, 2024
4967f36
Merge branch 'develop' into develop
ssysm Jan 8, 2025
3322856
Merge branch 'develop' into develop
ssysm Feb 20, 2025
b92a009
Merge branch 'develop' into develop
duiniuluantanqin Mar 24, 2025
d1bb55b
Merge branch 'develop' into develop
ssysm Jul 20, 2025
06daf91
Update release to v6.0.170 v7.0.49
winlinvip Jul 28, 2025
1b978d1
AI: Add utests for PR.
winlinvip Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions trunk/doc/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The changelog for SRS.
<a name="v7-changes"></a>

## SRS 7.0 Changelog
* v7.0, 2025-07-28, Merge [#4245](https://github.com/ossrs/srs/pull/4245): Allow Forward to be configured with Env Var. v7.0.49 (#4245)
* v7.0, 2025-07-16, Merge [#4295](https://github.com/ossrs/srs/pull/4295): RTC: audio packet jitter buffer. v7.0.48 (#4295)
* v7.0, 2025-07-11, Merge [#4333](https://github.com/ossrs/srs/pull/4333): NEW PROTOCOL: Support viewing stream over RTSP. v7.0.47 (#4333)
* v7.0, 2025-07-10, Merge [#4414](https://github.com/ossrs/srs/pull/4414): Fix H.264 B-frame detection logic to comply with specification. v7.0.46 (#4414)
Expand Down Expand Up @@ -59,6 +60,7 @@ The changelog for SRS.
<a name="v6-changes"></a>

## SRS 6.0 Changelog
* 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)
* v6.0, 2025-07-10, Merge [#4414](https://github.com/ossrs/srs/pull/4414): Fix H.264 B-frame detection logic to comply with specification. v6.0.169 (#4414)
* v6.0, 2025-06-04, Merge [#4325](https://github.com/ossrs/srs/pull/4325): fix bug: loop transcoding #3516. v6.0.168 (#4325)
* v6.0, 2025-05-29, Merge [#4356](https://github.com/ossrs/srs/pull/4356): RTMP: Use extended timestamp as delta when chunk fmt=1/2. v6.0.167 (#4356)
Expand Down
10 changes: 9 additions & 1 deletion trunk/src/app/srs_app_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5673,7 +5673,10 @@ int SrsConfig::get_global_chunk_size()
return ::atoi(conf->arg0().c_str());
}

bool SrsConfig::get_forward_enabled(string vhost) {
bool SrsConfig::get_forward_enabled(string vhost)
{
SRS_OVERWRITE_BY_ENV_BOOL("srs.vhost.forward.enabled"); // SRS_VHOST_FORWARD_ENABLED

static bool DEFAULT = false;

SrsConfDirective* conf = get_vhost(vhost);
Expand All @@ -5686,6 +5689,8 @@ bool SrsConfig::get_forward_enabled(string vhost) {

bool SrsConfig::get_forward_enabled(SrsConfDirective* vhost)
{
SRS_OVERWRITE_BY_ENV_BOOL("srs.vhost.forward.enabled"); // SRS_VHOST_FORWARD_ENABLED

static bool DEFAULT = false;

SrsConfDirective* conf = vhost->get("forward");
Expand Down Expand Up @@ -5718,6 +5723,9 @@ SrsConfDirective* SrsConfig::get_forwards(string vhost)

SrsConfDirective* SrsConfig::get_forward_backend(string vhost)
{

SRS_OVERWRITE_BY_ENV_DIRECTIVE("srs.vhost.forward.backend"); // SRS_VHOST_FORWARD_BACKEND

SrsConfDirective* conf = get_vhost(vhost);
if (!conf) {
return NULL;
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/core/srs_core_version6.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

#define VERSION_MAJOR 6
#define VERSION_MINOR 0
#define VERSION_REVISION 169
#define VERSION_REVISION 170

#endif
2 changes: 1 addition & 1 deletion trunk/src/core/srs_core_version7.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

#define VERSION_MAJOR 7
#define VERSION_MINOR 0
#define VERSION_REVISION 48
#define VERSION_REVISION 49

#endif
Loading
Loading