mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

webdav: When built with a new enough haskell DAV (0.6), disable the http response timeout, which was only 5 seconds.

Browse source
This commit is contained in:
Joey Hess 2014-03-05 13:51:54 -04:00
parent d626a784f3
commit aa377ed567
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Remote/WebDAV.hs
View file

@ -386,6 +386,7 @@ matchStatusCodeException _ _ = Nothing
#if MIN_VERSION_DAV(0,6,0) #if MIN_VERSION_DAV(0,6,0)
goDAV :: DavUrl -> DavUser -> DavPass -> DAVT IO a -> IO a goDAV :: DavUrl -> DavUser -> DavPass -> DAVT IO a -> IO a
goDAV url user pass a = choke $ evalDAVT url $ do goDAV url user pass a = choke $ evalDAVT url $ do
setResponseTimeout Nothing -- disable default (5 second!) timeout
setCreds user pass setCreds user pass
a a
where where

2
debian/changelog vendored
View file

@ -25,6 +25,8 @@ git-annex (5.20140228) UNRELEASED; urgency=medium
* sync: Automatically resolve merge conflict between and annexed file * sync: Automatically resolve merge conflict between and annexed file
and a regular git file. and a regular git file.
* glacier: Pass --region to glacier checkpresent. * glacier: Pass --region to glacier checkpresent.
* webdav: When built with a new enough haskell DAV (0.6), disable
the http response timeout, which was only 5 seconds.
-- Joey Hess <joeyh@debian.org> Fri, 28 Feb 2014 14:52:15 -0400 -- Joey Hess <joeyh@debian.org> Fri, 28 Feb 2014 14:52:15 -0400

11
doc/bugs/box.com_never_stops_syncing..mdwn
View file

@ -61,3 +61,14 @@ failed
"""]] """]]
More to come(full log) More to come(full log)
> This is [[fixed|done]] in git; when built with a new enough
> version of the haskell DAV library, git-annex disables the default 5
> second timeout.
>
> It'll still be present in the Debian stable backports, which are
> built with an old version of DAV. Not much I can do about that;
> backporting DAV would be difficult.
>
> The daily builds are updated to use the new version.
> --[[Joey]]