From f0f673f4d50ac072e4c7a236d2a318632c4fa89c Mon Sep 17 00:00:00 2001 From: Karthik Nayak Date: Tue, 28 Mar 2017 18:01:21 +0530 Subject: [PATCH] Dockerd: enable CORS when only `--api-cors-header` is used Even though the flag `--api-enable-cors` is deprecated in favor of `--api-cors-header`. Using only `--api-cors-header` does not enable CORS. Make changes to 'cmd/dockerd/daemon.go' to enable cors if either of the above flags is set. Signed-off-by: Karthik Nayak --- cmd/dockerd/daemon.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index cdc76f93b9..a1d45c9dec 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -511,7 +511,7 @@ func (cli *DaemonCli) initMiddlewares(s *apiserver.Server, cfg *apiserver.Config vm := middleware.NewVersionMiddleware(v, api.DefaultVersion, api.MinVersion) s.UseMiddleware(vm) - if cfg.EnableCors { + if cfg.EnableCors || cfg.CorsHeaders != "" { c := middleware.NewCORSMiddleware(cfg.CorsHeaders) s.UseMiddleware(c) }