public inbox for
help / color / mirror / Atom feed
* [setup] branch master, updated. release_2.873-1-g46826f2
@ 2015-10-20 12:22 jturney
  0 siblings, 0 replies; only message in thread
From: jturney @ 2015-10-20 12:22 UTC (permalink / raw)
  To: cygwin-apps-cvs;h=46826f23828bf0c057bbf0c682b9375281622339

commit 46826f23828bf0c057bbf0c682b9375281622339
Author: Michael Bisbjerg <>
Date:   Fri Sep 18 14:31:37 2015 +0100

    Avoid double-slashes in URLs
    I noticed once I set up a mirror of my own, that Cygwin Setup will
    prepend all it's URL's with a double-slash. This does not seem to be
    intentional, and I found the place in the sources where I believe the
    error to be.
    On line 160 of "", we see that the "n->key" is the source
    of the repository, including a "/", as it is used as the name of the
    local cache, which always has a "%2f" in its name. That key is then
    used on line 165 in "get_url_to_file", where it is concatenated with
    another slash and "pkgsource.Canonical" to make the final URL.
    My (untested) patch removes this slash, so that the resulting URL's
    will be with a single slash.

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

diff --git a/ b/
index a5aebe0..e319ed4 100644
--- a/
+++ b/
@@ -162,7 +162,7 @@ download_one (packagesource & pkgsource, HWND owner)
 				  pkgsource.Canonical ();
       io_stream::mkpath_p (PATH_TO_FILE, "file://" + local, 0);
-      if (get_url_to_file(n->key +  "/" + pkgsource.Canonical (),
+      if (get_url_to_file(n->key + pkgsource.Canonical (),
 			  local + ".tmp", pkgsource.size, owner))
 	  /* FIXME: note new source ? */

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-10-20 12:22 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-20 12:22 [setup] branch master, updated. release_2.873-1-g46826f2 jturney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).