diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-06-20 19:45:11 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-06-20 19:45:11 -0700 |
| commit | 32345969742042aeb92f7b1d06c7ccde1ce12209 (patch) | |
| tree | c07f67313ade5f54e3bbca53fd250b5ecda280b3 /sleekxmpp/xmlstream/xmlstream.py | |
| parent | 5820d49cd401a1362a8a675c4b91935adb1240fe (diff) | |
| parent | e86444e5fb731c45cfebeaf54951d916c23d88ec (diff) | |
| download | slixmpp-32345969742042aeb92f7b1d06c7ccde1ce12209.tar.gz slixmpp-32345969742042aeb92f7b1d06c7ccde1ce12209.tar.bz2 slixmpp-32345969742042aeb92f7b1d06c7ccde1ce12209.tar.xz slixmpp-32345969742042aeb92f7b1d06c7ccde1ce12209.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 4e7b4050..a1b6ccd6 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -1018,7 +1018,8 @@ class XMLStream(object): self.configure_dns(resolver, domain=domain, port=port) return resolve(domain, port, service=self.dns_service, - resolver=resolver) + resolver=resolver, + use_ipv6=self.use_ipv6) def pick_dns_answer(self, domain, port=None): """Pick a server and port from DNS answers. |