diff --git a/README.md b/README.md index d10cd22a7..bd9438aeb 100755 --- a/README.md +++ b/README.md @@ -110,6 +110,7 @@ cd simple-rtmp-server/trunk * [Usage: How to forward stream to other server?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleForward) * [Usage: How to deploy low lantency application?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleRealtime) * [Usage: How to deploy SRS on ARM?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleARM) +* [Usage: How to use SRS-HTTP-server to delivery HTTP/HLS stream?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleHTTP) * [Usage: How to show the demo of SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo) * [Usage: Solution using SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Sample) * [Usage: Why SRS?](https://github.com/winlinvip/simple-rtmp-server/wiki/Product) diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index 297c0d97b..4881feeee 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -104,7 +104,7 @@ vhost http.srs.com { # main dir of vhost, # to delivery HTTP stream of this vhost. # default: ./objs/nginx/html - dir ./objs/nginx/html; + dir ./objs/nginx/html/hls; } } diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp index a1b0ea71c..1dd36c719 100644 --- a/trunk/src/app/srs_app_http_conn.cpp +++ b/trunk/src/app/srs_app_http_conn.cpp @@ -195,6 +195,8 @@ int SrsHttpVhost::do_process_request(SrsSocket* skt, SrsHttpMessage* req) return res_xml(skt, req, str); } else if (srs_string_ends_with(fullpath, ".js")) { return res_javascript(skt, req, str); + } else if (srs_string_ends_with(fullpath, ".json")) { + return res_json(skt, req, str); } else if (srs_string_ends_with(fullpath, ".swf")) { return res_swf(skt, req, str); } else if (srs_string_ends_with(fullpath, ".css")) {