胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
6587c5b2 2 parents 8862ec19 7811b4f3

merge from srs2

内嵌 并排对比
正在显示 2 个修改的文件 包含 2 行增加 和 1 行删除
... ... @@ -1101,6 +1101,7 @@ Winlin
[bug #484]: https://github.com/simple-rtmp-server/srs/issues/484
[bug #485]: https://github.com/simple-rtmp-server/srs/issues/485
[bug #495]: https://github.com/simple-rtmp-server/srs/issues/495
[bug #497]: https://github.com/simple-rtmp-server/srs/issues/497
[bug #475]: https://github.com/simple-rtmp-server/srs/issues/475
[bug #458]: https://github.com/simple-rtmp-server/srs/issues/458
[bug #454]: https://github.com/simple-rtmp-server/srs/issues/454
... ...
... ... @@ -838,7 +838,7 @@ int SrsGoApiClients::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
}
client->conn->expire();
srs_warn("kickoff client id=%d", cid);
srs_warn("kickoff client id=%d ok", cid);
} else {
return srs_go_http_error(w, SRS_CONSTS_HTTP_MethodNotAllowed);
}
... ...