From 7058411cb87aed2af819522e439789fd015b9a95 Mon Sep 17 00:00:00 2001 From: ME_Kun_Han Date: Mon, 10 Oct 2016 11:51:49 +0800 Subject: [PATCH 1/2] fix the core dump when trying to close srs (#386) --- trunk/src/app/srs_app_listener.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) mode change 100644 => 100755 trunk/src/app/srs_app_listener.cpp diff --git a/trunk/src/app/srs_app_listener.cpp b/trunk/src/app/srs_app_listener.cpp old mode 100644 new mode 100755 index c1309e781..d2d853b8b --- a/trunk/src/app/srs_app_listener.cpp +++ b/trunk/src/app/srs_app_listener.cpp @@ -193,15 +193,10 @@ SrsTcpListener::SrsTcpListener(ISrsTcpHandler* h, string i, int p) SrsTcpListener::~SrsTcpListener() { - // close the stfd to trigger thread to interrupted. - srs_close_stfd(_stfd); - pthread->stop(); srs_freep(pthread); - // st does not close it sometimes, - // close it manually. - close(_fd); + srs_close_stfd(_stfd); } int SrsTcpListener::fd() From d6fc289c6a047bdf4648851fa439853ec62b845f Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 10 Oct 2016 11:54:08 +0800 Subject: [PATCH 2/2] fix #661, close fd after thread stopped. 2.0.219 --- 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 de12ce60a..f9fa1df3b 100755 --- a/README.md +++ b/README.md @@ -343,6 +343,7 @@ Remark: ## History +* 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 * v2.0, 2016-09-23, support change work_dir for oryx. * v2.0, 2016-09-15, fix #640, typo for rtmp type. 2.0.217 diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 251968158..054800627 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 218 +#define VERSION_REVISION 219 // generated by configure, only macros. #include