jshiffer/matterbridge
1
0
Fork 1
mirror of https://github.com/42wim/matterbridge.git synced 2024-11-21 10:12:00 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update vendor/github.com/mattn/go-xmpp

Browse Source
This commit is contained in:
Wim 2017-11-08 23:04:23 +01:00
parent 4fc48b5aa4
commit 639f9cf966
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vendor/github.com/mattn/go-xmpp/xmpp.go generated vendored
View File

@ -191,7 +191,9 @@ func (o Options) NewClient() (*Client, error) {
tlsconn = tls.Client(c, o.TLSConfig) tlsconn = tls.Client(c, o.TLSConfig)
} else { } else {
DefaultConfig.ServerName = host DefaultConfig.ServerName = host
tlsconn = tls.Client(c, &DefaultConfig) newconfig := DefaultConfig
newconfig.ServerName = host
tlsconn = tls.Client(c, &newconfig)
} }
if err = tlsconn.Handshake(); err != nil { if err = tlsconn.Handshake(); err != nil {
return nil, err 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. // SendKeepAlive sends a "whitespace keepalive" as described in chapter 4.6.1 of RFC6120.
func (c *Client) SendKeepAlive() (n int, err error) { 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 // 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) { func nextStart(p *xml.Decoder) (xml.StartElement, error) {
for { for {
t, err := p.Token() t, err := p.Token()
if err != nil && err != io.EOF || t == nil { if err != nil || t == nil {
return xml.StartElement{}, err return xml.StartElement{}, err
} }
switch t := t.(type) { switch t := t.(type) {

3
vendor/github.com/mattn/go-xmpp/xmpp_muc.go generated vendored
View File

@ -90,7 +90,8 @@ func (c *Client) JoinProtectedMUC(jid, nick string, password string, history_typ
case NoHistory: case NoHistory:
return fmt.Fprintf(c.conn, "<presence to='%s/%s'>\n" + return fmt.Fprintf(c.conn, "<presence to='%s/%s'>\n" +
"<x xmlns='%s'>\n" + "<x xmlns='%s'>\n" +
"<password>%s</password>\n"+ "<password>%s</password>" +
"</x>\n" +
"</presence>", "</presence>",
xmlEscape(jid), xmlEscape(nick), nsMUC, xmlEscape(password)) xmlEscape(jid), xmlEscape(nick), nsMUC, xmlEscape(password))
case CharHistory: case CharHistory:

2
vendor/manifest vendored
View File

@ -412,7 +412,7 @@
"importpath": "github.com/mattn/go-xmpp", "importpath": "github.com/mattn/go-xmpp",
"repository": "https://github.com/mattn/go-xmpp", "repository": "https://github.com/mattn/go-xmpp",
"vcs": "git", "vcs": "git",
"revision": "16b6a7bdba1ca30969b5db9362b6605e43302daa", "revision": "d0cdb99fae16437f69616ccc40662b6fe8ac6d47",
"branch": "master", "branch": "master",
"notests": true "notests": true
}, },