X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FRequest.hs;h=3fc0164ca167de1116504478e0363e6e421de1cb;hb=47206637d664f163316dc9bb20983440ae4b138f;hp=bc1c317ddeea266ff2fa87275c5370a6fc078c81;hpb=858129cb755aa09da2b7bd758efb8519f2c89103;p=Lucu.git diff --git a/Network/HTTP/Lucu/Request.hs b/Network/HTTP/Lucu/Request.hs index bc1c317..3fc0164 100644 --- a/Network/HTTP/Lucu/Request.hs +++ b/Network/HTTP/Lucu/Request.hs @@ -10,8 +10,6 @@ module Network.HTTP.Lucu.Request ) where -import qualified Data.ByteString.Lazy.Char8 as B -import Data.ByteString.Lazy.Char8 (ByteString) import Network.HTTP.Lucu.Headers import Network.HTTP.Lucu.HttpVersion import Network.HTTP.Lucu.Parser @@ -78,7 +76,7 @@ methodP = (let methods = [ ("OPTIONS", OPTIONS) , ("TRACE" , TRACE ) , ("CONNECT", CONNECT) ] - in foldl (<|>) (fail "") $ map (\ (str, mth) + in foldl (<|>) failP $ map (\ (str, mth) -> string str >> return mth) methods) <|> token >>= return . ExtensionMethod @@ -87,5 +85,5 @@ methodP = (let methods = [ ("OPTIONS", OPTIONS) uriP :: Parser URI uriP = do str <- many1 $ satisfy (\ c -> not (isCtl c || c == ' ')) case parseURIReference str of - Nothing -> fail "" + Nothing -> failP Just uri -> return uri \ No newline at end of file