Merge remote-tracking branch 'origin/pr/140'

Conflicts: pymysql/connections.py
2013-09-23 10:54:19 +09:00
parent 220c81f8de bb303d2426
commit e4ec940318
1 changed files with 1 additions and 0 deletions
--- a/pymysql/connections.py
+++ b/pymysql/connections.py
@@ -747,6 +747,7 @@ class Connection(object):
                sock.settimeout(t)
                self.host_info = "socket %s:%d" % (self.host, self.port)
                if DEBUG: print('connected using socket')
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
            if self.no_delay:
                sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
            self.socket = sock