diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-03-05 13:51:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-05 13:51:54 -0400 |
| commit | c64785074b925f725acb5ed254d73b310179cba0 (patch) | |
| tree | 542abb3d221d0c4b861e3edcbc3ebbb54ed87134 | |
| parent | a82b564462580b46b781df38ff1015685617675a (diff) | |
webdav: When built with a new enough haskell DAV (0.6), disable the http response timeout, which was only 5 seconds.
| -rw-r--r-- | Remote/WebDAV.hs | 1 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/box.com_never_stops_syncing..mdwn | 11 |
3 files changed, 14 insertions, 0 deletions
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs index 2cfe2f6d2..91b83053c 100644 --- a/Remote/WebDAV.hs +++ b/Remote/WebDAV.hs @@ -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 diff --git a/debian/changelog b/debian/changelog index f9ebbfd3b..16e0f8513 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/doc/bugs/box.com_never_stops_syncing..mdwn b/doc/bugs/box.com_never_stops_syncing..mdwn index 42b2eaf1a..d8e5391b5 100644 --- a/doc/bugs/box.com_never_stops_syncing..mdwn +++ b/doc/bugs/box.com_never_stops_syncing..mdwn @@ -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]] |