external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity

Update 3rdparty.

Browse source
This commit is contained in:
winlin 2022-05-16 22:37:22 +08:00
parent ec5bdc7dfa
commit e2cc356c31
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
trunk/3rdparty/httpx-static/README.md vendored
View file

@ -55,7 +55,7 @@ Open https://localhost:8443/api/v1/summaries in browser.
Run httpx-static in docker: Run httpx-static in docker:
```bash ```bash
docker run --rm -p 80:80 -p 443:443 registry.cn-hangzhou.aliyuncs.com/ossrs/httpx:v1.0.2 docker run --rm -p 80:80 -p 443:443 registry.cn-hangzhou.aliyuncs.com/ossrs/httpx:v1.0.19
``` ```
> Note: More images and version is [here](https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/httpx/images). > Note: More images and version is [here](https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/httpx/images).
@ -64,7 +64,7 @@ To proxy to other dockers, in macOS:
```bash ```bash
CANDIDATE=$(ifconfig en0 inet| grep 'inet '|awk '{print $2}') && CANDIDATE=$(ifconfig en0 inet| grep 'inet '|awk '{print $2}') &&
docker run --rm -p 80:80 -p 443:443 registry.cn-hangzhou.aliyuncs.com/ossrs/httpx:v1.0.5 \ docker run --rm -p 80:80 -p 443:443 registry.cn-hangzhou.aliyuncs.com/ossrs/httpx:v1.0.19 \
./bin/httpx-static -http 80 -https 443 -ssk ./etc/server.key -ssc ./etc/server.crt \ ./bin/httpx-static -http 80 -https 443 -ssk ./etc/server.key -ssc ./etc/server.crt \
-proxy http://$CANDIDATE:8080/ -proxy http://$CANDIDATE:8080/
``` ```

2
trunk/3rdparty/httpx-static/version.go vendored
View file

@ -35,7 +35,7 @@ func VersionMinor() int {
} }
func VersionRevision() int { func VersionRevision() int {
return 18 return 19
} }
func Version() string { func Version() string {

6
trunk/3rdparty/signaling/README.md vendored
View file

@ -1,6 +1,6 @@
# signaling # signaling
WebRTC signaling for https://github.com/ossrs/srs A demo WebRTC signaling for https://github.com/ossrs/srs
## Usage ## Usage
@ -18,7 +18,7 @@ docker run --rm --env CANDIDATE=$(ifconfig en0 inet| grep 'inet '|awk '{print $2
Run signaling in docker: Run signaling in docker:
```bash ```bash
docker run --rm -p 1989:1989 registry.cn-hangzhou.aliyuncs.com/ossrs/signaling:v1.0.4 docker run --rm -p 1989:1989 registry.cn-hangzhou.aliyuncs.com/ossrs/signaling:1
``` ```
> Note: More images and version is [here](https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/signaling/images). > Note: More images and version is [here](https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/signaling/images).
@ -60,3 +60,5 @@ Open demos by HTTPS or IP:
* https://192.168.3.6/demos/ * https://192.168.3.6/demos/
Winlin 2021.05 Winlin 2021.05

4
trunk/3rdparty/signaling/main.go vendored
View file

@ -177,6 +177,10 @@ func main() {
http.Handle("/", http.FileServer(http.Dir(html))) http.Handle("/", http.FileServer(http.Dir(html)))
http.Handle("/sig/v1/versions", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Write([]byte("1.0"))
}))
// Key is name of room, value is Room // Key is name of room, value is Room
var rooms sync.Map var rooms sync.Map
http.Handle("/sig/v1/rtc", websocket.Handler(func(c *websocket.Conn) { http.Handle("/sig/v1/rtc", websocket.Handler(func(c *websocket.Conn) {