[Guile-commits] 02/06: simplify reading http headers using updated %read-line

[Mike Gran]

mike121 pushed a commit to branch wip-mingw-guile-2.2
in repository guile.

commit 6d325a7a27bb93299a5b75d3cf017f7ef3eb7048
Author: Michael Gran <address@hidden>
Date:   Tue Apr 17 17:36:55 2018 -0700

    simplify reading http headers using updated %read-line
    
    %read-line can handle CRLF now.
    
    * module/web/http.scm (read-header-line): modified
---
 module/web/http.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/module/web/http.scm b/module/web/http.scm
index de61c94..b3a8f1b 100644
--- a/module/web/http.scm
+++ b/module/web/http.scm
@@ -157,13 +157,12 @@ The default writer will call ‘put-string’."
 Raise a 'bad-header' exception if the line does not end in CRLF or LF,
 or if EOF is reached."
   (match (%read-line port)
+    (((? string? line) . "\r\n")
+     line)
     (((? string? line) . #\newline)
-     ;; '%read-line' does not consider #\return a delimiter; so if it's
-     ;; there, remove it.  We are more tolerant than the RFC in that we
-     ;; tolerate LF-only endings.
-     (if (string-suffix? "\r" line)
-         (string-drop-right line 1)
-         line))
+     ;; We are more tolerant than the RFC in that we tolerate LF-only
+     ;; endings.
+     line)
     ((line . _)                                ;EOF or missing delimiter
      (bad-header 'read-header-line line))))