From f107f404ea3f83656036e6c8d1895fb7dce779ca Mon Sep 17 00:00:00 2001 From: ME_Kun_Han Date: Sat, 5 Nov 2016 10:46:24 +0800 Subject: [PATCH 1/3] fix bug for issues #654 (#426) --- trunk/src/app/srs_app_source.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 trunk/src/app/srs_app_source.cpp diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp old mode 100644 new mode 100755 index bc02eaedd..0f2f18404 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -1036,7 +1036,7 @@ bool SrsSource::expired() } // still publishing? - if (!_can_publish) { + if (!_can_publish || !publish_edge->can_publish()) { return false; } From d8599a56cac36dd7a78f768215bf7e0b156a26fc Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 5 Nov 2016 10:48:49 +0800 Subject: [PATCH 2/3] fix #654, crash when source cleanup for edge. 2.0.221 --- README.md | 1 + trunk/src/core/srs_core.hpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5054b3a75..6b14c1b00 100755 --- a/README.md +++ b/README.md @@ -343,6 +343,7 @@ Remark: ## History +* v2.0, 2016-11-05, fix #654, crash when source cleanup for edge. 2.0.221 * v2.0, 2016-10-26, fix #666, crash when source cleanup for http-flv. 2.0.220 * v2.0, 2016-10-10, fix #661, close fd after thread stopped. 2.0.219 * v2.0, 2016-09-23, support asprocess for oryx. 2.0.218 diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index c11453e31..432e04022 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 220 +#define VERSION_REVISION 221 // generated by configure, only macros. #include From 625ca23739aebae414edcf89447351f7c8f404f5 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 9 Nov 2016 09:43:51 +0800 Subject: [PATCH 3/3] release r2.0b2, 2.0.221 --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6b14c1b00..9a162dc76 100755 --- a/README.md +++ b/README.md @@ -311,6 +311,7 @@ Remark: ## Releases +* 2016-11-09, [Release v2.0-b2][r2.0b2], 2.0 beta2, 2.0.221, 86691 lines. * 2016-09-09, [Release v2.0-b1][r2.0b1], 2.0 beta1, 2.0.215, 89941 lines. * 2016-08-06, [Release v2.0-b0][r2.0b0], 2.0 beta0, 2.0.210, 89704 lines. * 2015-12-23, [Release v2.0-a3][r2.0a3], 2.0 alpha3, 2.0.205, 89544 lines. @@ -343,6 +344,7 @@ Remark: ## History +* v2.0, 2016-11-09, [2.0 beta2(2.0.221)][r2.0b2] released. 86691 lines. * v2.0, 2016-11-05, fix #654, crash when source cleanup for edge. 2.0.221 * v2.0, 2016-10-26, fix #666, crash when source cleanup for http-flv. 2.0.220 * v2.0, 2016-10-10, fix #661, close fd after thread stopped. 2.0.219 @@ -1257,6 +1259,7 @@ Winlin [exo #828]: https://github.com/google/ExoPlayer/pull/828 +[r2.0b2]: https://github.com/ossrs/srs/releases/tag/v2.0-b2 [r2.0b1]: https://github.com/ossrs/srs/releases/tag/v2.0-b1 [r2.0b0]: https://github.com/ossrs/srs/releases/tag/v2.0-b0 [r2.0a3]: https://github.com/ossrs/srs/releases/tag/v2.0-a3 @@ -1297,6 +1300,6 @@ Winlin [branch2]: https://github.com/ossrs/srs/tree/2.0release [release2]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release20 [release3]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release30 -[centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.215.zip -[centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.215.zip +[centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.221.zip +[centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.221.zip