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

fix the bug for gmc. 0.9.211

Browse source
This commit is contained in:
winlin 2014-09-10 14:59:20 +08:00
parent 61728118ab
commit 9dd0939327
2 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -385,23 +385,12 @@ void SrsServer::destroy()
srs_freep(signal_manager); srs_freep(signal_manager);
srs_freep(kbps); srs_freep(kbps);
// never destroy the connections, for it's still alive. // @remark never destroy the connections,
/*for (std::vector<SrsConnection*>::iterator it = conns.begin(); it != conns.end();) { // for it's still alive.
SrsConnection* conn = *it;
// remove the connection, then free it, // @remark never destroy the source,
// for the free will remove itself from server,
// when erased here, the remove of server will ignore.
it = conns.erase(it);
srs_freep(conn);
}
conns.clear();*/
// never destroy the source,
// when we free all sources, the fmle publish may retry // when we free all sources, the fmle publish may retry
// and segment fault. // and segment fault.
//SrsSource::destroy();
} }
int SrsServer::initialize() int SrsServer::initialize()

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR "0" #define VERSION_MAJOR "0"
#define VERSION_MINOR "9" #define VERSION_MINOR "9"
#define VERSION_REVISION "210" #define VERSION_REVISION "211"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"