From 07ab8271b6880671c8a635953e702ea2ae7a06cb Mon Sep 17 00:00:00 2001 From: Palana Date: Thu, 24 Apr 2014 23:50:40 +0200 Subject: [PATCH] Remove setsockopt for SIGPIPE; disable SIGPIPE via signal() on non-WIN32 --- obs/obs-app.cpp | 6 ++++++ plugins/obs-outputs/librtmp/rtmp.c | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/obs/obs-app.cpp b/obs/obs-app.cpp index 456a3f73f..dd41d6c20 100644 --- a/obs/obs-app.cpp +++ b/obs/obs-app.cpp @@ -31,6 +31,8 @@ #ifdef _WIN32 #include #include +#else +#include #endif using namespace std; @@ -217,6 +219,10 @@ struct NoFocusFrameStyle : QProxyStyle int main(int argc, char *argv[]) { +#ifndef WIN32 + signal(SIGPIPE, SIG_IGN); +#endif + int ret = -1; QCoreApplication::addLibraryPath("."); #ifdef _WIN32 diff --git a/plugins/obs-outputs/librtmp/rtmp.c b/plugins/obs-outputs/librtmp/rtmp.c index 896c43eba..c153c6e64 100644 --- a/plugins/obs-outputs/librtmp/rtmp.c +++ b/plugins/obs-outputs/librtmp/rtmp.c @@ -1220,8 +1220,6 @@ RTMP_Connect0(RTMP *r, struct sockaddr * service) } } - setsockopt(r->m_sb.sb_socket, SOL_SOCKET, SO_NOSIGPIPE, (char *) &on, sizeof(on)); - if(!r->m_bUseNagle) setsockopt(r->m_sb.sb_socket, IPPROTO_TCP, TCP_NODELAY, (char *) &on, sizeof(on)); -- GitLab