From 31633cfbdec64f43aff8881d92a647532d8f4ae4 Mon Sep 17 00:00:00 2001 From: Jon Kristensen Date: Fri, 6 Jul 2012 17:02:45 +0200 Subject: [PATCH] remove any expectations for received xml:lang tag the way i understand rfc 6120, clients will not have any assumptions about the received xml:lang tag --- source/Network/Xmpp/Stream.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/Network/Xmpp/Stream.hs b/source/Network/Xmpp/Stream.hs index 98c6e52..a20494a 100644 --- a/source/Network/Xmpp/Stream.hs +++ b/source/Network/Xmpp/Stream.hs @@ -120,11 +120,10 @@ xmppStream expectedTo = do Right r -> validateData r validateData (_, _, _, _, Nothing) = throwError $ StreamWrongLangTag Nothing - validateData (ver, from, to, i, Just lang) + validateData (ver, from, to, i, lang) | ver /= "1.0" = throwError $ StreamWrongVersion (Just ver) | isJust to && to /= expectedTo = throwError $ StreamWrongTo (Text.pack . show <$> to) --- | lang /= expectedLang = throwError $ StreamWrongLangTag lang - | otherwise = return (from, to, i, lang) + | otherwise = return (from, to, i, fromJust lang) xmppStreamFeatures :: StreamSink ServerFeatures xmppStreamFeatures = do e <- lift $ elements =$ CL.head