~ruther/guix-local: http-client: Backport delimited input port fix from Guile.

6b02a448d2d87e043e45905567a7504c7926c2a9 — Ludovic Courtès 10 years ago 1c01a30

http-client: Backport delimited input port fix from Guile.

* guix/http-client.scm (make-delimited-input-port): Backport Guile
  commit 5a10e41.
  Monkey-patch 'make-delimited-input-port' for any Guile <= 2.0.11.

patch browse .tar.gz

1 files changed, 4 insertions(+), 2 deletions(-)

M guix/http-client.scm

M guix/http-client.scm => guix/http-client.scm +4 -2

@@ 166,13 166,15 @@ closes PORT, unless KEEP-ALIVE? is true."
    (define close
      (and (not keep-alive?)
           (lambda ()
-            (close port))))
+            (close-port port))))
 
    (make-custom-binary-input-port "delimited input port" read! #f #f close))
 
- (unless (guile-version>? "2.0.9")
+ (unless (guile-version>? "2.0.11")
    ;; Guile <= 2.0.9 had a bug whereby 'response-body-port' would read more
    ;; than what 'content-length' says.  See Guile commit 802a25b.
+   ;; Guile <= 2.0.12 had a bug whereby the 'close' method of the response
+   ;; body port would fail with wrong-arg-num.  See Guile commit 5a10e41.
    (module-set! (resolve-module '(web response))
                 'make-delimited-input-port make-delimited-input-port)))