X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Lucu.git;a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FUtils.hs;h=d2541691ced99dd41ac579d146224fa7657a8f7a;hp=abd4556b64930789940b2f89da1e75e5fe6c7ca5;hb=e34910f85f459f049b9e6e6b79db9ef95dfccc13;hpb=c6847797963abde98faf6aa6425c9bebc0e5dfb5 diff --git a/Network/HTTP/Lucu/Utils.hs b/Network/HTTP/Lucu/Utils.hs index abd4556..d254169 100644 --- a/Network/HTTP/Lucu/Utils.hs +++ b/Network/HTTP/Lucu/Utils.hs @@ -67,11 +67,18 @@ quoteStr str = A.toAsciiBuilder "\"" ⊕ -- > ==> [("aaa", "bbb"), ("ccc", "ddd")] parseWWWFormURLEncoded ∷ String → [(String, String)] parseWWWFormURLEncoded src - | src == "" = [] - | otherwise = do pairStr <- splitBy (\ c → c == ';' || c == '&') src - let (key, value) = break (== '=') pairStr - return ( unEscapeString key - , unEscapeString $ case value of - ('=':val) → val - val → val + | null src = [] + | otherwise = do pairStr ← splitBy (\ c → c ≡ ';' ∨ c ≡ '&') src + let (key, value) = break (≡ '=') pairStr + return ( unescape key + , unescape $ case value of + ('=':val) → val + val → val ) + where + unescape ∷ String → String + unescape = unEscapeString ∘ map plusToSpace + + plusToSpace ∷ Char → Char + plusToSpace '+' = ' ' + plusToSpace c = c