diff options
| -rw-r--r-- | modules/context/context.go | 3 | ||||
| -rw-r--r-- | routers/api/v1/api.go | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/modules/context/context.go b/modules/context/context.go index e3cc6f6b..31378532 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -159,6 +159,9 @@ func Contexter() macaron.Handler { if len(setting.HTTP.AccessControlAllowOrigin) > 0 { ctx.Header().Set("Access-Control-Allow-Origin", setting.HTTP.AccessControlAllowOrigin) + ctx.Header().Set("'Access-Control-Allow-Credentials' ", "true") + ctx.Header().Set("Access-Control-Max-Age", "3600") + ctx.Header().Set("Access-Control-Allow-Headers", "Content-Type, Access-Control-Allow-Headers, Authorization, X-Requested-With") } // Compute current URL for real-time change language. diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 6221bcd7..35234fa8 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -173,6 +173,9 @@ func RegisterRoutes(m *macaron.Macaron) { bind := binding.Bind m.Group("/v1", func() { + // Handle preflight OPTIONS request + m.Options("/*", func() {}) + // Miscellaneous m.Post("/markdown", bind(api.MarkdownOption{}), misc.Markdown) m.Post("/markdown/raw", misc.MarkdownRaw) |