mirror of
				https://github.com/ossrs/srs.git
				synced 2025-03-09 15:49:59 +00:00 
			
		
		
		
	Update 3rdparty.
This commit is contained in:
		
							parent
							
								
									ec5bdc7dfa
								
							
						
					
					
						commit
						e2cc356c31
					
				
					 4 changed files with 11 additions and 5 deletions
				
			
		
							
								
								
									
										4
									
								
								trunk/3rdparty/httpx-static/README.md
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								trunk/3rdparty/httpx-static/README.md
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -55,7 +55,7 @@ Open https://localhost:8443/api/v1/summaries in browser.
 | 
			
		|||
Run httpx-static in docker:
 | 
			
		||||
 | 
			
		||||
```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).
 | 
			
		||||
| 
						 | 
				
			
			@ -64,7 +64,7 @@ To proxy to other dockers, in macOS:
 | 
			
		|||
 | 
			
		||||
```bash
 | 
			
		||||
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 \
 | 
			
		||||
        -proxy http://$CANDIDATE:8080/
 | 
			
		||||
```
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								trunk/3rdparty/httpx-static/version.go
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								trunk/3rdparty/httpx-static/version.go
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -35,7 +35,7 @@ func VersionMinor() int {
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
func VersionRevision() int {
 | 
			
		||||
	return 18
 | 
			
		||||
	return 19
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func Version() string {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										6
									
								
								trunk/3rdparty/signaling/README.md
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								trunk/3rdparty/signaling/README.md
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
# signaling
 | 
			
		||||
 | 
			
		||||
WebRTC signaling for https://github.com/ossrs/srs
 | 
			
		||||
A demo WebRTC signaling for https://github.com/ossrs/srs
 | 
			
		||||
 | 
			
		||||
## Usage
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -18,7 +18,7 @@ docker run --rm --env CANDIDATE=$(ifconfig en0 inet| grep 'inet '|awk '{print $2
 | 
			
		|||
Run signaling in docker:
 | 
			
		||||
 | 
			
		||||
```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). 
 | 
			
		||||
| 
						 | 
				
			
			@ -60,3 +60,5 @@ Open demos by HTTPS or IP:
 | 
			
		|||
* https://192.168.3.6/demos/
 | 
			
		||||
 | 
			
		||||
Winlin 2021.05
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										4
									
								
								trunk/3rdparty/signaling/main.go
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								trunk/3rdparty/signaling/main.go
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -177,6 +177,10 @@ func main() {
 | 
			
		|||
 | 
			
		||||
	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
 | 
			
		||||
	var rooms sync.Map
 | 
			
		||||
	http.Handle("/sig/v1/rtc", websocket.Handler(func(c *websocket.Conn) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue