Net API update. Dep versions change

PerfectlySoft · Jan 24, 2017 · 13acb7a · 13acb7a
1 parent 5117357
commit 13acb7a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Package.swift b/Package.swift
@@ -26,6 +26,6 @@ let package = Package(
 		Target(name: "CZlib", dependencies: []),
 		Target(name: "PerfectHTTPServer", dependencies: ["CHTTPParser", "CZlib"])
 	],
-	dependencies: [.Package(url: "https://github.com/PerfectlySoft/Perfect-HTTP.git", majorVersion: 2, minor: 1)],
+	dependencies: [.Package(url: "https://github.com/PerfectlySoft/Perfect-HTTP.git", majorVersion: 2)],
 	exclude: ["Sources/CZlib/examples", "Sources/CZlib/test", "Sources/CZlib/contrib"]
 )
diff --git a/Sources/PerfectHTTPServer/HTTP11Request.swift b/Sources/PerfectHTTPServer/HTTP11Request.swift
@@ -52,7 +52,12 @@ class HTTP11Request: HTTPRequest {
     }()
 
     var protocolVersion = (1, 0)
-	var remoteAddress: (host: String, port: UInt16) { return connection.peerName() }
+	var remoteAddress: (host: String, port: UInt16) {
+		guard let remote = connection.remoteAddress else {
+			return ("", 0)
+		}
+		return (remote.host, remote.port)
+	}
     var serverAddress = (host: "", port: 0 as UInt16)
     var serverName = ""
     var documentRoot = "./webroot"

diff --git a/Sources/PerfectHTTPServer/HTTPServer.swift b/Sources/PerfectHTTPServer/HTTPServer.swift
@@ -217,7 +217,7 @@ public class HTTPServer {
 		_ = setsockopt(sock.fd.fd, Int32(IPPROTO_TCP), TCP_NODELAY, &flag, UInt32(MemoryLayout<Int32>.size))
 
 		defer { sock.close() }
-		self.serverAddress = sock.sockName().0
+		self.serverAddress = sock.localAddress?.host ?? ""
 		sock.forEachAccept {
 			[weak self] net in
 			guard let net = net else {