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

Merge

Browse source
This commit is contained in:
winlin 2021-10-30 12:26:15 +08:00
commit fd7589a286
8 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/src/app/srs_app_forward.cpp
View file

@ -175,6 +175,12 @@ srs_error_t SrsForwarder::cycle()
srs_freep(err);
}
// Never wait if thread error, fast quit.
// @see https://github.com/ossrs/srs/pull/2284
if ((err = trd->pull()) != srs_success) {
return srs_error_wrap(err, "forwarder");
}
srs_usleep(SRS_FORWARDER_CIMS);
}

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

@ -9,6 +9,6 @@
#define VERSION_MAJOR 4
#define VERSION_MINOR 0
#define VERSION_REVISION 187
#define VERSION_REVISION 190
#endif

2
trunk/src/srt/srt_server.cpp
View file

@ -229,7 +229,7 @@ void srt_server::srt_handle_connection(SRT_SOCKSTATUS status, SRTSOCKET input_fd
} else if (srt_conn_ptr->get_mode() == PUSH_SRT_MODE) {
conn_event = SRT_EPOLL_IN | SRT_EPOLL_ERR;
} else {
srt_log_trace("stream mode error, it shoulde be m=push or m=pull, streamid:%s",
srt_log_trace("stream mode error, it should be m=push or m=pull, streamid:%s",
srt_conn_ptr->get_streamid().c_str());
srt_conn_ptr->close();
return;