(original) (raw)

changeset: 91136:d8e0fca7cbe3 user: R David Murray rdmurray@bitdance.com date: Wed Jun 11 15:17:50 2014 -0400 files: Lib/smtpd.py description: #14758: Need to specify the desired socket type in the getaddrinfo call. This worked by accident on Linux because the SOCK_STREAM was returned first, but on the FreeBSD the SOCK_DGRAM is first in the list. diff -r 0d61a2a50f9f -r d8e0fca7cbe3 Lib/smtpd.py --- a/Lib/smtpd.py Wed Jun 11 14:40:13 2014 -0400 +++ b/Lib/smtpd.py Wed Jun 11 15:17:50 2014 -0400 @@ -610,7 +610,8 @@ self._decode_data = decode_data asyncore.dispatcher.__init__(self, map=map) try: - gai_results = socket.getaddrinfo(*localaddr) + gai_results = socket.getaddrinfo(*localaddr, + type=socket.SOCK_STREAM) self.create_socket(gai_results[0][0], gai_results[0][1]) # try to re-use a server port if possible self.set_reuse_addr() /rdmurray@bitdance.com