# HG changeset patch # User "" <;> # Date 1228211902 -3600 # Branch trunk # Node ID 15f11caece7eb681e162b81c7fe94618d9ad386b # Parent ee1a524888f12a9174e750716bcdf669bc0d334d Shutdown sockets before closing them. diff --git a/Lib/poplib.py b/Lib/poplib.py --- a/Lib/poplib.py +++ b/Lib/poplib.py @@ -252,6 +252,7 @@ except error_proto, val: resp = val self.file.close() + self.sock.shutdown(socket.SHUT_RDWR) self.sock.close() del self.file, self.sock return resp @@ -363,6 +364,7 @@ self.sock.connect(sa) except socket.error, msg: if self.sock: + self.sock.shutdown(socket.SHUT_RDWR) self.sock.close() self.sock = None continue @@ -415,6 +417,7 @@ resp = self._shortcmd('QUIT') except error_proto, val: resp = val + self.sock.shutdown(socket.SHUT_RDWR) self.sock.close() del self.sslobj, self.sock return resp