From: Adam Dickmeiss Date: Tue, 19 Feb 2002 20:02:40 +0000 (+0000) Subject: Ignore SIGPIPE on systems that cannot prevent signal on send (Solaris) X-Git-Tag: YAZ.1.8.6~50 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=840a4ec014e70059d147b4ded3548df191c79687;p=yaz-moved-to-github.git Ignore SIGPIPE on systems that cannot prevent signal on send (Solaris) --- diff --git a/comstack/tcpip.c b/comstack/tcpip.c index 311b6e2..dac5b2a 100644 --- a/comstack/tcpip.c +++ b/comstack/tcpip.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2002, Index Data * See the file LICENSE for details. * - * $Id: tcpip.c,v 1.45 2002-01-21 21:50:32 adam Exp $ + * $Id: tcpip.c,v 1.46 2002-02-19 20:02:40 adam Exp $ */ #include @@ -13,6 +13,7 @@ #endif #include #include +#include #if HAVE_OPENSSL_SSL_H #include #include @@ -125,10 +126,17 @@ COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp) #ifdef WIN32 if (!(p->blocking = blocking) && ioctlsocket(s, FIONBIO, &tru) < 0) + return 0; #else - if (!(p->blocking = blocking) && fcntl(s, F_SETFL, O_NONBLOCK) < 0) + if (!(p->blocking = blocking)) + { + if (fcntl(s, F_SETFL, O_NONBLOCK) < 0) + return 0; +#ifndef MSG_NOSIGNAL + signal (SIGPIPE, SIG_IGN); +#endif + } #endif - return 0; p->io_pending = 0; p->iofile = s;