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

for bug #200, deadloop when read/write 0 and ETIME. 2.0.16.

Browse source
This commit is contained in:
winlin 2014-11-13 14:30:56 +08:00
parent 77cf885d8c
commit 0bc35e093c
6 changed files with 42 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -534,10 +534,6 @@ int SrsRtmpConn::playing(SrsSource* source)
// it's ok, do nothing.
ret = ERROR_SUCCESS;
srs_verbose("recv timeout, ignore. ret=%d", ret);
// TODO: FIXME: the timeout may caused some dead loop.
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/161
st_usleep(0);
} else if (ret != ERROR_SUCCESS) {
if (!srs_is_client_gracefully_close(ret)) {
srs_error("recv client control message failed. ret=%d", ret);