diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index a8bbe3c95..059ed7c75 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -385,23 +385,12 @@ void SrsServer::destroy() srs_freep(signal_manager); srs_freep(kbps); - // never destroy the connections, for it's still alive. - /*for (std::vector::iterator it = conns.begin(); it != conns.end();) { - SrsConnection* conn = *it; + // @remark never destroy the connections, + // for it's still alive. - // remove the connection, then free it, - // 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, + // @remark never destroy the source, // when we free all sources, the fmle publish may retry // and segment fault. - //SrsSource::destroy(); } int SrsServer::initialize() diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index cfcea2b12..08c9f7680 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 "0" #define VERSION_MINOR "9" -#define VERSION_REVISION "210" +#define VERSION_REVISION "211" #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION // server info. #define RTMP_SIG_SRS_KEY "SRS"