summaryrefslogtreecommitdiff
path: root/module/web
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2019-08-02 15:21:34 +0200
committerAndy Wingo <wingo@pobox.com>2019-08-02 15:21:34 +0200
commit160a5c89bf9910dfefbbd4752ef944b2773e93f2 (patch)
tree1805323e255a00005e6daf1f83191214ccf444bf /module/web
parent3925a64682be333af2e8d15e8173f06d3272f4e4 (diff)
parent73cde5ed7218a090ecee888870908af5445796f0 (diff)
downloadguile-160a5c89bf9910dfefbbd4752ef944b2773e93f2.tar.gz
Merge from stable-2.2
Diffstat (limited to 'module/web')
-rw-r--r--module/web/http.scm31
1 files changed, 24 insertions, 7 deletions
diff --git a/module/web/http.scm b/module/web/http.scm
index de61c9495..f1ca733c1 100644
--- a/module/web/http.scm
+++ b/module/web/http.scm
@@ -1,6 +1,6 @@
;;; HTTP messages
-;; Copyright (C) 2010-2017 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2017, 2019 Free Software Foundation, Inc.
;; This library is free software; you can redistribute it and/or
;; modify it under the terms of the GNU Lesser General Public
@@ -152,18 +152,35 @@ The default writer will call ‘put-string’."
(lambda (val port)
(put-string port val)))))
+(define spaces-and-tabs
+ (char-set #\space #\tab))
+
+(define (space-or-tab? c)
+ (case c
+ ((#\space #\tab) #t)
+ (else #f)))
+
(define (read-header-line port)
- "Read an HTTP header line and return it without its final CRLF or LF.
-Raise a 'bad-header' exception if the line does not end in CRLF or LF,
-or if EOF is reached."
+ "Read an HTTP header line, including any continuation lines, and
+return the combined string without its final CRLF or LF. 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) . #\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))
+ (let ((line (if (string-suffix? "\r" line)
+ (string-drop-right line 1)
+ line)))
+ ;; If the next character is a space or tab, then there's at least
+ ;; one continuation line. Read the continuation lines by calling
+ ;; 'read-header-line' recursively, and append them to this header
+ ;; line, folding the leading spaces and tabs to a single space.
+ (if (space-or-tab? (lookahead-char port))
+ (string-append line " " (string-trim (read-header-line port)
+ spaces-and-tabs))
+ line)))
((line . _) ;EOF or missing delimiter
(bad-header 'read-header-line line))))