1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Commit graph

2074 commits

Author SHA1 Message Date
Winlin
cf46dae80f Support include empty config file. v5.0.173 v6.0.68 (#3768)
SRS supports including another configuration in the include package.
When generating configurations, we can only generate the changed
configurations, while the unchanged configurations are in the fixed
files, for example:

```nginx
listen 1935;
include server.conf;
```

In `server.conf`, we can manage the changing configurations with the
program:

```nginx
http_api { enabled on; }
```

However, during system initialization, we often create an empty
`server.conf`, and the content is generated only after the program
starts, so `server.conf` might be an empty file. This also makes it
convenient to use a script to confirm the existence of this file:

```bash
touch server.conf
```

Currently, SRS does not support empty configurations and will report an
error. This PR is to solve this problem, making it more convenient to
use include.

`TRANS_BY_GPT4`

---------

Co-authored-by: Haibo Chen <495810242@qq.com>
2023-08-28 10:53:27 +08:00
winlin
a1c7b9f2ba Release v6.0-d0, 6.0 dev0, v6.0.59, 166739 lines. 2023-07-10 08:17:28 +08:00
Winlin
cb44e81d83
Switch to 5.0 document, because it's beta now. (#3609)
------

Co-authored-by: john <hondaxiao@tencent.com>
2023-06-30 06:01:56 +08:00
Winlin
0ce2983e44
TOC: Welcome to the new TOC member, ZhangJunqin. (#3579)
------

Co-authored-by: ChenGH <chengh_math@126.com>
Co-authored-by: Haibo Chen <495810242@qq.com>
Co-authored-by: LiPeng <lipeng19811218@gmail.com>
2023-06-13 10:24:40 +08:00
chundonglinlin
27f9db9762
SSL: Fix SSL_get_error get the error of other coroutine. v5.0.155, v6.0.46 (#3513)
---------

Co-authored-by: john <hondaxiao@tencent.com>
Co-authored-by: winlin <winlin@vip.126.com>
2023-05-29 13:00:41 +08:00
winlin
665c30af90 Release v6.0.45, a development version.
Release v5.0-b0, 5.0 beta0, v5.0.155, 162600 lines.

PICK 6e77653cdc
2023-05-14 13:14:11 +08:00
Winlin
78f1ebfcb1
Improve README and documents with AI. v5.0.153. v6.0.43 (#3538)
* Improve README with AI and add new features

1. Update README file with AI to make it more informative and user-friendly
2. Add a detailed table of contents (TOC) with an introduction for easy navigation
3. Introduce an auto-detecting Automake feature that displays the correct installation command
4. Add support for SRT to HTTP-TS config file
5. Refine the WHIP delete location URL
6. Add support for disabling encryption for WHIP or WHEP

This pull request aims to enhance the quality of the project by introducing innovative features and making the necessary updates. These updates will help users navigate the project more efficiently while also improving the overall project's quality.

---------

Co-authored-by: ChenGH <chengh_math@126.com>
Co-authored-by: john <hondaxiao@tencent.com>
2023-05-12 17:18:30 +08:00
winlin
99ca66ddc8 Add new contributors. 2023-02-21 09:13:40 +08:00
winlin
b6cb5b9cd7 Release v5.0-a4, 5.0 alpha4, v5.0.141, 161897 lines.
PICK af7f5b3c55
2023-02-12 16:27:26 +08:00
winlin
1d11d02e4b Update the dev code for SRS 2023-01-31 16:19:28 +08:00
winlin
6dd1536186 Update backer link. 2023-01-29 19:27:29 +08:00
winlin
8ea7d8b33f Scorecard: Add OpenSSF Best Practics badge. 2023-01-11 11:55:42 +08:00
Winlin
d34085615b
Create scorecard.yml (#3374) 2023-01-10 21:17:13 +08:00
winlin
2f7e474853 Merge branch v5.0.112 into develop
1. SRT: Fix srt to rtmp crash when sps or pps empty. v5.0.112 (#3323)
2. GB28181: Fix memory overlap for small packets. v5.0.111 (#3315)
3. FLV: Support set default has_av and disable guessing. v5.0.110 (#3311)
4. FLV: Drop packet if header flag is not matched. v5.0.109 (#3306)
5. FLV: Reset has_audio or has_video if only sequence header. (#3310)
2022-12-18 11:44:29 +08:00
winlin
e6f40bd0c7 Release v5.0-a2, 5.0 alpha2, v5.0.112, 161233 lines. 2022-12-18 09:55:57 +08:00
winlin
56be854f36 Update README. 2022-12-09 08:04:58 +08:00
winlin
fa177679a6 Merge 5.0.100, v5.0-a1 into develop. 2022-12-01 23:13:56 +08:00
winlin
8adb1693cc Release v5.0-a1, 5.0 alpha1, v5.0.100, 160817 lines. 2022-12-01 23:10:21 +08:00
winlin
79d096ae91 Merge branch 5.0.98 into develop
1. Release v5.0-a0, 5.0 alpha0, v5.0.98, 159813 lines.
2022-11-25 16:46:26 +08:00
winlin
aa5496aa69 Release v5.0-a0, 5.0 alpha0, v5.0.98, 159813 lines. 2022-11-25 13:41:38 +08:00
winlin
9b7db9aa68 DASH: Update README for MPEG-DASH. 2022-11-24 18:45:52 +08:00
winlin
56bf2a421f Merge 5.0release 2022-11-23 18:53:52 +08:00
winlin
237d60a55d Coverage: Refine the codecov link. 2022-11-23 18:30:47 +08:00
winlin
0b955b4166 Update README for SRS 6.0 2022-11-22 12:49:19 +08:00
winlin
d2a526ae6a Develop is SRS 6.0 now.
This reverts commit daa7fd2247.
2022-11-22 12:44:49 +08:00
winlin
daa7fd2247 Create 5.0release branch, features freezed. 2022-11-22 12:41:57 +08:00
winlin
cdbebb3729 Merge branch '4.0release' into develop 2022-11-22 11:25:06 +08:00
winlin
2573a25101 Release v4.0-r4, 4.0 release4, v4.0.268, 145482 lines. 2022-11-22 11:01:56 +08:00
winlin
8dcbcd1656 GB28181: Update README for GB28181. 2022-10-26 21:30:40 +08:00
winlin
f02656f946 Merge branch '4.0release' into develop 2022-09-16 10:14:12 +08:00
winlin
64c2ac8176 Release v4.0-r3, 4.0 release3, v4.0.265, 145328 lines. 2022-09-16 10:10:35 +08:00
winlin
18d25eacfb Merge 4.0release 2022-08-24 19:26:47 +08:00
winlin
fe2002794f Release v4.0-r2, 4.0 release2, v4.0.257, 144890 lines. 2022-08-24 18:25:30 +08:00
winlin
f911e3861b Refine README badges. 2022-08-15 08:18:20 +08:00
winlin
4126c42118 Speedup test by refine the task dependencies. 2022-08-15 07:57:42 +08:00
winlin
50be42a8ed Fix README link issue. 2022-08-09 16:01:54 +08:00
winlin
f7280399d4 Merge 4.0release, migrate to new website. 2022-07-31 18:34:18 +08:00
winlin
7b23a42139 Migrate license to new website. 2022-07-31 17:12:14 +08:00
winlin
cd85a96255 Update SRS image for r.ossrs.net 2022-06-30 07:43:13 +08:00
winlin
57be5188c3 Merge branch '4.0release' into develop 2022-06-29 20:37:20 +08:00
winlin
a2cfec2dcc Update SRS image for r.ossrs.net 2022-06-29 20:36:35 +08:00
winlin
d525d27e64 Merge from 4.0release 2022-06-15 19:21:13 +08:00
winlin
1f0ea3fdf5 Docker: Support x86_64, armv7 and aarch64 docker image (#3058). v4.0.252 2022-06-15 09:58:05 +08:00
winlin
2633f03954 SRS: YouTube channel online. 2022-05-13 13:25:38 +08:00
winlin
e14c3a946d Update README. 2022-04-06 17:15:34 +08:00
winlin
1e2f8dc299 Update README for single node architecture. 2022-04-06 17:01:22 +08:00
winlin
2d50fb0882 Update LICENSE. 2022-04-06 13:03:32 +08:00
winlin
3bc17488bc Update SRS 4.0 single node arch. 2022-04-05 11:11:25 +08:00
winlin
d38b8fcf1d Update SRS 4.0 single node arch. 2022-04-05 11:00:06 +08:00
winlin
4163dce18d Support NGINX HLS Cluster. v5.0.28 2022-04-04 13:45:49 +08:00