GitList

Browse code

Merge pull request #14978 from gesellix/websocket-disable-check-origin

skip checkOrigin during websocket handshake

Brian Goff authored on 2015/08/26 01:56:30
Showing 1 changed files

api/server/container.go index bc3143b..6699b0f 100644

@@ -528,7 +528,8 @@ func (s *Server) wsContainersAttach(version version.Version, w http.ResponseWrit
 			logrus.Errorf("Error attaching websocket: %s", err)
 		}
 	})
-	h.ServeHTTP(w, r)
+	ws := websocket.Server{Handler: h, Handshake: nil}
+	ws.ServeHTTP(w, r)
 
 	return nil
 }

...	...	@@ -528,7 +528,8 @@ func (s *Server) wsContainersAttach(version version.Version, w http.ResponseWrit
528	528	logrus.Errorf("Error attaching websocket: %s", err)
529	529	}
530	530	})
531		- h.ServeHTTP(w, r)
	531	+ ws := websocket.Server{Handler: h, Handshake: nil}
	532	+ ws.ServeHTTP(w, r)
532	533
533	534	return nil
534	535	}