From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 15 Sep 2015 16:24:43 +0000 (+0200)
Subject: Don't set SO_KEEPALIVE on the socket.
X-Git-Url: https://git.g-eek.se/?a=commitdiff_plain;h=40864537f86e31e037a1232f015a06e9d73bf1e6;p=interimap.git

Don't set SO_KEEPALIVE on the socket.

This is most likely useless in our case since the TCP keepalive time is
usually much higher than the IMAP timeout.
---

diff --git a/Changelog b/Changelog
index 67f6833..cf11878 100644
--- a/Changelog
+++ b/Changelog
@@ -13,7 +13,7 @@ interimap (0.2) upstream;
     handshake.
   * Rename the 'SSL_verify_trusted_peer', 'SSL_ca_path', and
     'SSL_cipher_list' options to 'SSL_CApath', 'SSL_verify' and
-	'SSL_cipherlist', respectively.
+    'SSL_cipherlist', respectively.
   * Add an option 'SSL_CAfile' to specify a file containing trusted
     certificates to use during server certificate authentication.
   * Replace IO::Socket::SSL dependency by the lower level Net::SSLeay.
@@ -22,6 +22,9 @@ interimap (0.2) upstream;
     IPv6.  (Both are core Perl module.)
   * Add a configuration option 'proxy' to proxy TCP connections to the
     IMAP server.
+  * Don't set SO_KEEPALIVE on the socket.  This is most likely useless
+    in our case since the TCP keepalive time is usually much higher than
+    the IMAP timeout.
 
  -- Guilhem Moulin <guilhem@guilhem.org>  Wed, 09 Sep 2015 00:44:35 +0200
 
diff --git a/lib/Net/IMAP/InterIMAP.pm b/lib/Net/IMAP/InterIMAP.pm
index a761614..a0be91e 100644
--- a/lib/Net/IMAP/InterIMAP.pm
+++ b/lib/Net/IMAP/InterIMAP.pm
@@ -26,7 +26,7 @@ use IO::Select ();
 use Net::SSLeay ();
 use List::Util 'first';
 use POSIX ':signal_h';
-use Socket qw/SOL_SOCKET SO_KEEPALIVE SOCK_STREAM IPPROTO_TCP AF_INET AF_INET6 SOCK_RAW :addrinfo/;
+use Socket qw/SOCK_STREAM IPPROTO_TCP AF_INET AF_INET6 SOCK_RAW :addrinfo/;
 
 use Exporter 'import';
 BEGIN {
@@ -289,7 +289,6 @@ sub new($%) {
         }
         my $socket = defined $self->{proxy} ? $self->_proxify(@$self{qw/proxy host port/})
                                             : $self->_tcp_connect(@$self{qw/host port/});
-        setsockopt($socket, SOL_SOCKET, SO_KEEPALIVE, 1) or $self->fail("Can't setsockopt SO_KEEPALIVE: $!");
 
         $self->_start_ssl($socket) if $self->{type} eq 'imaps';
         $self->{$_} = $socket for qw/STDOUT STDIN/;