external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-14 20:31:56 +00:00
Code Issues Releases Wiki Activity

Squash: Fix stat bug

Browse source
This commit is contained in:
winlin 2021-11-15 20:39:35 +08:00
parent 93242918ad
commit 66435d583a
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/release.yml vendored
View file

@ -99,6 +99,8 @@ jobs:
run: |
docker tag ossrs/srs:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_TAG
docker push registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_TAG
docker tag ossrs/srs:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_VERSION
docker push registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_VERSION
docker tag ossrs/srs:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v$SRS_MAJOR
docker push registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v$SRS_MAJOR
docker tag ossrs/srs:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_MAJOR

1
README.md
View file

@ -7,6 +7,7 @@
[![](https://codecov.io/gh/ossrs/srs/branch/develop/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/develop)
[![](https://gitee.com/winlinvip/srs-wiki/raw/master/images/wechat-badge4.svg)](../../wikis/Contact#wechat)
[![](https://gitee.com/winlinvip/srs-wiki/raw/master/images/srs-faq.svg)](https://github.com/ossrs/srs/issues/2716)
[![](https://gitee.com/winlinvip/srs-wiki/raw/master/images/mulan-incubating.svg)](http://mulanos.cn)
SRS/5.0 是一个简单高效的实时视频服务器，支持RTMP/WebRTC/HLS/HTTP-FLV/SRT。

1
trunk/conf/full.conf
View file

@ -113,6 +113,7 @@ tcmalloc_release_rate 0.8;
# Query the latest available version of SRS, write a log to notice user to upgrade.
# @see https://github.com/ossrs/srs/issues/2424
# @see https://github.com/ossrs/srs/issues/2508
# Default: on
query_latest_version on;

8
trunk/src/app/srs_app_latest_version.cpp
View file

@ -30,6 +30,8 @@ extern bool _srs_in_docker;
#define SRS_CHECK_FEATURE2(cond, key, ss) if (cond) ss << "&" << key << "=1"
#define SRS_CHECK_FEATURE3(cond, key, value, ss) if (cond) ss << "&" << key << "=" << value
// @see https://github.com/ossrs/srs/issues/2424
// @see https://github.com/ossrs/srs/issues/2508
void srs_build_features(stringstream& ss)
{
if (SRS_OSX_BOOL) {
@ -38,9 +40,9 @@ void srs_build_features(stringstream& ss)
ss << "&os=linux";
}
#if defined(__amd64__) && defined(__x86_64__) && defined(__i386__)
#if defined(__amd64__) || defined(__x86_64__) || defined(__i386__)
ss << "&x86=1";
#elif defined(__arm__) && defined(__aarch64__)
#elif defined(__arm__) || defined(__aarch64__)
ss << "&arm=1";
#elif defined(__mips__)
ss << "&mips=1";
@ -161,6 +163,8 @@ SrsLatestVersion::~SrsLatestVersion()
srs_error_t SrsLatestVersion::start()
{
// @see https://github.com/ossrs/srs/issues/2424
// @see https://github.com/ossrs/srs/issues/2508
if (!_srs_config->whether_query_latest_version()) {
return srs_success;
}