From: "Shawn O. Pearce" <spearce@spearce.org>
To: Christian Halstrick <christian.halstrick@gmail.com>
Cc: Robin Rosenberg <robin.rosenberg@dewire.com>, git@vger.kernel.org
Subject: Re: [JGIT PATCH] Allow http_proxy values without protocol-part
Date: Fri, 10 Jul 2009 08:22:09 -0700 [thread overview]
Message-ID: <20090710152209.GE11191@spearce.org> (raw)
In-Reply-To: <20090709232822.00000164@unknown>
Sorry I didn't respond earlier this week, I was more or less offline
for basically 2.5 days.
Christian Halstrick <christian.halstrick@gmail.com> wrote:
> jgit reads the environment variable http_proxy to configure the proxy
> for http traffic in the same way as applications using the libcurl
> library. It would be nice if jgit would understand the same values as
> libcurl, but for libcurl the protocol part is optional (e.g.
> http_proxy=proxy:8080 is valid). I changed jgit to also support
> http_proxy values without a protocol spec. When no protocol is
> specified "http://" is assumed.
This didn't really fit with our style of commit messages. Instead of
saying what you did, we prefer to say *why* you did it. The what
is clear from the diff. The why is usually less clear.
I replaced the message with the following:
--8<--
Allow http_proxy values without protocol-part
jgit reads the environment variable http_proxy to configure the
JRE's URL library for HTTP traffic through the proxy in the same
way as other applications that are using the libcurl library.
libcurl assumes "http://" when the protocol is not specified in
http_proxy, so jgit should do the same.
Thus http_proxy=proxy:8080 is now valid.
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-->8--
> diff --git a/org.spearce.jgit/src/org/spearce/jgit/util/HttpSupport.java b/org.spearce.jgit/src/org/spearce/jgit/util/HttpSupport.java
> index 33dfcee..5f21677 100644
> --- a/org.spearce.jgit/src/org/spearce/jgit/util/HttpSupport.java
> +++ b/org.spearce.jgit/src/org/spearce/jgit/util/HttpSupport.java
> @@ -69,7 +69,7 @@ public static void configureHttpProxy() throws MalformedURLException {
> if (s == null || s.equals(""))
> return;
>
> - final URL u = new URL(s);
> + final URL u = new URL((s.indexOf("://")==-1) ? "http://"+s : s);
Also, our formatting rules tend to place spaces around operators,
so this line was reformatted slightly to honor that convention.
If you are using Eclipse, the projects should be configured
automatically with our preferred code formatting rules, though
Eclipse often gets Javadoc blocks wrong and adds a trailing space
on the end of a blank line.
But, patches applied clean, so your techique of sending works.
Thanks.
--
Shawn.
prev parent reply other threads:[~2009-07-10 15:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-09 21:28 [JGIT PATCH] Allow http_proxy values without protocol-part Christian Halstrick
2009-07-10 15:22 ` Shawn O. Pearce [this message]
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=20090710152209.GE11191@spearce.org \
--to=spearce@spearce.org \
--cc=christian.halstrick@gmail.com \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg@dewire.com \
/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: link
Be 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 NNTP newsgroup(s).