webdav: When built with a new enough haskell DAV (0.6), disable the http response timeout, which was only 5 seconds.
This commit is contained in:
parent
d626a784f3
commit
aa377ed567
3 changed files with 14 additions and 0 deletions
|
@ -386,6 +386,7 @@ matchStatusCodeException _ _ = Nothing
|
|||
#if MIN_VERSION_DAV(0,6,0)
|
||||
goDAV :: DavUrl -> DavUser -> DavPass -> DAVT IO a -> IO a
|
||||
goDAV url user pass a = choke $ evalDAVT url $ do
|
||||
setResponseTimeout Nothing -- disable default (5 second!) timeout
|
||||
setCreds user pass
|
||||
a
|
||||
where
|
||||
|
|
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -25,6 +25,8 @@ git-annex (5.20140228) UNRELEASED; urgency=medium
|
|||
* sync: Automatically resolve merge conflict between and annexed file
|
||||
and a regular git file.
|
||||
* 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
|
||||
|
||||
|
|
|
@ -61,3 +61,14 @@ failed
|
|||
"""]]
|
||||
|
||||
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]]
|
||||
|
|
Loading…
Add table
Reference in a new issue