[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: download: Work around more bogus HTTP handling in Guile 2.2 <= 2.
From: |
Ludovic Courtès |
Subject: |
01/01: download: Work around more bogus HTTP handling in Guile 2.2 <= 2.2.2. |
Date: |
Sat, 11 Nov 2017 09:20:08 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 65a19abf3fad2dee86cc3585124ca2f85cf115b7
Author: Ludovic Courtès <address@hidden>
Date: Sat Nov 11 15:17:52 2017 +0100
download: Work around more bogus HTTP handling in Guile 2.2 <= 2.2.2.
Reported by Mark H Weaver <address@hidden>
at <https://lists.gnu.org/archive/html/guix-devel/2017-11/msg00190.html>.
* guix/build/download.scm (guile-2.2) [write-request-line]: Backport
Guile commit 6ad28ae3bc6a6d9e95ab7d70510d12c97673a143.
---
guix/build/download.scm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/guix/build/download.scm b/guix/build/download.scm
index 790576b..a65c7b9 100644
--- a/guix/build/download.scm
+++ b/guix/build/download.scm
@@ -514,7 +514,8 @@ port if PORT is a TLS session record port."
(declare-relative-uri-header! "Location")))))
;; XXX: Work around broken proxy handling on Guile 2.2 <= 2.2.2, fixed in
-;; Guile commit 7d0d9e2c25c1e872cfc7d14ab5139915f1813d56. See bug report at
+;; Guile commits 7d0d9e2c25c1e872cfc7d14ab5139915f1813d56 and
+;; 6ad28ae3bc6a6d9e95ab7d70510d12c97673a143. See bug report at
;; <https://lists.gnu.org/archive/html/guix-devel/2017-11/msg00070.html>.
(cond-expand
(guile-2.2
@@ -539,9 +540,9 @@ port if PORT is a TLS session record port."
(put-string port "://")
(cond
((string-index host #\:) ;<---- The fix is here!
- (put-char #\[ port)
- (put-string port host
- (put-char port #\])))
+ (put-char port #\[) ;<---- And here!
+ (put-string port host)
+ (put-char port #\]))
(else
(put-string port host)))
(unless ((@@ (web uri) default-port?) scheme host-port)