Winlin
fdcff383ae
Support include empty config file. v5.0.173 ( #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:58:37 +08:00
winlin
c3d265c07c
Release v5.0-b3, 5.0 beta3, v5.0.170, 162704 lines.
2023-08-02 11:04:49 +08:00
winlin
4811dd76f8
Release v5.0-b2, 5.0 beta2, v5.0.166, 162520 lines.
2023-07-10 08:22:48 +08:00
Winlin
883ef7513b
Switch to 5.0 document, because it's beta now. ( #3609 )
...
------
Co-authored-by: john <hondaxiao@tencent.com>
2023-06-30 06:06:33 +08:00
winlin
1713a542ed
Release v5.0-b1, 5.0 beta1, v5.0.157, 162494 lines.
2023-06-11 08:22:45 +08:00
chundonglinlin
79fd66d8e6
SSL: Fix SSL_get_error get the error of other coroutine. v5.0.156, v6.0.46 ( #3513 )
...
---------
Co-authored-by: john <hondaxiao@tencent.com>
Co-authored-by: winlin <winlin@vip.126.com>
2023-05-29 13:03:59 +08:00
winlin
6e77653cdc
Release v5.0-b0, 5.0 beta0, v5.0.155, 162600 lines.
2023-05-14 13:07:56 +08:00
winlin
55fbee3304
Release v5.0-a5, 5.0 alpha5, v5.0.148, 162066 lines.
2023-03-23 10:35:01 +08:00
winlin
af7f5b3c55
Release v5.0-a4, 5.0 alpha4, v5.0.141, 161897 lines.
2023-02-12 16:25:31 +08:00
winlin
b602e47e1c
Update the dev code for SRS
2023-01-31 16:18:41 +08:00
winlin
a47b3a7842
Release v5.0-a3, 5.0 alpha3, v5.0.128, 161327 lines.
2023-01-02 19:09:37 +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
8adb1693cc
Release v5.0-a1, 5.0 alpha1, v5.0.100, 160817 lines.
2022-12-01 23:10:21 +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
237d60a55d
Coverage: Refine the codecov link.
2022-11-23 18:30:47 +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
winlin
101d1ffbbf
Support DigitalOcean Droplet SRS 1-Click. v5.0.27
2022-03-30 12:39:56 +08:00
winlin
1463192763
Refine README.
2022-03-23 10:36:58 +08:00
winlin
9385f2b80b
Merge branch '4.0release' into develop
2022-03-19 13:21:58 +08:00
winlin
dbfa761aed
Release v4.0-b10, 4.0 beta10, v4.0.251, 144665 lines.
2022-03-19 13:04:06 +08:00
winlin
3998a88cc9
Update README for mermaid.
2022-03-15 14:25:09 +08:00
winlin
0008927d76
Update README for FOSSA.
2022-03-15 14:19:41 +08:00
winlin
b0463c2a4d
Update README for FOSSA.
2022-03-15 13:51:27 +08:00
winlin
8703957595
Update README for FOSSA LICNESE scan.
2022-03-15 13:48:41 +08:00
winlin
75cf9b3d19
Add single node architecture
2022-03-03 09:40:50 +08:00
