Merge pull request #32174 from KarthikNayak/32113

Dockerd: enable CORS when only `--api-cors-header` is used
This commit is contained in:
Evan Hazlett 2017-03-30 11:13:52 -04:00 committed by GitHub
commit 59aed5ab36
1 changed files with 1 additions and 1 deletions

View File

@ -507,7 +507,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)
}