Merge branch v2.6 into v2.7

integration/https_test.go

@@ -1072,7 +1072,7 @@ func (s *HTTPSSuite) TestEntryPointHttpsRedirectAndPathModification(c *check.C)
 			resp.Body.Close()
 
 			location := resp.Header.Get("Location")
-			expected := fmt.Sprintf("https://%s:8443%s", host, test.path)
+			expected := "https://" + net.JoinHostPort(host, "8443") + test.path
 
 			c.Assert(location, checker.Equals, expected)
 		}

integration/timeout_test.go

@@ -2,6 +2,7 @@ package integration
 
 import (
 	"fmt"
+	"net"
 	"net/http"
 	"os"
 	"time"
@@ -38,7 +39,8 @@ func (s *TimeoutSuite) TestForwardingTimeouts(c *check.C) {
 	c.Assert(response.StatusCode, checker.Equals, http.StatusGatewayTimeout)
 
 	// Check that timeout service is available
-	statusURL := fmt.Sprintf("http://%s:9000/statusTest?status=200", timeoutEndpointIP)
+	statusURL := fmt.Sprintf("http://%s/statusTest?status=200",
+		net.JoinHostPort(timeoutEndpointIP, "9000"))
 	c.Assert(try.GetRequest(statusURL, 60*time.Second, try.StatusCodeIs(http.StatusOK)), checker.IsNil)
 
 	// This simulates a ResponseHeaderTimeout.