Merge v1.3.7

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [v1.3.7](https://github.com/containous/traefik/tree/v1.3.7) (2017-08-25)
+[All Commits](https://github.com/containous/traefik/compare/v1.3.6...v1.3.7)
+
+**Bug fixes:**
+- **[oxy]** Only forward X-Forwarded-Port. ([#2007](https://github.com/containous/traefik/pull/2007) by [ldez](https://github.com/ldez))
+
 ## [v1.3.6](https://github.com/containous/traefik/tree/v1.3.6) (2017-08-20)
 [All Commits](https://github.com/containous/traefik/compare/v1.3.5...v1.3.6)
 

glide.lock

@@ -1,5 +1,5 @@
-hash: 2b042ce06e9c4aed4606f2b8ced5d6c3de537d1254316e8c6611e78d934a024a
-updated: 2017-08-24T14:24:42.04425168+02:00
+hash: fd8e1bbabefc71e0fc1551dcf67688d0b5ad1f23168a5c0256b8c98dda1b1fb3
+updated: 2017-08-25T11:52:16.848940186+02:00
 imports:
 - name: cloud.google.com/go
   version: 2e6a95edb1071d750f6d7db777bf66cd2997af6c
@@ -479,7 +479,7 @@ imports:
 - name: github.com/urfave/negroni
   version: 490e6a555d47ca891a89a150d0c1ef3922dfffe9
 - name: github.com/vulcand/oxy
-  version: 321ed9ffd102941c736731b8e7bae811820d267d
+  version: 7baa97f97557ff96be2798972dc831c7ba0a46e7
   repo: https://github.com/containous/oxy.git
   vcs: git
   subpackages:

glide.yaml

@@ -12,8 +12,7 @@ import:
 - package: github.com/cenk/backoff
 - package: github.com/containous/flaeg
 - package: github.com/vulcand/oxy
-  version: 3772a8e4408fb033d00a947d340475e116854b1a
-  version: 321ed9ffd102941c736731b8e7bae811820d267d
+  version: 7baa97f97557ff96be2798972dc831c7ba0a46e7
   repo: https://github.com/containous/oxy.git
   vcs: git
   subpackages:

vendor/github.com/vulcand/oxy/forward/rewrite.go

@@ -34,8 +34,6 @@ func (rw *HeaderRewriter) Rewrite(req *http.Request) {
 
 	if xfp := req.Header.Get(XForwardedPort); xfp != "" && rw.TrustForwardHeader {
 		req.Header.Set(XForwardedPort, xfp)
-	} else if req.URL.Port() != "" {
-		req.Header.Set(XForwardedPort, req.URL.Port())
 	}
 
 	if xfh := req.Header.Get(XForwardedHost); xfh != "" && rw.TrustForwardHeader {