fix #713, disable the source cleanup. 2.0.223

ossrs · Dec 13, 2016 · aca8a79 · aca8a79
1 parent cb1d47b
commit aca8a79
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -344,6 +344,7 @@ Remark:
 
 ## History
 
+* v2.0, 2016-12-13, fix #713, disable the source cleanup. 2.0.223
 * v2.0, 2016-12-13, fix #713, refine source to avoid critical fetch and create. 2.0.222
 * <strong>v2.0, 2016-11-09, [2.0 beta2(2.0.221)][r2.0b2] released. 86691 lines.</strong>
 * v2.0, 2016-11-05, fix #654, crash when source cleanup for edge. 2.0.221

diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp
@@ -792,9 +792,17 @@ void SrsSource::dispose_all()
 
 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();
-    int ret = do_cycle_all();
+    ret = do_cycle_all();
     _srs_context->set_id(cid);
+#endif
+
     return ret;
 }
 

diff --git 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    221
+#define VERSION_REVISION    223
 
 // generated by configure, only macros.
 #include <srs_auto_headers.hpp>