From 08cf9b09f53f999cad569aad9547edf6d2bf819c Mon Sep 17 00:00:00 2001 From: Ryan Kavanagh Date: Mon, 8 Jun 2020 22:04:42 -0400 Subject: Fix parsing errors involving crlf vs eol --- gemini/geminiTransaction.ml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gemini/geminiTransaction.ml') diff --git a/gemini/geminiTransaction.ml b/gemini/geminiTransaction.ml index 29f9ec6..27208b7 100644 --- a/gemini/geminiTransaction.ml +++ b/gemini/geminiTransaction.ml @@ -198,19 +198,19 @@ struct (string "10 " *> return INPUT) <|> (string "11 " *> return SENSITIVE_INPUT) <|> lift2 (fun m -> fun b -> SUCCESS (M.from_string m, b)) - (string "20 " *> take_till_cr) + (string "20 " *> take_till_crlf) (take_while (fun _ -> true) <* end_of_input) <|> lift2 (fun m -> fun b -> SUCCESS_EOCSS (M.from_string m, b)) - (string "21 " *> take_till_cr) + (string "21 " *> take_till_crlf) (take_while (fun _ -> true) <* end_of_input) - <|> lift (fun u -> REDIR_TEMP u) (string "30 " *> take_till_cr) - <|> lift (fun u -> REDIR_PERM u) (string "31 " *> take_till_cr) + <|> lift (fun u -> REDIR_TEMP u) (string "30 " *> take_till_crlf) + <|> lift (fun u -> REDIR_PERM u) (string "31 " *> take_till_crlf) <|> (string "40 " *> return TEMP_FAIL) <|> (string "41 " *> return SERVER_UNAVAILABLE) <|> (string "42 " *> return CGI_ERROR) <|> (string "43 " *> return PROXY_ERROR) <|> lift (fun n -> SLOW_DOWN (int_of_string n)) - (string "44 " *> take_till_cr) + (string "44 " *> take_till_crlf) <|> (string "50 " *> return PERM_FAIL) <|> (string "51 " *> return NOT_FOUND) <|> (string "52 " *> return GONE) -- cgit v1.2.3