From e3aa34ec5f5682add4d72df1d9ba4c26df1b9769 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 11 Jan 2017 09:25:48 +0800
Subject: [PATCH] fix #736, recovery the hls dispose. 2.0.227

---
 README.md                        |  1 +
 trunk/src/app/srs_app_source.cpp | 15 ++++++++++-----
 trunk/src/core/srs_core.hpp      |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ddb3bb28b..08d2b4668 100755
--- a/README.md
+++ b/README.md
@@ -345,6 +345,7 @@ Remark:
 
 ## History
 
+* v2.0, 2017-01-11, fix [#736][bug #736], recovery the hls dispose. 2.0.227
 * v2.0, 2017-01-10, refine hls html5 video template.
 * v2.0, 2017-01-10, fix [#635][bug #635], hls support NonIDR(open gop). 2.0.226
 * v2.0, 2017-01-06, for [#730][bug #730], reset ack follow flash player rules. 2.0.225
diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp
index 4b45347b8..8b495546b 100755
--- a/trunk/src/app/srs_app_source.cpp
+++ b/trunk/src/app/srs_app_source.cpp
@@ -794,14 +794,9 @@ int SrsSource::cycle_all()
 {
     int ret = ERROR_SUCCESS;
     
-    // TODO: FIXME: support source cleanup.
-    // @see https://github.com/ossrs/srs/issues/713
-    // @see https://github.com/ossrs/srs/issues/714
-#if 0
     int cid = _srs_context->get_id();
     ret = do_cycle_all();
     _srs_context->set_id(cid);
-#endif
     
     return ret;
 }
@@ -813,10 +808,17 @@ int SrsSource::do_cycle_all()
     std::map<std::string, SrsSource*>::iterator it;
     for (it = pool.begin(); it != pool.end();) {
         SrsSource* source = it->second;
+        
+        // Do cycle source to cleanup components, such as hls dispose.
         if ((ret = source->cycle()) != ERROR_SUCCESS) {
             return ret;
         }
         
+        // TODO: FIXME: support source cleanup.
+        // @see https://github.com/ossrs/srs/issues/713
+        // @see https://github.com/ossrs/srs/issues/714
+#if 0
+        // When source expired, remove it.
         if (source->expired()) {
             int cid = source->source_id();
             if (cid == -1 && source->pre_source_id() > 0) {
@@ -832,6 +834,9 @@ int SrsSource::do_cycle_all()
         } else {
             ++it;
         }
+#else
+        ++it;
+#endif
     }
     
     return ret;
diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index cb1d5aac6..893f94c7a 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       2
 #define VERSION_MINOR       0
-#define VERSION_REVISION    226
+#define VERSION_REVISION    227
 
 // generated by configure, only macros.
 #include <srs_auto_headers.hpp>