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

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 6b02a448d2d87e043e45905567a7504c7926c2a9
Author: Ludovic Courtès <address@hidden>
Date:   Thu Sep 10 22:35:45 2015 +0200

    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.
---
 guix/http-client.scm |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/guix/http-client.scm b/guix/http-client.scm
index 201615d..5cfe05f 100644
--- a/guix/http-client.scm
+++ b/guix/http-client.scm
@@ -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)))