ios / yh_sdwebimage · Commits

Go to a project

Authored by Olivier Poitrey
Commit d85d5833af1961fb05053514a7356a827eae2a7d 1 parent 8a55d97f

Fix fucked-up merge

Inline Side-by-side
Showing 1 changed file with 0 additions and 1 deletions
@@ -107,7 +107,6 @@ NSString *const kCompletedCallbackKey = @"completed"; @@ -107,7 +107,6 @@ NSString *const kCompletedCallbackKey = @"completed";
107 { 107 {
108 // In order to prevent from potential duplicate caching (NSURLCache + SDImageCache) we disable the cache for image requests 108 // In order to prevent from potential duplicate caching (NSURLCache + SDImageCache) we disable the cache for image requests
109 NSMutableURLRequest *request = [NSMutableURLRequest.alloc initWithURL:url cachePolicy:NSURLCacheStorageNotAllowed timeoutInterval:15]; 109 NSMutableURLRequest *request = [NSMutableURLRequest.alloc initWithURL:url cachePolicy:NSURLCacheStorageNotAllowed timeoutInterval:15];
110 - NSMutableURLRequest *request = [NSMutableURLRequest.alloc initWithURL:url cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:15];  
111 request.HTTPShouldHandleCookies = NO; 110 request.HTTPShouldHandleCookies = NO;
112 request.HTTPShouldUsePipelining = YES; 111 request.HTTPShouldUsePipelining = YES;
113 [request addValue:@"image/*" forHTTPHeaderField:@"Accept"]; 112 [request addValue:@"image/*" forHTTPHeaderField:@"Accept"];