diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
| commit | 4d49342612dd441cdc503b5294035fc05a9a5a77 (patch) | |
| tree | 435a82d44b5a6aa3df411b36fb9fad2553cc670a /doc/bugs/Proxy_support.mdwn | |
| parent | 44a48a19ffeb8085e7ae1f6bf58d5661adaf8a8d (diff) | |
| parent | 5cd9e10cde3c06ecc6a97f5f60a9def22f959bd2 (diff) | |
Merge branch 'master' into concurrentprogress
Conflicts:
Command/Fsck.hs
Messages.hs
Remote/Directory.hs
Remote/Git.hs
Remote/Helper/Special.hs
Types/Remote.hs
debian/changelog
git-annex.cabal
Diffstat (limited to 'doc/bugs/Proxy_support.mdwn')
| -rw-r--r-- | doc/bugs/Proxy_support.mdwn | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/doc/bugs/Proxy_support.mdwn b/doc/bugs/Proxy_support.mdwn index ae6eaf689..2af63d706 100644 --- a/doc/bugs/Proxy_support.mdwn +++ b/doc/bugs/Proxy_support.mdwn @@ -17,3 +17,26 @@ Please provide any additional information below. I don't use networkmanager if proxy information is obtained from it. There should be a fallback to environment variables. [[!tag confirmed]] + +> Here's a patch that shows how to enable proxy support for the +> parts of git-annex that use http-client and http-conduit: +> <https://github.com/kiwiroy/git-annex/commit/18a3ceda1beb7c356541270f37ae4c0d56ada726> +> +> Other parts of git-annex use wget/curl and should already support +> the environment variables. + +>> I had a closer look at this, and it turns out that http-client +>> now enables http proxy support by default, when the environment variable +>> is set. Since version 0.4.7. See `defaultProxy`. +>> +>> git-annex uses http-client for all its http access (either directly +>> or through layers like http-conduit and DAV). +>> +>> So I don't need to change +>> git-annex at all; it just needs to be built with a new enough version +>> of http-client. This will happen for the linux autobuilders once the new +>> version reaches Debian. I've updated the OSX autobuilder's http-client +>> so it will already support proxying and anyone can built git-annex +>> using the new http-client and get proxy support. +>> +>> Calling this [[done]] as nothing remains to do in git-annex. --[[Joey]] |