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 #1045, for #1044, TCP connection alive detection. 2.0.245

Browse source
This commit is contained in:
winlin 2018-01-07 17:18:43 +08:00
parent a6871052af
commit 911cd448f1
4 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_listener.cpp
View file

@ -223,7 +223,7 @@ int SrsTcpListener::listen()
}
srs_verbose("setsockopt reuse-addr success. port=%d, fd=%d", port, _fd);
#ifdef SO_KEEPALIVE
#ifdef SRS_PERF_SO_KEEPALIVE
int tcp_keepalive = 1;
if (setsockopt(_fd, SOL_SOCKET, SO_KEEPALIVE, &tcp_keepalive, sizeof(int)) == -1) {
ret = ERROR_SOCKET_SETKEEPALIVE;

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

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 244
#define VERSION_REVISION 245
// generated by configure, only macros.
#include <srs_auto_headers.hpp>

4
trunk/src/core/srs_core_performance.hpp
View file

@ -188,5 +188,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#undef SRS_PERF_FAST_FLV_ENCODER
#define SRS_PERF_FAST_FLV_ENCODER
// Whether set SO_KEEPALIVE for TCP connection.
// @see https://github.com/ossrs/srs/issues/1044
#undef SRS_PERF_SO_KEEPALIVE
#endif