external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

donot destroy the source and connections of gmc.

Browse source
This commit is contained in:
winlin 2014-09-10 14:58:19 +08:00
parent 79938f3214
commit 61728118ab
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/app/srs_app_server.cpp
View file

@ -385,7 +385,8 @@ void SrsServer::destroy()
srs_freep(signal_manager); srs_freep(signal_manager);
srs_freep(kbps); srs_freep(kbps);
for (std::vector<SrsConnection*>::iterator it = conns.begin(); it != conns.end();) { // never destroy the connections, for it's still alive.
/*for (std::vector<SrsConnection*>::iterator it = conns.begin(); it != conns.end();) {
SrsConnection* conn = *it; SrsConnection* conn = *it;
// remove the connection, then free it, // remove the connection, then free it,
@ -395,9 +396,12 @@ void SrsServer::destroy()
srs_freep(conn); srs_freep(conn);
} }
conns.clear(); conns.clear();*/
SrsSource::destroy(); // never destroy the source,
// when we free all sources, the fmle publish may retry
// and segment fault.
//SrsSource::destroy();
} }
int SrsServer::initialize() int SrsServer::initialize()