Merge remote-tracking branch 'origin/master'

* origin/master: Added method implementations for NSURLProtocol descendants
radiant-player · Jun 5, 2014 · 3afd373 · 3afd373
2 parents e017cd5 + a5bad07
commit 3afd373
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/radiant-player-mac/WebView/ImageURLProtocol.m b/radiant-player-mac/WebView/ImageURLProtocol.m
@@ -47,6 +47,11 @@ - (void)stopLoading
 
 }
 
++ (NSURLRequest *)canonicalRequestForRequest:(NSURLRequest *)request
+{
+    return request;
+}
+
 - (NSString *)mimeTypeFromURL:(NSURL *)url
 {
     NSString *extension = [[url pathExtension] lowercaseString];