From d07f09aa0b5930cf60293a1eff8d55d3966fe812 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 11 Feb 2015 12:28:48 +0800
Subject: [PATCH 1/2] Update README.md

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

diff --git a/README.md b/README.md
index 790aa70cd..43ac54b24 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 #Simple-RTMP-Server
 
+SRS/1.0，开发代号：[HuKaiqun](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product#release10)
+
 SRS定位是运营级的互联网直播服务器集群，追求更好的概念完整性和最简单实现的代码。
 
 下载发布版(github): 

From ccc30c70c4b866ea017d9f83f8b7202994434f05 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 17 Feb 2015 21:01:44 +0800
Subject: [PATCH 2/2] the join maybe failed, should use a variable to ensure
 thread terminated. 1.0.28.

---
 README.md                        | 1 +
 trunk/src/app/srs_app_thread.cpp | 4 +++-
 trunk/src/core/srs_core.hpp      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6964e43ef..2f1bf6958 100755
--- a/README.md
+++ b/README.md
@@ -388,6 +388,7 @@ Supported operating systems and hardware:
 
 ## History
 
+* v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
 * <strong>v1.0, 2015-02-12, [1.0r2 release(1.0.27)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r2) released. 59507 lines.</strong>
 * v1.0, 2015-02-11, dev code HuKaiqun for 1.0.27.
 * v1.0, 2015-02-10, for [#310](https://github.com/winlinvip/simple-rtmp-server/issues/310), the aac profile must be object plus one. 1.0.26
diff --git a/trunk/src/app/srs_app_thread.cpp b/trunk/src/app/srs_app_thread.cpp
index bc18333f0..4785d6987 100644
--- a/trunk/src/app/srs_app_thread.cpp
+++ b/trunk/src/app/srs_app_thread.cpp
@@ -120,7 +120,9 @@ void SrsThread::stop()
         st_thread_interrupt(tid);
         
         // wait the thread to exit.
-        st_thread_join(tid, NULL);
+        int ret = st_thread_join(tid, NULL);
+        // TODO: FIXME: the join maybe failed, should use a variable to ensure thread terminated.
+        srs_assert(ret == 0);
         
         tid = NULL;
     }
diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index 6109a6454..89e2f8071 100644
--- a/trunk/src/core/srs_core.hpp
+++ b/trunk/src/core/srs_core.hpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR       1
 #define VERSION_MINOR       0
-#define VERSION_REVISION    27
+#define VERSION_REVISION    28
 
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"