Don't use the cached response if the server didn't send an explicit e…

…xpiration time
pokeb · Nov 20, 2010 · b34b3f1 · b34b3f1
1 parent ba98423
commit b34b3f1
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Classes/ASIDownloadCache.m b/Classes/ASIDownloadCache.m
@@ -292,9 +292,9 @@ - (BOOL)isCachedDataCurrentForRequest:(ASIHTTPRequest *)request
 		// Look for an Expires header to see if the content is out of date
 		NSString *expires = [cachedHeaders objectForKey:@"Expires"];
 		if (expires) {
-			if ([[ASIHTTPRequest dateFromRFC1123String:expires] timeIntervalSinceNow] < 0) {
+			if ([[ASIHTTPRequest dateFromRFC1123String:expires] timeIntervalSinceNow] >= 0) {
 				[[self accessLock] unlock];
-				return NO;
+				return YES;
 			}
 		}
 		// Look for a max-age header
@@ -309,13 +309,15 @@ - (BOOL)isCachedDataCurrentForRequest:(ASIHTTPRequest *)request
 
 				NSDate *expiryDate = [[[NSDate alloc] initWithTimeInterval:maxAge sinceDate:fetchDate] autorelease];
 
-				if ([expiryDate timeIntervalSinceNow] < 0) {
+				if ([expiryDate timeIntervalSinceNow] >= 0) {
 					[[self accessLock] unlock];
-					return NO;
+					return YES;
 				}
 			}
 		}
 
+		// No explicit expiration time sent by the server
+		return NO;
 	}