diff --git a/README.md b/README.md
index 9305d4857..1ea4288fc 100755
--- a/README.md
+++ b/README.md
@@ -117,6 +117,7 @@ cd simple-rtmp-server/trunk
See also:
* Usage: How to delivery RTMP?([CN][v1_CN_SampleRTMP], [EN][v1_EN_SampleRTMP])
* Usage: How to delivery HTTP FLV Live Streaming?([CN][v2_CN_SampleHttpFlv], [EN][v2_EN_SampleHttpFlv])
+* Usage: How to delivery HTTP FLV Live Streaming Cluster?([CN][v2_CN_SampleHttpFlvCluster], [EN][v2_EN_SampleHttpFlvCluster])
* Usage: How to delivery HLS?([CN][v1_CN_SampleHLS], [EN][v1_EN_SampleHLS])
* Usage: How to delivery HLS for other codec?([CN][v1_CN_SampleTranscode2HLS], [EN][v1_EN_SampleTranscode2HLS])
* Usage: How to transode RTMP stream by SRS?([CN][v1_CN_SampleFFMPEG], [EN][v1_EN_SampleFFMPEG])
@@ -936,6 +937,8 @@ Winlin
[v2_EN_Streamer2]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Streamer#push-http-flv-to-srs
[v2_CN_SampleHttpFlv]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHttpFlv
[v2_EN_SampleHttpFlv]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHttpFlv
+[v2_CN_SampleHttpFlvCluster]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHttpFlvCluster
+[v2_EN_SampleHttpFlvCluster]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHttpFlvCluster
[bug #213]: https://github.com/simple-rtmp-server/srs/issues/213
[bug #194]: https://github.com/simple-rtmp-server/srs/issues/194
diff --git a/trunk/conf/http.flv.live.edge1.conf b/trunk/conf/http.flv.live.edge1.conf
new file mode 100644
index 000000000..a9000d25f
--- /dev/null
+++ b/trunk/conf/http.flv.live.edge1.conf
@@ -0,0 +1,22 @@
+# the config for srs to remux rtmp to flv live stream.
+# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHttpStream
+# @see full.conf for detail config.
+
+listen 19351;
+max_connections 1000;
+pid objs/srs.flv.19351.pid;
+srs_log_file objs/srs.flv.19351.log;
+http_server {
+ enabled on;
+ listen 8081;
+ dir ./objs/nginx/html;
+}
+vhost __defaultVhost__ {
+ mode remote;
+ origin 127.0.0.1;
+ http_remux {
+ enabled on;
+ mount [vhost]/[app]/[stream].flv;
+ hstrs on;
+ }
+}
diff --git a/trunk/conf/http.flv.live.edge2.conf b/trunk/conf/http.flv.live.edge2.conf
new file mode 100644
index 000000000..98c877b90
--- /dev/null
+++ b/trunk/conf/http.flv.live.edge2.conf
@@ -0,0 +1,22 @@
+# the config for srs to remux rtmp to flv live stream.
+# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHttpStream
+# @see full.conf for detail config.
+
+listen 19352;
+max_connections 1000;
+pid objs/srs.flv.19352.pid;
+srs_log_file objs/srs.flv.19352.log;
+http_server {
+ enabled on;
+ listen 8082;
+ dir ./objs/nginx/html;
+}
+vhost __defaultVhost__ {
+ mode remote;
+ origin 127.0.0.1;
+ http_remux {
+ enabled on;
+ mount [vhost]/[app]/[stream].flv;
+ hstrs on;
+ }
+}
diff --git a/trunk/src/protocol/srs_http_stack.cpp b/trunk/src/protocol/srs_http_stack.cpp
index 8ec6308cd..35818d1ea 100644
--- a/trunk/src/protocol/srs_http_stack.cpp
+++ b/trunk/src/protocol/srs_http_stack.cpp
@@ -25,6 +25,7 @@
#include
#include
+#include
using namespace std;
#include