Sfoglia il codice sorgente

Merge pull request #83 from damuellen/master

Make the compiler happy
Damian Kołakowski 10 anni fa
parent
commit
da9b702f9e
2 ha cambiato i file con 4 aggiunte e 3 eliminazioni
  1. 1 1
      Sources/HttpResponse.swift
  2. 3 2
      Sources/HttpServerIO.swift

+ 1 - 1
Sources/HttpResponse.swift

@@ -22,7 +22,7 @@ public enum HttpResponseBody {
         do {
             switch self {
             case .Json(let object):
-                guard let obj = object as? AnyObject where NSJSONSerialization.isValidJSONObject(obj) else {
+                guard case let obj = object where NSJSONSerialization.isValidJSONObject(obj) else {
                     throw SerializationError.InvalidObject
                 }
                 let json = try NSJSONSerialization.dataWithJSONObject(obj, options: NSJSONWritingOptions.PrettyPrinted)

+ 3 - 2
Sources/HttpServerIO.swift

@@ -28,7 +28,8 @@ public class HttpServerIO {
                 dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0)) {
                     let socketAddress = try? socket.peername()
                     let httpParser = HttpParser()                    
-                    while var request = try? httpParser.readHttpRequest(socket) {
+                    while let request = try? httpParser.readHttpRequest(socket) {
+                        var request = request
                         let keepAlive = httpParser.supportsKeepAlive(request.headers)
                         let (params, handler) = self.select(request.method, url: request.url)
                         request.address = socketAddress
@@ -89,4 +90,4 @@ public class HttpServerIO {
             try socket.writeUInt8(body)
         }
     }
-}
+}