mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
http-client: Monkey-patch 'make-chunked-input-port' on Guile <= 2.0.11.
Fixes <http://bugs.gnu.org/19976>. * guix/http-client.scm (when-guile<=2.0.5): Rename to... (when-guile<=2.0.5-or-otherwise-broken): ... this. (%web-http): New variable. Monkey-patch 'make-chunked-input-port' when %WEB-HTTP defines 'read-chunk-body'.
This commit is contained in:
parent
c28606bd1d
commit
776463ba9f
1 changed files with 10 additions and 2 deletions
|
@ -55,7 +55,7 @@ (define-condition-type &http-get-error &error
|
|||
(reason http-get-error-reason)) ; string
|
||||
|
||||
|
||||
(define-syntax when-guile<=2.0.5
|
||||
(define-syntax when-guile<=2.0.5-or-otherwise-broken
|
||||
(lambda (s)
|
||||
(syntax-case s ()
|
||||
((_ body ...)
|
||||
|
@ -64,12 +64,15 @@ (define-syntax when-guile<=2.0.5
|
|||
;; when using "guix pull".
|
||||
#'(begin body ...)))))
|
||||
|
||||
(when-guile<=2.0.5
|
||||
(when-guile<=2.0.5-or-otherwise-broken
|
||||
;; Backport of Guile commits 312e79f8 ("Add HTTP Chunked Encoding support to
|
||||
;; web modules.") and 00d3ecf2 ("http: Do not buffer HTTP chunks.")
|
||||
|
||||
(use-modules (ice-9 rdelim))
|
||||
|
||||
(define %web-http
|
||||
(resolve-module '(web http)))
|
||||
|
||||
;; Chunked Responses
|
||||
(define (read-chunk-header port)
|
||||
(let* ((str (read-line port))
|
||||
|
@ -127,6 +130,11 @@ (define (loop to-read num-read)
|
|||
|
||||
(make-custom-binary-input-port "chunked input port" read! #f #f close))
|
||||
|
||||
;; Chunked encoding support in Guile <= 2.0.11 would load whole chunks in
|
||||
;; memory---see <http://bugs.gnu.org/19939>.
|
||||
(when (module-variable %web-http 'read-chunk-body)
|
||||
(module-set! %web-http 'make-chunked-input-port make-chunked-input-port))
|
||||
|
||||
(define (read-response-body* r)
|
||||
"Reads the response body from @var{r}, as a bytevector. Returns
|
||||
@code{#f} if there was no response body."
|
||||
|
|
Loading…
Reference in a new issue