Merge branch '2.0release' into develop

DONATIONS.txt

@@ -14,6 +14,7 @@ RMB 500-999
 * [2015-04-11 12:48] 丁一
 
 RMB 100-499
+* [2015-05-06 22:04] 姜庆东
 * [2015-04-10 19:52] 阳成飞
 * [2015-03-30 13:34] 扶凯
 * [2015-03-29 11-07] 姚伟斌

trunk/conf/push.flv.conf

@@ -4,6 +4,11 @@
 
 listen              1935;
 max_connections     1000;
+http_server {
+    enabled         on;
+    listen          8080;
+    dir             ./objs/nginx/html;
+}
 stream_caster {
     enabled         on;
     caster          flv;
@@ -11,4 +16,12 @@ stream_caster {
     listen          8936;
 }
 vhost __defaultVhost__ {
+    hls {
+        enabled         on;
+        hls_fragment    10;
+        hls_window      60;
+        hls_path        ./objs/nginx/html;
+        hls_m3u8_file   [app]/[stream].m3u8;
+        hls_ts_file     [app]/[stream]-[seq].ts;
+    }
 }