narayana/go-xmpp
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #13 from hypafrag/xml_charset_reader_support

Browse source 
added charsets support
This commit is contained in:
Mickaël Rémond 2019-01-17 12:03:37 +01:00 committed by GitHub
parent 140d3b4d95 3a51dce786
commit b030e8dd4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config.go
View file

@ -1,6 +1,9 @@
package xmpp // import "gosrc.io/xmpp" package xmpp // import "gosrc.io/xmpp"
import "os" import (
"io"
"os"
)
type Config struct { type Config struct {
Address string Address string
@ -12,4 +15,5 @@ type Config struct {
Retry int // Number of retries for connect Retry int // Number of retries for connect
ConnectTimeout int // Connection timeout in seconds. Default to 15 ConnectTimeout int // Connection timeout in seconds. Default to 15
Insecure bool // set to true to allow comms without TLS Insecure bool // set to true to allow comms without TLS
CharsetReader func(charset string, input io.Reader) (io.Reader, error) // passed to xml decoder
} }

1
session.go
View file

@ -82,6 +82,7 @@ func (s *Session) setProxy(conn net.Conn, newConn net.Conn, o Config) {
s.socketProxy = newSocketProxy(newConn, o.PacketLogger) s.socketProxy = newSocketProxy(newConn, o.PacketLogger)
} }
s.decoder = xml.NewDecoder(s.socketProxy) s.decoder = xml.NewDecoder(s.socketProxy)
s.decoder.CharsetReader = o.CharsetReader
} }
func (s *Session) open(domain string) (f streamFeatures) { func (s *Session) open(domain string) (f streamFeatures) {