Updates for OSX issues.

[m6w6/libmemcached] / libmemcached / connect.c

diff --git a/libmemcached/connect.c b/libmemcached/connect.c
index cb093d12a1ce5af1fecc0b5050e9d32877a830bc..125d7b0ab1b4adc842492284a3d11b67d755a1f3 100644 (file)
--- a/libmemcached/connect.c
+++ b/libmemcached/connect.c
@@ -105,6 +105,19 @@ static memcached_return_t set_socket_options(memcached_server_st *ptr)
   }
 #endif
 
+
+  {
+    int set = 1;
+    int error= setsockopt(ptr->fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&set, sizeof(int));
+
+    // This is not considered a fatal error
+    if (error == -1)
+    {
+      WATCHPOINT_ERRNO(errno);
+      perror("setsockopt(SO_NOSIGPIPE)");
+    }
+  }
+
   if (ptr->root->flags.no_block)
   {
     int error;
@@ -244,6 +257,7 @@ test_connect:
   }
 
   WATCHPOINT_ASSERT(ptr->fd != -1);
+
   return MEMCACHED_SUCCESS;
 }