TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

publish: Work around Guile 2.2.5 (web server) bug.

Browse source 
* guix/scripts/publish.scm: Replace (@@ (web http) read-header-line) on
Guile 2.2.5.
This commit is contained in:
Ludovic Courtès 2019-06-24 16:39:25 +02:00
parent f9d55c4925
commit bb11825f35
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
guix/scripts/publish.scm
View file

@ -724,6 +724,32 @@ (define (request-path-components request)
(define %http-write
(@@ (web server http) http-write))
(match (list (major-version) (minor-version) (micro-version))
(("2" "2" "5") ;Guile 2.2.5
(let ()
(define %read-line (@ (ice-9 rdelim) %read-line))
(define bad-header (@@ (web http) bad-header))
;; XXX: Work around <https://bugs.gnu.org/36350> by reverting to the
;; definition of 'read-header-line' as found in 2.2.4 and earlier.
(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."
(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))
((line . _) ;EOF or missing delimiter
(bad-header 'read-header-line line))))
(set! (@@ (web http) read-header-line) read-header-line)))
(_ #t))
(define (strip-headers response)
"Return RESPONSE's headers minus 'Content-Length' and our internal headers."
(fold alist-delete