From e6c08210f19ca4c68206b7396139c49426b844eb Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 2 Jul 2014 23:57:11 +0800
Subject: [PATCH 1/2] Update README.md

---
 README.md | 41 ++---------------------------------------
 1 file changed, 2 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index 0945d58a3..30db46016 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 #Simple-RTMP-Server
 
+SRS定位是运营级的互联网直播服务器，追求更好的概念完整性和最简单实现的代码。
+
 下载发布版(github): 
 [Centos6-x86_64](http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-0.9.134.zip) 
 其他[more...](http://winlinvip.github.io/srs.release/releases/) <br/>
@@ -28,45 +30,6 @@ git clone https://code.csdn.net/winlinvip/srs-csdn.git
 或 [阿里云镜像](http://www.ossrs.net:8085/srs/donation/index.html) ，查看
 [捐献墙(Donations)](https://github.com/winlinvip/simple-rtmp-server/blob/master/DONATIONS.txt)<br/>
 
-<table>
-    <tr>
-        <th>分支</th>
-        <th>说明</th>
-        <th>维护者</th>
-        <th>主作者</th>
-        <th>状态</th>
-    </tr>
-    <tr>
-        <td><a href="https://github.com/winlinvip/simple-rtmp-server" target="_blank">SRS-Linux</a></td>
-        <td>SRS服务器<br/>Linux平台分支</td>
-        <td><a href="https://github.com/winlinvip/simple-rtmp-server" target="_blank">winlin</a></td>
-        <td>
-            <a href="http://blog.csdn.net/win_lin" target="_blank">winlin</a> <br/>
-            <a href="http://blog.chinaunix.net/uid/25006789.html" target="_blank">wenjie.zhao</a>
-        </td>
-        <td>测试中</td>
-    </tr>
-    <tr>
-        <td><a href="https://github.com/winlinvip/srs.win" target="_blank">SRS-Windows</a></td>
-        <td>SRS服务器<br/>Windows平台分支</td>
-        <td><a href="https://github.com/suhetao" target="_blank">suhetao<br/>(核桃)</a></td>
-        <td><a href="https://github.com/suhetao" target="_blank">suhetao</a></td>
-        <td>开发中</td>
-    </tr>
-    <tr>
-        <td><a href="https://github.com/winlinvip/srs.librtmp.win" target="_blank">SRS-LIBRTMP-Windows</a></td>
-        <td>SRS-LIBRTMP客户端库<br/>Windows平台分支</td>
-        <td><a href="https://github.com/chadwangcn" target="_blank">chad.wang<br/>(videoWorker)</a></td>
-        <td><a href="https://github.com/chadwangcn" target="_blank">chad.wang</a></td>
-        <td>停滞</td>
-    </tr>
-</table>
-
-对于没有Release的分支：
-* 长期处于停滞状态的分支，以及开发缓慢的分支，更换主作者。
-* 任何人都可以维护这个分支，代替之前的主作者。
-* 分支Release之后，分支的主作者加入SRS主作者。
-
 ## About
 
 SRS(SIMPLE RTMP Server) over state-threads created in 2013.10.

From d7454134c98a356e4b3efca27926f78300d75b1e Mon Sep 17 00:00:00 2001
From: wenjiegit <740936897@qq.com>
Date: Fri, 4 Jul 2014 09:53:50 +0800
Subject: [PATCH 2/2] Update srs_app_hls.cpp

for hls, srs should not allow player to cache m3u8 list.

add #EXT-X-ALLOW-CACHE:NO to m3u8 file.
---
 trunk/src/app/srs_app_hls.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp
index c93bb0276..ac36be019 100644
--- a/trunk/src/app/srs_app_hls.cpp
+++ b/trunk/src/app/srs_app_hls.cpp
@@ -825,7 +825,10 @@ int SrsHlsMuxer::_refresh_m3u8(int& fd, string m3u8_file)
         0x23, 0x45, 0x58, 0x54, 0x4d, 0x33, 0x55, 0xa, 
         // #EXT-X-VERSION:3\n
         0x23, 0x45, 0x58, 0x54, 0x2d, 0x58, 0x2d, 0x56, 0x45, 0x52, 
-        0x53, 0x49, 0x4f, 0x4e, 0x3a, 0x33, 0xa
+        0x53, 0x49, 0x4f, 0x4e, 0x3a, 0x33, 0xa,
+        // #EXT-X-ALLOW-CACHE:NO
+        0x23, 0x45, 0x58, 0x54, 0x2d, 0x58, 0x2d, 0x41, 0x4c, 0x4c, 
+        0x4f, 0x57, 0x2d, 0x43, 0x41, 0x43, 0x48, 0x45, 0x3a, 0x4e, 0x4f, 0x0a
     };
     if (::write(fd, header, sizeof(header)) != sizeof(header)) {
         ret = ERROR_HLS_WRITE_FAILED;