浏览代码

Fixed whitespace for consistency

Christopher Luu 11 年之前
父节点
当前提交
3d0011108a
共有 2 个文件被更改,包括 15 次插入15 次删除
  1. 7 7
      Swifter/HttpParser.swift
  2. 8 8
      Swifter/HttpServer.swift

+ 7 - 7
Swifter/HttpParser.swift

@@ -24,7 +24,7 @@ class HttpParser {
             let method = statusTokens[0]
             let path = statusTokens[1]
             if let headers = nextHeaders(socket, error: error) {
-				var responseString = ""
+                var responseString = ""
                 while let line = nextLine(socket, error: error)
                 {
                     if line.isEmpty {
@@ -32,8 +32,8 @@ class HttpParser {
                     }
                     responseString += line
                 }
-				println(responseString)
-				let responseData = responseString.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: true)
+                println(responseString)
+                let responseData = responseString.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: true)
                 return (path, method, headers, responseData)
             }
         }
@@ -70,10 +70,10 @@ class HttpParser {
             recvBufferOffset = 0
             recvBufferSize = recv(socket, &recvBuffer, UInt(recvBuffer.count), MSG_DONTWAIT)
             if ( recvBufferSize <= 0 ) { return recvBufferSize }
-			if recvBufferSize < recvBuffer.count
-			{
-				recvBuffer[recvBufferSize] = 0
-			}
+            if recvBufferSize < recvBuffer.count
+            {
+                recvBuffer[recvBufferSize] = 0
+            }
         }
         let returnValue = recvBuffer[recvBufferOffset]
         recvBufferOffset++

+ 8 - 8
Swifter/HttpServer.swift

@@ -44,11 +44,11 @@ class HttpServer
             if let regex = NSRegularExpression.regularExpressionWithPattern(path, options: expressionOptions, error: nil) {
                 handlers.append(expression: regex, handler: { (method, path, headers, responseData) in
                     let result = regex.firstMatchInString(path, options: self.matchingOptions, range: NSMakeRange(0, path.lengthOfBytesUsingEncoding(NSASCIIStringEncoding)))
-					let myPath: NSString = path
-					let filesPath = directoryPath.stringByAppendingPathComponent(myPath.substringWithRange(result.rangeAtIndex(1)))
-					if let fileBody = String.stringWithContentsOfFile(filesPath, encoding: NSASCIIStringEncoding, error: nil) {
-						return HttpResponse.OK(.RAW(fileBody))
-					}
+                    let myPath: NSString = path
+                    let filesPath = directoryPath.stringByAppendingPathComponent(myPath.substringWithRange(result.rangeAtIndex(1)))
+                    if let fileBody = String.stringWithContentsOfFile(filesPath, encoding: NSASCIIStringEncoding, error: nil) {
+                        return HttpResponse.OK(.RAW(fileBody))
+                    }
                     return HttpResponse.NotFound
                 })
             }
@@ -92,9 +92,9 @@ class HttpServer
         Socket.writeStringUTF8(socket, string: "HTTP/1.1 \(response.statusCode()) \(response.reasonPhrase())\r\n")
         let messageBody = response.body()
         if let body = messageBody {
-			if let nsdata = body.dataUsingEncoding(NSUTF8StringEncoding) {
-				Socket.writeStringUTF8(socket, string: "Content-Length: \(nsdata.length)\r\n")
-			}
+            if let nsdata = body.dataUsingEncoding(NSUTF8StringEncoding) {
+                Socket.writeStringUTF8(socket, string: "Content-Length: \(nsdata.length)\r\n")
+            }
         } else {
             Socket.writeStringUTF8(socket, string: "Content-Length: 0\r\n")
         }