正在显示
3 个修改的文件
包含
4 行增加
和
1 行删除
| @@ -110,6 +110,7 @@ cd simple-rtmp-server/trunk | @@ -110,6 +110,7 @@ cd simple-rtmp-server/trunk | ||
| 110 | * [Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleForward) | 110 | * [Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleForward) |
| 111 | * [Usage: How to deploy low lantency application?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleRealtime) | 111 | * [Usage: How to deploy low lantency application?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleRealtime) |
| 112 | * [Usage: How to deploy SRS on ARM?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleARM) | 112 | * [Usage: How to deploy SRS on ARM?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleARM) |
| 113 | +* [Usage: How to use SRS-HTTP-server to delivery HTTP/HLS stream?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleHTTP) | ||
| 113 | * [Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo) | 114 | * [Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo) |
| 114 | * [Usage: Solution using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Sample) | 115 | * [Usage: Solution using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Sample) |
| 115 | * [Usage: Why SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Product) | 116 | * [Usage: Why SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Product) |
| @@ -104,7 +104,7 @@ vhost http.srs.com { | @@ -104,7 +104,7 @@ vhost http.srs.com { | ||
| 104 | # main dir of vhost, | 104 | # main dir of vhost, |
| 105 | # to delivery HTTP stream of this vhost. | 105 | # to delivery HTTP stream of this vhost. |
| 106 | # default: ./objs/nginx/html | 106 | # default: ./objs/nginx/html |
| 107 | - dir ./objs/nginx/html; | 107 | + dir ./objs/nginx/html/hls; |
| 108 | } | 108 | } |
| 109 | } | 109 | } |
| 110 | 110 |
| @@ -195,6 +195,8 @@ int SrsHttpVhost::do_process_request(SrsSocket* skt, SrsHttpMessage* req) | @@ -195,6 +195,8 @@ int SrsHttpVhost::do_process_request(SrsSocket* skt, SrsHttpMessage* req) | ||
| 195 | return res_xml(skt, req, str); | 195 | return res_xml(skt, req, str); |
| 196 | } else if (srs_string_ends_with(fullpath, ".js")) { | 196 | } else if (srs_string_ends_with(fullpath, ".js")) { |
| 197 | return res_javascript(skt, req, str); | 197 | return res_javascript(skt, req, str); |
| 198 | + } else if (srs_string_ends_with(fullpath, ".json")) { | ||
| 199 | + return res_json(skt, req, str); | ||
| 198 | } else if (srs_string_ends_with(fullpath, ".swf")) { | 200 | } else if (srs_string_ends_with(fullpath, ".swf")) { |
| 199 | return res_swf(skt, req, str); | 201 | return res_swf(skt, req, str); |
| 200 | } else if (srs_string_ends_with(fullpath, ".css")) { | 202 | } else if (srs_string_ends_with(fullpath, ".css")) { |
-
请 注册 或 登录 后发表评论