[PATCH 1/2] web: Handle ending CRLF (\r\n) for chunked input and output ports.

[Christopher Baines]

The chunked transfer encoding specifies the chunked body ends with
CRLF. This is in addition to the CRLF at the end of the last chunk, so
there should be CRLF twice at the end of the chunked body:

  https://datatracker.ietf.org/doc/html/rfc2616#section-3.6.1

* module/web/http.scm (make-chunked-input-port): Read two extra bytes at
the end of the chunked input.
(make-chunked-output-port): Write the missing \r\n when closing the
port.
* test-suite/tests/web-http.test (chunked encoding): Add missing \r\n to
test data.
---
 module/web/http.scm            | 3 ++-
 test-suite/tests/web-http.test | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/web/http.scm b/module/web/http.scm
index 4276e1744..163c52176 100644
--- a/module/web/http.scm
+++ b/module/web/http.scm
@@ -1977,6 +1977,7 @@ closed it will also close PORT, unless the KEEP-ALIVE? is 
true."
                (cond
                 ((zero? size)
                  (set! finished? #t)
+                 (get-bytevector-n port 2) ; \r\n follows the last chunk
                  num-read)
                 (else
                  (loop to-read num-read)))))
@@ -2031,7 +2032,7 @@ KEEP-ALIVE? is true."
         (put-string port "\r\n"))))
   (define (close)
     (flush)
-    (put-string port "0\r\n")
+    (put-string port "0\r\n\r\n")
     (force-output port)
     (unless keep-alive?
       (close-port port)))
diff --git a/test-suite/tests/web-http.test b/test-suite/tests/web-http.test
index 63377349c..86fbc0e1a 100644
--- a/test-suite/tests/web-http.test
+++ b/test-suite/tests/web-http.test
@@ -421,7 +421,7 @@
                  '((basic (realm . "guile")))))
 
 (with-test-prefix "chunked encoding"
-  (let* ((s "5\r\nFirst\r\nA\r\n line\n Sec\r\n8\r\nond line\r\n0\r\n")
+  (let* ((s "5\r\nFirst\r\nA\r\n line\n Sec\r\n8\r\nond line\r\n0\r\n\r\n")
          (p (make-chunked-input-port (open-input-string s))))
     (pass-if-equal
         "First line\n Second line"
@@ -497,4 +497,4 @@
            (force-output out-chunked)
            (display "Third chunk" out-chunked)
            (close-port out-chunked))))
-      "b\r\nFirst chunk\r\nc\r\nSecond chunk\r\nb\r\nThird chunk\r\n0\r\n"))
+      "b\r\nFirst chunk\r\nc\r\nSecond chunk\r\nb\r\nThird 
chunk\r\n0\r\n\r\n"))
-- 
2.36.1