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

WebDAV: Remove a bogus trailing slash from the end of the url to the temporary store location for a key. Thanks, wzhd.

Browse source 
That trailing slash is needed for legacy chunked mode, because it puts the
chunks in a subdir under the key. But, outside legacy chunked mode, it's BS
and it's amazing it worked at all with some webdav servers.
This commit is contained in:
Joey Hess 2016-02-09 11:50:40 -04:00
parent 850a645233
commit c40d14a37d
Failed to extract signature
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Remote/WebDAV.hs
View file

@ -339,7 +339,7 @@ storeLegacyChunked chunksize k dav b =
finalizer tmp' dest' = goDAV dav $ finalizer tmp' dest' = goDAV dav $
finalizeStore (baseURL dav) tmp' (fromJust $ locationParent dest') finalizeStore (baseURL dav) tmp' (fromJust $ locationParent dest')
tmp = keyTmpLocation k tmp = addTrailingPathSeparator $ keyTmpLocation k
dest = keyLocation k dest = keyLocation k
retrieveLegacyChunked :: DavHandle -> Retriever retrieveLegacyChunked :: DavHandle -> Retriever

2
Remote/WebDAV/DavLocation.hs
View file

@ -44,7 +44,7 @@ keyLocation k = keyDir k ++ keyFile k
{- Where we store temporary data for a key as it's being uploaded. -} {- Where we store temporary data for a key as it's being uploaded. -}
keyTmpLocation :: Key -> DavLocation keyTmpLocation :: Key -> DavLocation
keyTmpLocation = addTrailingPathSeparator . tmpLocation . keyFile keyTmpLocation = tmpLocation . keyFile
tmpLocation :: FilePath -> DavLocation tmpLocation :: FilePath -> DavLocation
tmpLocation f = tmpDir </> f tmpLocation f = tmpDir </> f

2
debian/changelog vendored
View file

@ -24,6 +24,8 @@ git-annex (6.20160127) UNRELEASED; urgency=medium
submodule. submodule.
* WebDAV: Set depth 1 in PROPFIND request, for better compatability with * WebDAV: Set depth 1 in PROPFIND request, for better compatability with
some servers. Thanks, wzhd. some servers. Thanks, wzhd.
* WebDAV: Remove a bogus trailing slash from the end of the url to the
temporary store location for a key. Thanks, wzhd.
-- Joey Hess <id@joeyh.name> Thu, 28 Jan 2016 13:53:09 -0400 -- Joey Hess <id@joeyh.name> Thu, 28 Jan 2016 13:53:09 -0400