diff options
| -rw-r--r-- | Types/Remote.hs | 3 | ||||
| -rw-r--r-- | doc/bugs/Proxy_support.mdwn | 16 | ||||
| -rw-r--r-- | standalone/android/cabal.config | 4 | ||||
| -rw-r--r-- | standalone/linux/cabal.config | 4 | ||||
| -rwxr-xr-x | standalone/windows/build.sh | 4 |
5 files changed, 24 insertions, 7 deletions
diff --git a/Types/Remote.hs b/Types/Remote.hs index 5df08c775..ad8c0c4a7 100644 --- a/Types/Remote.hs +++ b/Types/Remote.hs @@ -66,7 +66,8 @@ data RemoteA a = Remote { -- (The MeterUpdate does not need to be used if it retrieves -- directly to the file, and not to an intermediate file.) retrieveKeyFile :: Key -> AssociatedFile -> FilePath -> MeterUpdate -> a Bool, - -- retrieves a key's contents to a tmp file, if it can be done cheaply + -- Retrieves a key's contents to a tmp file, if it can be done cheaply. + -- It's ok to create a symlink or hardlink. retrieveKeyFileCheap :: Key -> FilePath -> a Bool, -- removes a key's contents (succeeds if the contents are not present) removeKey :: Key -> a Bool, diff --git a/doc/bugs/Proxy_support.mdwn b/doc/bugs/Proxy_support.mdwn index 05274ded9..2af63d706 100644 --- a/doc/bugs/Proxy_support.mdwn +++ b/doc/bugs/Proxy_support.mdwn @@ -24,3 +24,19 @@ I don't use networkmanager if proxy information is obtained from it. There shoul > > 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]] diff --git a/standalone/android/cabal.config b/standalone/android/cabal.config index 4eecbfeaf..5ba5bacc2 100644 --- a/standalone/android/cabal.config +++ b/standalone/android/cabal.config @@ -82,9 +82,9 @@ constraints: Crypto ==4.2.5.1, hinotify ==0.3.5, hjsmin ==0.1.4.7, hslogger ==1.2.1, - http-client ==0.3.8.2, + http-client ==0.4.11.1, http-client-tls ==0.2.2, - http-conduit ==2.1.2.3, + http-conduit ==2.1.5, http-date ==0.0.2, http-types ==0.8.5, hxt ==9.3.1.4, diff --git a/standalone/linux/cabal.config b/standalone/linux/cabal.config index 4eecbfeaf..5ba5bacc2 100644 --- a/standalone/linux/cabal.config +++ b/standalone/linux/cabal.config @@ -82,9 +82,9 @@ constraints: Crypto ==4.2.5.1, hinotify ==0.3.5, hjsmin ==0.1.4.7, hslogger ==1.2.1, - http-client ==0.3.8.2, + http-client ==0.4.11.1, http-client-tls ==0.2.2, - http-conduit ==2.1.2.3, + http-conduit ==2.1.5, http-date ==0.0.2, http-types ==0.8.5, hxt ==9.3.1.4, diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index 56323d8a3..ef990004c 100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -26,8 +26,8 @@ export UPGRADE_LOCATION # This can be used to force git-annex to build supporting a particular # version of git, instead of the version installed at build time. -FORCE_GIT_VERSION=1.9.5 -export FORCE_GIT_VERSION +#FORCE_GIT_VERSION=1.9.5 +#export FORCE_GIT_VERSION # Uncomment to get rid of cabal installed libraries. #rm -rf /c/Users/jenkins/AppData/Roaming/cabal /c/Users/jenkins/AppData/Roaming/ghc |