From 639f9cf96639db27bc0cf5ea11d44e1ecb46f56d Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Wed, 8 Nov 2017 23:04:23 +0100
Subject: [PATCH] Update vendor/github.com/mattn/go-xmpp
---
vendor/github.com/mattn/go-xmpp/xmpp.go | 8 +++++---
vendor/github.com/mattn/go-xmpp/xmpp_muc.go | 3 ++-
vendor/manifest | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/vendor/github.com/mattn/go-xmpp/xmpp.go b/vendor/github.com/mattn/go-xmpp/xmpp.go
index 84c4ad41..6af9a3ed 100644
--- a/vendor/github.com/mattn/go-xmpp/xmpp.go
+++ b/vendor/github.com/mattn/go-xmpp/xmpp.go
@@ -191,7 +191,9 @@ func (o Options) NewClient() (*Client, error) {
tlsconn = tls.Client(c, o.TLSConfig)
} else {
DefaultConfig.ServerName = host
- tlsconn = tls.Client(c, &DefaultConfig)
+ newconfig := DefaultConfig
+ newconfig.ServerName = host
+ tlsconn = tls.Client(c, &newconfig)
}
if err = tlsconn.Handshake(); err != nil {
return nil, err
@@ -635,7 +637,7 @@ func (c *Client) SendPresence(presence Presence) (n int, err error) {
// SendKeepAlive sends a "whitespace keepalive" as described in chapter 4.6.1 of RFC6120.
func (c *Client) SendKeepAlive() (n int, err error) {
- return fmt.Fprintf(c.conn," ")
+ return fmt.Fprintf(c.conn, " ")
}
// SendHtml sends the message as HTML as defined by XEP-0071
@@ -831,7 +833,7 @@ type rosterItem struct {
func nextStart(p *xml.Decoder) (xml.StartElement, error) {
for {
t, err := p.Token()
- if err != nil && err != io.EOF || t == nil {
+ if err != nil || t == nil {
return xml.StartElement{}, err
}
switch t := t.(type) {
diff --git a/vendor/github.com/mattn/go-xmpp/xmpp_muc.go b/vendor/github.com/mattn/go-xmpp/xmpp_muc.go
index f88f1b67..7b50c128 100644
--- a/vendor/github.com/mattn/go-xmpp/xmpp_muc.go
+++ b/vendor/github.com/mattn/go-xmpp/xmpp_muc.go
@@ -90,7 +90,8 @@ func (c *Client) JoinProtectedMUC(jid, nick string, password string, history_typ
case NoHistory:
return fmt.Fprintf(c.conn, "<presence to='%s/%s'>\n" +
"<x xmlns='%s'>\n" +
- "<password>%s</password>\n"+
+ "<password>%s</password>" +
+ "</x>\n" +
"</presence>",
xmlEscape(jid), xmlEscape(nick), nsMUC, xmlEscape(password))
case CharHistory:
diff --git a/vendor/manifest b/vendor/manifest
index c6981eb2..dd4a7707 100644
--- a/vendor/manifest
+++ b/vendor/manifest
@@ -412,7 +412,7 @@
"importpath": "github.com/mattn/go-xmpp",
"repository": "https://github.com/mattn/go-xmpp",
"vcs": "git",
- "revision": "16b6a7bdba1ca30969b5db9362b6605e43302daa",
+ "revision": "d0cdb99fae16437f69616ccc40662b6fe8ac6d47",
"branch": "master",
"notests": true
},