11 anos atrás · 510a942e8e
--- a/Common/DemoServer.swift
+++ b/Common/DemoServer.swift
@@ -22,11 +22,11 @@ func demoServer(publicDir: String?) -> HttpServer {
 
															         return .OK(.RAW(response))
														
 
															     }
														
 
															     server["/params/(.+)/(.+)"] = { request in
														
 
															-        var capturedGroupsIngo = ""
														
 
															+        var capturedGroups = ""
														
 
															         for (index, group) in enumerate(request.capturedUrlGroups) {
														
 
															-            capturedGroupsIngo += "Expression group \(index) : \(group)<br>"
														
 
															+            capturedGroups += "Expression group \(index) : \(group)<br>"
														
 
															         }
														
 
															-        let response = "<html><body>Url: \(request.url)<br>Method: \(request.method)<br>\(capturedGroupsIngo)</body></html>"
														
 
															+        let response = "<html><body>Url: \(request.url)<br>Method: \(request.method)<br>\(capturedGroups)</body></html>"
														
 
															         return .OK(.RAW(response))
														
 
															     }
														
 
															     server["/json"] = { request in
														
--- a/Common/HttpHandlers.swift
+++ b/Common/HttpHandlers.swift
@@ -14,7 +14,7 @@ class HttpHandlers {
 
															         return { request in
														
 
															             if let localPath = request.capturedUrlGroups.first {
														
 
															                 let filesPath = dir.stringByExpandingTildeInPath.stringByAppendingPathComponent(localPath)
														
 
															-                if let fileBody = String(contentsOfFile: filesPath, encoding: NSUTF8StringEncoding, error: nil) {
														
 
															+                if let fileBody = String(contentsOfFile: filesPath, encoding: NSASCIIStringEncoding, error: nil) {
														
 
															                     return HttpResponse.OK(.RAW(fileBody))
														
 
															                 }
														
 
															             }
														
--- a/Resources/logo.png
+++ b/Resources/logo.png
--- a/Swifter.xcodeproj/project.pbxproj
+++ b/Swifter.xcodeproj/project.pbxproj
@@ -30,6 +30,7 @@
 
															 		7CB102DB1A16657200CBA3B4 /* HttpHandlers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CB102D91A1664B200CBA3B4 /* HttpHandlers.swift */; };
														
 
															 		7CB102DD1A167FFA00CBA3B4 /* DemoServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CB102DC1A167FFA00CBA3B4 /* DemoServer.swift */; };
														
 
															 		7CB102DE1A1680EA00CBA3B4 /* DemoServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CB102DC1A167FFA00CBA3B4 /* DemoServer.swift */; };
														
 
															+		7CB102E01A17381D00CBA3B4 /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 7CB102DF1A17381D00CBA3B4 /* logo.png */; };
														
 
															 /* End PBXBuildFile section */
														
 
															 /* Begin PBXCopyFilesBuildPhase section */
														
@@ -63,6 +64,7 @@
 
															 		7CA4815A19A2F6A60030B30D /* HttpRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpRequest.swift; sourceTree = "<group>"; };
														
 
															 		7CB102D91A1664B200CBA3B4 /* HttpHandlers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpHandlers.swift; sourceTree = "<group>"; };
														
 
															 		7CB102DC1A167FFA00CBA3B4 /* DemoServer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoServer.swift; sourceTree = "<group>"; };
														
 
															+		7CB102DF1A17381D00CBA3B4 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
														
 
															 /* End PBXFileReference section */
														
 
															 /* Begin PBXFrameworksBuildPhase section */
														
@@ -157,6 +159,7 @@
 
															 		7CA4815619A2EF2B0030B30D /* Resources */ = {
														
 
															 			isa = PBXGroup;
														
 
															 			children = (
														
 
															+				7CB102DF1A17381D00CBA3B4 /* logo.png */,
														
 
															 				7CA4815719A2EF2B0030B30D /* test.json */,
														
 
															 			);
														
 
															 			path = Resources;
														
@@ -240,6 +243,7 @@
 
															 			isa = PBXResourcesBuildPhase;
														
 
															 			buildActionMask = 2147483647;
														
 
															 			files = (
														
 
															+				7CB102E01A17381D00CBA3B4 /* logo.png in Resources */,
														
 
															 				7C839B7919422CFF003A6950 /* Main.storyboard in Resources */,
														
 
															 				7C839B7B19422CFF003A6950 /* Images.xcassets in Resources */,
														
 
															 				7CA4815819A2EF2B0030B30D /* test.json in Resources */,
														
--- a/Swifter.xcodeproj/project.xcworkspace/xcuserdata/damiankolakowski.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/Swifter.xcodeproj/project.xcworkspace/xcuserdata/damiankolakowski.xcuserdatad/UserInterfaceState.xcuserstate