正在显示
3 个修改的文件
包含
11 行增加
和
2 行删除
| @@ -344,6 +344,7 @@ Remark: | @@ -344,6 +344,7 @@ Remark: | ||
| 344 | 344 | ||
| 345 | ## History | 345 | ## History |
| 346 | 346 | ||
| 347 | +* v2.0, 2016-12-13, fix #713, disable the source cleanup. 2.0.223 | ||
| 347 | * v2.0, 2016-12-13, fix #713, refine source to avoid critical fetch and create. 2.0.222 | 348 | * v2.0, 2016-12-13, fix #713, refine source to avoid critical fetch and create. 2.0.222 |
| 348 | * <strong>v2.0, 2016-11-09, [2.0 beta2(2.0.221)][r2.0b2] released. 86691 lines.</strong> | 349 | * <strong>v2.0, 2016-11-09, [2.0 beta2(2.0.221)][r2.0b2] released. 86691 lines.</strong> |
| 349 | * v2.0, 2016-11-05, fix #654, crash when source cleanup for edge. 2.0.221 | 350 | * v2.0, 2016-11-05, fix #654, crash when source cleanup for edge. 2.0.221 |
| @@ -792,9 +792,17 @@ void SrsSource::dispose_all() | @@ -792,9 +792,17 @@ void SrsSource::dispose_all() | ||
| 792 | 792 | ||
| 793 | int SrsSource::cycle_all() | 793 | int SrsSource::cycle_all() |
| 794 | { | 794 | { |
| 795 | + int ret = ERROR_SUCCESS; | ||
| 796 | + | ||
| 797 | + // TODO: FIXME: support source cleanup. | ||
| 798 | + // @see https://github.com/ossrs/srs/issues/713 | ||
| 799 | + // @see https://github.com/ossrs/srs/issues/714 | ||
| 800 | +#if 0 | ||
| 795 | int cid = _srs_context->get_id(); | 801 | int cid = _srs_context->get_id(); |
| 796 | - int ret = do_cycle_all(); | 802 | + ret = do_cycle_all(); |
| 797 | _srs_context->set_id(cid); | 803 | _srs_context->set_id(cid); |
| 804 | +#endif | ||
| 805 | + | ||
| 798 | return ret; | 806 | return ret; |
| 799 | } | 807 | } |
| 800 | 808 |
| @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 31 | // current release version | 31 | // current release version |
| 32 | #define VERSION_MAJOR 2 | 32 | #define VERSION_MAJOR 2 |
| 33 | #define VERSION_MINOR 0 | 33 | #define VERSION_MINOR 0 |
| 34 | -#define VERSION_REVISION 221 | 34 | +#define VERSION_REVISION 223 |
| 35 | 35 | ||
| 36 | // generated by configure, only macros. | 36 | // generated by configure, only macros. |
| 37 | #include <srs_auto_headers.hpp> | 37 | #include <srs_auto_headers.hpp> |
-
请 注册 或 登录 后发表评论