public inbox for cygwin-apps-cvs@sourceware.org help / color / mirror / Atom feed
From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [setup] branch master, updated. release_2.873-1-g46826f2 Date: Tue, 20 Oct 2015 12:22:00 -0000 [thread overview] Message-ID: <20151020122214.13105.qmail@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;h=46826f23828bf0c057bbf0c682b9375281622339 commit 46826f23828bf0c057bbf0c682b9375281622339 Author: Michael Bisbjerg <michael@mbwarez.dk> 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 "download.cc", 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. Diff: --- download.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/download.cc b/download.cc index a5aebe0..e319ed4 100644 --- a/download.cc +++ b/download.cc @@ -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 ? */
reply other threads:[~2015-10-20 12:22 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20151020122214.13105.qmail@sourceware.org \ --to=jturney@sourceware.org \ --cc=cygwin-apps-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).