瀏覽代碼

GCDWebServerGetMimeTypeForExtension() always returns a MIME type

Pierre-Olivier Latour 11 年之前
父節點
當前提交
aa5dd8fca0
共有 2 個文件被更改,包括 2 次插入6 次删除
  1. 1 1
      CGDWebServer/GCDWebServer.m
  2. 1 5
      CGDWebServer/GCDWebServerResponse.m

+ 1 - 1
CGDWebServer/GCDWebServer.m

@@ -102,7 +102,7 @@ NSString* GCDWebServerGetMimeTypeForExtension(NSString* extension) {
       }
     }
   }
-  return mimeType;
+  return mimeType ? mimeType : kGCDWebServerDefaultMimeType;
 }
 
 NSString* GCDWebServerUnescapeURLString(NSString* string) {

+ 1 - 5
CGDWebServer/GCDWebServerResponse.m

@@ -306,12 +306,8 @@
       return nil;  // TODO: Return 416 status code and "Content-Range: bytes */{file length}" header
     }
   }
-  NSString* type = GCDWebServerGetMimeTypeForExtension([path pathExtension]);
-  if (type == nil) {
-    type = kGCDWebServerDefaultMimeType;
-  }
   
-  if ((self = [super initWithContentType:type contentLength:(range.location != NSNotFound ? range.length : (NSUInteger)info.st_size)])) {
+  if ((self = [super initWithContentType:GCDWebServerGetMimeTypeForExtension([path pathExtension]) contentLength:(range.location != NSNotFound ? range.length : (NSUInteger)info.st_size)])) {
     _path = [path copy];
     if (range.location != NSNotFound) {
       _offset = range.location;