Merge branch 'release/1.2.1'

portainer · Jan 21, 2019 · 9fdcf81 · 9fdcf81
2 parents 3a35541 + cbccde8
commit 9fdcf81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/agent.go b/agent.go
@@ -76,7 +76,7 @@ type (
 
 const (
 	// AgentVersion represents the version of the agent.
-	AgentVersion = "1.2.0"
+	AgentVersion = "1.2.1"
 	// APIVersion represents the version of the agent's API.
 	APIVersion = "2"
 	// DefaultListenAddr is the default address used by the web server.

diff --git a/http/proxy/proxy.go b/http/proxy/proxy.go
@@ -38,6 +38,7 @@ func proxyWebsocketRequest(rw http.ResponseWriter, request *http.Request, target
 	proxy := websocketproxy.NewProxy(target)
 	proxy.Director = func(incoming *http.Request, out http.Header) {
 		out.Set(agent.HTTPSignatureHeaderName, request.Header.Get(agent.HTTPSignatureHeaderName))
+		out.Set(agent.HTTPPublicKeyHeaderName, request.Header.Get(agent.HTTPPublicKeyHeaderName))
 		out.Set(agent.HTTPTargetHeaderName, targetNode)
 	}
 	proxy.Dialer = &websocket.Dialer{