正在显示
2 个修改的文件
包含
4 行增加
和
15 行删除
| @@ -385,23 +385,12 @@ void SrsServer::destroy() | @@ -385,23 +385,12 @@ void SrsServer::destroy() | ||
| 385 | srs_freep(signal_manager); | 385 | srs_freep(signal_manager); |
| 386 | srs_freep(kbps); | 386 | srs_freep(kbps); |
| 387 | 387 | ||
| 388 | - // never destroy the connections, for it's still alive. | ||
| 389 | - /*for (std::vector<SrsConnection*>::iterator it = conns.begin(); it != conns.end();) { | ||
| 390 | - SrsConnection* conn = *it; | 388 | + // @remark never destroy the connections, |
| 389 | + // for it's still alive. | ||
| 391 | 390 | ||
| 392 | - // remove the connection, then free it, | ||
| 393 | - // for the free will remove itself from server, | ||
| 394 | - // when erased here, the remove of server will ignore. | ||
| 395 | - it = conns.erase(it); | ||
| 396 | - | ||
| 397 | - srs_freep(conn); | ||
| 398 | - } | ||
| 399 | - conns.clear();*/ | ||
| 400 | - | ||
| 401 | - // never destroy the source, | 391 | + // @remark never destroy the source, |
| 402 | // when we free all sources, the fmle publish may retry | 392 | // when we free all sources, the fmle publish may retry |
| 403 | // and segment fault. | 393 | // and segment fault. |
| 404 | - //SrsSource::destroy(); | ||
| 405 | } | 394 | } |
| 406 | 395 | ||
| 407 | int SrsServer::initialize() | 396 | int SrsServer::initialize() |
| @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 31 | // current release version | 31 | // current release version |
| 32 | #define VERSION_MAJOR "0" | 32 | #define VERSION_MAJOR "0" |
| 33 | #define VERSION_MINOR "9" | 33 | #define VERSION_MINOR "9" |
| 34 | -#define VERSION_REVISION "210" | 34 | +#define VERSION_REVISION "211" |
| 35 | #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION | 35 | #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION |
| 36 | // server info. | 36 | // server info. |
| 37 | #define RTMP_SIG_SRS_KEY "SRS" | 37 | #define RTMP_SIG_SRS_KEY "SRS" |
-
请 注册 或 登录 后发表评论