From f791f5b2944addb5dab23e08a47e5c7fc401cd18 Mon Sep 17 00:00:00 2001
From: tanner0101 <me@tanner.xyz>
Date: Sat, 18 Mar 2017 18:59:37 +0100
Subject: [PATCH] sockets fixes

---
 Sources/Routing/Router+Responder.swift | 2 +-
 Sources/Routing/Router.swift           | 2 +-
 Tests/RoutingTests/RouteTests.swift    | 2 +-
 Tests/RoutingTests/RouterTests.swift   | 4 ++--
 Tests/RoutingTests/Utilities.swift     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Sources/Routing/Router+Responder.swift b/Sources/Routing/Router+Responder.swift
index 09ae9ff7..14e6766f 100644
--- a/Sources/Routing/Router+Responder.swift
+++ b/Sources/Routing/Router+Responder.swift
@@ -24,7 +24,7 @@ extension Router: Responder {
 
     private func supportedMethods(for request: Request) -> [Method] {
         let request = request.copy()
-        guard let host = self.host(for: request.uri.host) else { return [] }
+        guard let host = self.host(for: request.uri.hostname) else { return [] }
         let allOptions = host.allSubBranches
         let allPossibleMethods = allOptions.map { Method($0.name) }
         return allPossibleMethods.filter { method in
diff --git a/Sources/Routing/Router.swift b/Sources/Routing/Router.swift
index b2cdef5a..2cc7b08d 100644
--- a/Sources/Routing/Router.swift
+++ b/Sources/Routing/Router.swift
@@ -37,7 +37,7 @@ public class Router {
 
 extension Request {
     fileprivate func path() -> [String] {
-        var host: String = uri.host
+        var host: String = uri.hostname
         if host.isEmpty { host = "*" }
         let method = self.method.description
         let components = uri.path.pathComponents
diff --git a/Tests/RoutingTests/RouteTests.swift b/Tests/RoutingTests/RouteTests.swift
index 5c3b31ec..0bc5f327 100644
--- a/Tests/RoutingTests/RouteTests.swift
+++ b/Tests/RoutingTests/RouteTests.swift
@@ -40,7 +40,7 @@ class RouteTests: XCTestCase {
             let uri = URI(
                 scheme: "http",
                 userInfo: nil,
-                host: "0.0.0.0",
+                hostname: "0.0.0.0",
                 port: 80,
                 path: path.joined(separator: "/"),
                 query: nil,
diff --git a/Tests/RoutingTests/RouterTests.swift b/Tests/RoutingTests/RouterTests.swift
index 757385dd..d897ec30 100644
--- a/Tests/RoutingTests/RouterTests.swift
+++ b/Tests/RoutingTests/RouterTests.swift
@@ -140,7 +140,7 @@ class RouterTests: XCTestCase {
 
         let empties: [String] = ["", "/"]
         try empties.forEach { emptypath in
-            let uri = URI(scheme: "http", host: "0.0.0.0", path: emptypath)
+            let uri = URI(scheme: "http", hostname: "0.0.0.0", path: emptypath)
             let request = Request(method: .get, uri: uri)
             let response = try router.respond(to: request)
             XCTAssertEqual(response.body.bytes?.makeString(), "Hello, Empty!")
@@ -155,7 +155,7 @@ class RouterTests: XCTestCase {
 
         let uri = URI(
             scheme: "",
-            host: ""
+            hostname: ""
         )
         let request = Request(method: .get, uri: uri)
         let response = try router.respond(to: request)
diff --git a/Tests/RoutingTests/Utilities.swift b/Tests/RoutingTests/Utilities.swift
index f61db71f..b83768f4 100644
--- a/Tests/RoutingTests/Utilities.swift
+++ b/Tests/RoutingTests/Utilities.swift
@@ -5,7 +5,7 @@ import URI
 
 extension Request {
     convenience init(method: HTTP.Method, path: String, host: String = "0.0.0.0") {
-        let uri = URI(host: host, path: path)
+        let uri = URI(hostname: host, path: path)
         self.init(method: method, uri: uri)
     }