From 919295cffc42913be5861c15f12a9f321c225f71 Mon Sep 17 00:00:00 2001
From: Ludovic Fernandez <ldez@users.noreply.github.com>
Date: Fri, 25 Aug 2017 12:14:03 +0200
Subject: [PATCH 1/2] Only forward X-Fowarded-Port.

---
 glide.lock                                       | 6 +++---
 glide.yaml                                       | 2 +-
 vendor/github.com/vulcand/oxy/forward/rewrite.go | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/glide.lock b/glide.lock
index f5326bcb4..669fe02b8 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 8b1dbedc74488a75ba15557befbf44cf56060bc562e7407ef9a09791ec5cabd6
-updated: 2017-08-18T16:47:14.848940186+02:00
+hash: 110ae989ba77357a6d7cc720f671765b06857cf447296a294a461acd2574a020
+updated: 2017-08-25T11:52:16.848940186+02:00
 imports:
 - name: cloud.google.com/go
   version: 2e6a95edb1071d750f6d7db777bf66cd2997af6c
@@ -411,7 +411,7 @@ imports:
 - name: github.com/vdemeester/docker-events
   version: be74d4929ec1ad118df54349fda4b0cba60f849b
 - name: github.com/vulcand/oxy
-  version: 321ed9ffd102941c736731b8e7bae811820d267d
+  version: 7baa97f97557ff96be2798972dc831c7ba0a46e7
   repo: https://github.com/containous/oxy.git
   vcs: git
   subpackages:
diff --git a/glide.yaml b/glide.yaml
index 76536409d..140af462b 100644
--- 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: 321ed9ffd102941c736731b8e7bae811820d267d
+  version: 7baa97f97557ff96be2798972dc831c7ba0a46e7
   repo: https://github.com/containous/oxy.git
   vcs: git
   subpackages:
diff --git a/vendor/github.com/vulcand/oxy/forward/rewrite.go b/vendor/github.com/vulcand/oxy/forward/rewrite.go
index 1b71e89f6..b54e8bfdb 100644
--- a/vendor/github.com/vulcand/oxy/forward/rewrite.go
+++ b/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 {

From 7b0cef0fac2a9c595a64bff9af082ef9acec0d90 Mon Sep 17 00:00:00 2001
From: Ludovic Fernandez <ldez@users.noreply.github.com>
Date: Fri, 25 Aug 2017 17:08:02 +0200
Subject: [PATCH 2/2] Prepare release v1.3.7

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 889dd12de..b86ffc6e3 100644
--- a/CHANGELOG.md
+++ b/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)