Browse Source

fixed stream features unpickle bug that appeared when no stream:features

element was provided by the server
master
Jon Kristensen 14 years ago
parent
commit
e7eff3ea50
  1. 14
      source/Network/Xmpp/Stream.hs

14
source/Network/Xmpp/Stream.hs

@ -110,12 +110,14 @@ pickleStreamFeatures :: PU [Node] ServerFeatures
pickleStreamFeatures = xpWrap pickleStreamFeatures = xpWrap
(\(tls, sasl, rest) -> SF tls (mbl sasl) rest) (\(tls, sasl, rest) -> SF tls (mbl sasl) rest)
(\(SF tls sasl rest) -> (tls, lmb sasl, rest)) (\(SF tls sasl rest) -> (tls, lmb sasl, rest))
(xpElemNodes (Name (xpDefault (Nothing, Nothing, []) -- In case there is no features element.
"features" (Just "http://etherx.jabber.org/streams") (Just "stream")) (xpElemNodes (Name
(xpTriple "features" (Just "http://etherx.jabber.org/streams") (Just "stream"))
(xpOption pickleTLSFeature) (xpTriple
(xpOption pickleSaslFeature) (xpOption pickleTLSFeature)
(xpAll xpElemVerbatim) (xpOption pickleSaslFeature)
(xpAll xpElemVerbatim)
)
) )
) )
where where

Loading…
Cancel
Save