summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-07-20 21:18:55 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-07-20 21:18:55 -0400
commitc3c525ab804dd11b97db8705143f4b4070c983ee (patch)
tree1bd8c5b7979a8aab2f931a45ef7094f3699b7f7b /debian
parenta65235e41846e895b72e5bdaad2859e99113a4c8 (diff)
When an XMPP server has SRV records, try them, but don't then fall back to the regular host if they all fail.
gmail.com has some XMPP SRV records, but does not itself respond to XMPP traffic, although it does accept connections on port 5222. So if a user entered the wrong password, it would try all the SRVs and fall back to trying gmail, and hang at that point. This seems the right thing to do, not just a workaround.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a0e4283e7..d78f1a599 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ git-annex (4.20130710) UNRELEASED; urgency=low
* Bug fix: Adding files that contained a tarball of a git-annex repository,
or other content in the first line that looks like a git-annex link,
could cause git-annex add to malfunction and lose the file content.
+ * When an XMPP server has SRV records, try them, but don't then fall
+ back to the regular host if they all fail.
-- Joey Hess <joeyh@debian.org> Tue, 09 Jul 2013 19:17:13 -0400