ソースを参照

[dav] include route for urls below _dav

cgars 7 年 前
コミット
a66548b34b
2 ファイル変更4 行追加3 行削除
  1. 4 2
      cmd/web.go
  2. 0 1
      pkg/dav/dav.go

+ 4 - 2
cmd/web.go

@@ -150,7 +150,7 @@ func newMacaron() *macaron.Macaron {
 	}))
 	}))
 	m.Use(toolbox.Toolboxer(m, toolbox.Options{
 	m.Use(toolbox.Toolboxer(m, toolbox.Options{
 		HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{
 		HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{
-			&toolbox.HealthCheckFuncDesc{
+			{
 				Desc: "Database connection",
 				Desc: "Database connection",
 				Func: models.Ping,
 				Func: models.Ping,
 			},
 			},
@@ -420,7 +420,9 @@ func runWeb(c *cli.Context) error {
 		m.Combo("/fork/:repoid").Get(repo.Fork).
 		m.Combo("/fork/:repoid").Get(repo.Fork).
 			Post(bindIgnErr(form.CreateRepo{}), repo.ForkPost)
 			Post(bindIgnErr(form.CreateRepo{}), repo.ForkPost)
 	}, reqSignIn)
 	}, reqSignIn)
-	m.Any("/:username/:reponame/_dav/", dav.Dav, context.RepoAssignment(), context.RepoRef())
+	m.Any("/:username/:reponame/_dav/*", dav.Dav, context.RepoAssignment(), context.RepoRef())
+	m.Any("/:username/:reponame/_dav", dav.Dav, context.RepoAssignment(), context.RepoRef())
+
 	m.Group("/:username/:reponame", func() {
 	m.Group("/:username/:reponame", func() {
 		m.Group("/settings", func() {
 		m.Group("/settings", func() {
 			m.Combo("").Get(repo.Settings).
 			m.Combo("").Get(repo.Settings).

+ 0 - 1
pkg/dav/dav.go

@@ -27,7 +27,6 @@ func Dav(c *gctx.Context, handler *webdav.Handler) {
 		return
 		return
 	}
 	}
 	handler.ServeHTTP(c.Resp, c.Req.Request)
 	handler.ServeHTTP(c.Resp, c.Req.Request)
-	c.WriteHeader(http.StatusOK)
 	return
 	return
 }
 }