Oxy with fixes on websocket + integration tests

traefik · Aug 1, 2017 · 1b4dc37 · 1b4dc37
1 parent 1db9482
commit 1b4dc37
Show file tree

Hide file tree

Showing 14 changed files with 1,463 additions and 31 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -8,7 +8,7 @@ import:
 - package: github.com/cenk/backoff
 - package: github.com/containous/flaeg
 - package: github.com/vulcand/oxy
-  version: 49f1894c20d972f5c73ff44b859f87deb83f0076
+  version: 05a57556d820dc5c56721ebdefbafc15f36fac98
   repo: https://github.com/containous/oxy.git
   vcs: git
   subpackages:

diff --git a/integration/glide.lock b/integration/glide.lock
diff --git a/integration/glide.yaml b/integration/glide.yaml
@@ -29,5 +29,6 @@ testImport:
 - package: golang.org/x/net
   subpackages:
   - context
+  - websocket
 - package: github.com/spf13/pflag
   version: 5644820622454e71517561946e3d94b9f9db6842
diff --git a/integration/vendor/golang.org/x/net/websocket/client.go b/integration/vendor/golang.org/x/net/websocket/client.go