guix
/
data-service
mirror of git://git.savannah.gnu.org/guix/data-service.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Adjust render procedures to not use procedures for responses 

The newer Guile Fibers web server will use the chunked transfer encoding when
a procedure is used and the content length is unspecified. This is good for
large responses, but unnecessary here. Also, there's a bug with the charset so
these changes to respond with correctly encoded bytevectors to avoid that.
This commit is contained in:
Christopher Baines 2023-02-09 11:43:42 +00:00
parent 0ce5af2c59
commit 6be113f99d
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
guix-data-service/web/render.scm
View File

@ -24,6 +24,7 @@
#:use-module (srfi srfi-19)
#:use-module (srfi srfi-26)
#:use-module (ice-9 ftw)
#:use-module (ice-9 iconv)
#:use-module (ice-9 binary-ports)
#:use-module (web request)
#:use-module (web response)
@ -142,30 +143,39 @@
(list (build-response
#:code code
#:headers (append extra-headers
'((content-type . (text/html))
'((content-type . (text/html
(charset . "utf-8")))
(vary . (accept)))))
(lambda (port)
(sxml->html sxml port))))
(call-with-encoded-output-string
"utf-8"
(lambda (port)
(sxml->html sxml port)))))
(define* (render-json json #:key (extra-headers '())
(code 200))
(list (build-response
#:code code
#:headers (append extra-headers
'((content-type . (application/json))
'((content-type . (application/json
(charset . "utf-8")))
(vary . (accept)))))
(lambda (port)
(scm->json json port))))
(call-with-encoded-output-string
"utf-8"
(lambda (port)
(scm->json json port)))))
(define* (render-text text #:key (extra-headers '())
(code 200))
(list (build-response
#:code code
#:headers (append extra-headers
'((content-type . (text/plain))
'((content-type . (text/plain
(charset . "utf-8")))
(vary . (accept)))))
(lambda (port)
(display text port))))
(call-with-encoded-output-string
"utf-8"
(lambda (port)
(display text port)))))
(define (not-found uri)
(list (build-response #:code 404)