melon/tokidoki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt to latest changes in go-webdav

Browse Source 
There is now only one last PR missing before we can start using the
vanilla upstream go-webdav again. Thanks a lot to Simon for his patience
reviewing my PRs!
This commit is contained in:
Conrad Hoffmann 2022-05-13 15:38:02 +02:00
parent 4765adc1a3
commit 53b2c88311
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/tokidoki/main.go
View File

@ -67,12 +67,12 @@ func (u *tokidokiHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
if r.URL.Path == userPrincipalPath { if r.URL.Path == userPrincipalPath {
opts := webdav.ServeUserPrincipalOptions{ opts := webdav.ServePrincipalOptions{
UserPrincipalPath: userPrincipalPath, CurrentUserPrincipalPath: userPrincipalPath,
HomeSets: homeSets, HomeSets: homeSets,
} }
webdav.ServeUserPrincipal(w, r, &opts) webdav.ServePrincipal(w, r, &opts)
return return
} }

2
go.mod
View File

@ -14,4 +14,4 @@ require (
require golang.org/x/text v0.3.7 // indirect require golang.org/x/text v0.3.7 // indirect
// This needs to be removed once everything is merged upstream // This needs to be removed once everything is merged upstream
replace github.com/emersion/go-webdav v0.3.2-0.20220310154811-85d2b222bbcd => github.com/bitfehler/go-webdav v0.3.2-0.20220505121709-bb7224b67200 replace github.com/emersion/go-webdav v0.3.2-0.20220310154811-85d2b222bbcd => github.com/bitfehler/go-webdav v0.3.2-0.20220513133554-bf9c9fcc431a

4
go.sum
View File

@ -1,5 +1,5 @@
github.com/bitfehler/go-webdav v0.3.2-0.20220505121709-bb7224b67200 h1:A0Pp7tuJDHbsfHbjrc+lDtOI976K2us7WEhvlEy1BnY= github.com/bitfehler/go-webdav v0.3.2-0.20220513133554-bf9c9fcc431a h1:XYSxbKDn3WoYt1M3fT4RXMtzOieaNxvNs9qBxcOw6Vg=
github.com/bitfehler/go-webdav v0.3.2-0.20220505121709-bb7224b67200/go.mod h1:uSM1VveeKtogBVWaYccTksToczooJ0rrVGNsgnDsr4Q= github.com/bitfehler/go-webdav v0.3.2-0.20220513133554-bf9c9fcc431a/go.mod h1:uSM1VveeKtogBVWaYccTksToczooJ0rrVGNsgnDsr4Q=
github.com/emersion/go-ical v0.0.0-20200224201310-cd514449c39e h1:YGM1sI7edZOt8KAfX9Miq/X99d2QXdgjkJ7vN4HjxAA= github.com/emersion/go-ical v0.0.0-20200224201310-cd514449c39e h1:YGM1sI7edZOt8KAfX9Miq/X99d2QXdgjkJ7vN4HjxAA=
github.com/emersion/go-ical v0.0.0-20200224201310-cd514449c39e/go.mod h1:4xVTBPcT43a1pp3vdaa+FuRdX5XhKCZPpWv7m0z9ByM= github.com/emersion/go-ical v0.0.0-20200224201310-cd514449c39e/go.mod h1:4xVTBPcT43a1pp3vdaa+FuRdX5XhKCZPpWv7m0z9ByM=
github.com/emersion/go-imap v1.2.0 h1:lyUQ3+EVM21/qbWE/4Ya5UG9r5+usDxlg4yfp3TgHFA= github.com/emersion/go-imap v1.2.0 h1:lyUQ3+EVM21/qbWE/4Ya5UG9r5+usDxlg4yfp3TgHFA=