toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8905 from 13W/x-registry-auth

Browse Source 
allow to use x-registry-auth header with enabled cors
Upstream-commit: f676891192670df3e5c79c4612a86186329d658f
Component: engine
This commit is contained in:
Victor Vieux
2014-11-18 17:21:22 -08:00
parent 7c799c6dee 5e75202137
commit 5660f63578
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/api/server/server.go
+1 -1
View File
@@ -1181,7 +1181,7 @@ func optionsHandler(eng *engine.Engine, version version.Version, w http.Response
}
func writeCorsHeaders(w http.ResponseWriter, r *http.Request) {
w.Header().Add("Access-Control-Allow-Origin", "*")
w.Header().Add("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept")
w.Header().Add("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, X-Registry-Auth")
w.Header().Add("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT, OPTIONS")
}
components/engine/integration/api_test.go
+2 -2
View File
@@ -785,8 +785,8 @@ func TestGetEnabledCors(t *testing.T) {
if allowOrigin != "*" {
t.Errorf("Expected header Access-Control-Allow-Origin to be \"*\", %s found.", allowOrigin)
}
if allowHeaders != "Origin, X-Requested-With, Content-Type, Accept" {
t.Errorf("Expected header Access-Control-Allow-Headers to be \"Origin, X-Requested-With, Content-Type, Accept\", %s found.", allowHeaders)
if allowHeaders != "Origin, X-Requested-With, Content-Type, Accept, X-Registry-Auth" {
t.Errorf("Expected header Access-Control-Allow-Headers to be \"Origin, X-Requested-With, Content-Type, Accept, X-Registry-Auth\", %s found.", allowHeaders)
}
if allowMethods != "GET, POST, DELETE, PUT, OPTIONS" {
t.Errorf("Expected hearder Access-Control-Allow-Methods to be \"GET, POST, DELETE, PUT, OPTIONS\", %s found.", allowMethods)