From a013f9cebbf600577f3f447058662e824182994e Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Latour Date: Sat, 24 Jun 2017 09:30:39 -0700 Subject: [PATCH] Fixed data race issue inside GCDWebServerGetMimeTypeForExtension() Fix #312 --- GCDWebServer/Core/GCDWebServerFunctions.m | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/GCDWebServer/Core/GCDWebServerFunctions.m b/GCDWebServer/Core/GCDWebServerFunctions.m index f6e755f..7c72e34 100644 --- a/GCDWebServer/Core/GCDWebServerFunctions.m +++ b/GCDWebServer/Core/GCDWebServerFunctions.m @@ -167,16 +167,11 @@ NSString* GCDWebServerDescribeData(NSData* data, NSString* type) { } NSString* GCDWebServerGetMimeTypeForExtension(NSString* extension) { - static NSDictionary* _overrides = nil; - if (_overrides == nil) { - _overrides = [[NSDictionary alloc] initWithObjectsAndKeys: - @"text/css", @"css", - nil]; - } + NSDictionary* overrides = @{@"css": @"text/css"}; NSString* mimeType = nil; extension = [extension lowercaseString]; if (extension.length) { - mimeType = [_overrides objectForKey:extension]; + mimeType = [overrides objectForKey:extension]; if (mimeType == nil) { CFStringRef uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)extension, NULL); if (uti) {