* ASIWebPageRequest now has three url-replacement modes, see ASIWebPageRequest.h for details

* ASIDownloadCache now strips trailing slashes from urls when building the key used to store the data. Now it doesn't matter if the request's url includes the trailing slash or not * ASIDownloadCache now names all data-files with an .html extension. This allows ASIWebPageRequest to display frames and iframes with local content. * Remove broken NSURLCache compatibility from ASIDownloadCache * ASIDownloadCache now stores its data in the NSCachesDirectory instead of NSTemporaryDirectory (Thanks to Dincho Todorov for pointing this out!)

* ASIWebPageRequest now has three url-replacement modes, see ASIWebPageRequest.h for details
* ASIDownloadCache now strips trailing slashes from urls when building the key used to store the data. Now it doesn't matter if the request's url includes the trailing slash or not * ASIDownloadCache now names all data-files with an .html extension. This allows ASIWebPageRequest to display frames and iframes with local content. * Remove broken NSURLCache compatibility from ASIDownloadCache * ASIDownloadCache now stores its data in the NSCachesDirectory instead of NSTemporaryDirectory (Thanks to Dincho Todorov for pointing this out!)
Ben Copsey
Commit bad64e2eae4247a71a0cee63167899d908d5eddf bad64e2e 1 parent b6ce3752
Showing 10 changed files with 118 additions and 57 deletions
Classes/ASIDownloadCache.h
Classes/ASIDownloadCache.m
Classes/ASIHTTPRequest.m
Classes/ASIWebPageRequest.h
Classes/ASIWebPageRequest.m
Mac Sample/AppDelegate.m
Mac.xcodeproj/project.pbxproj
iPhone Sample/RequestProgressCell.h
iPhone Sample/RequestProgressCell.m
iPhone Sample/WebPageViewController.m
--- a/Classes/ASIDownloadCache.h
View file @bad64e2
+++ b/Classes/ASIDownloadCache.h
View file @bad64e2
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import "ASICacheDelegate.h"
-@interface ASIDownloadCache : NSURLCache <ASICacheDelegate> {
+@interface ASIDownloadCache : NSObject <ASICacheDelegate> {
 	// The default cache policy for this cache
 	// Requests that store data in the cache will use this cache policy if their cache policy is set to ASIDefaultCachePolicy
--- a/Classes/ASIDownloadCache.m
View file @bad64e2
+++ b/Classes/ASIDownloadCache.m
View file @bad64e2
@@ -34,7 +34,7 @@ static NSString *permanentCacheFolder = @"PermanentStore";
 {
 	if (!sharedCache) {
 		sharedCache = [[self alloc] init];
-		[sharedCache setStoragePath:[NSTemporaryDirectory() stringByAppendingPathComponent:@"ASIHTTPRequestCache"]];
+		[sharedCache setStoragePath:[[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:@"ASIHTTPRequestCache"]];
 	}
 	return sharedCache;
@@ -146,14 +146,14 @@ static NSString *permanentCacheFolder = @"PermanentStore";
 	}
 	// Look in the session store
 	NSString *path = [[self storagePath] stringByAppendingPathComponent:sessionCacheFolder];
-	NSString *dataPath = [path stringByAppendingPathComponent:[[[self class] keyForURL:url] stringByAppendingPathExtension:@"cacheddata"]];
+	NSString *dataPath = [path stringByAppendingPathComponent:[[[self class] keyForURL:url] stringByAppendingPathExtension:@"html"]];
 	if ([[NSFileManager defaultManager] fileExistsAtPath:dataPath]) {
 		[[self accessLock] unlock];
 		return dataPath;
 	}
 	// Look in the permanent store
 	path = [[self storagePath] stringByAppendingPathComponent:permanentCacheFolder];
-	dataPath = [path stringByAppendingPathComponent:[[[self class] keyForURL:url] stringByAppendingPathExtension:@"cacheddata"]];
+	dataPath = [path stringByAppendingPathComponent:[[[self class] keyForURL:url] stringByAppendingPathExtension:@"html"]];
 	if ([[NSFileManager defaultManager] fileExistsAtPath:dataPath]) {
 		[[self accessLock] unlock];
 		return dataPath;
@@ -195,7 +195,7 @@ static NSString *permanentCacheFolder = @"PermanentStore";
 		return nil;
 	}
 	NSString *path = [[self storagePath] stringByAppendingPathComponent:([request cacheStoragePolicy] == ASICacheForSessionDurationCacheStoragePolicy ? sessionCacheFolder : permanentCacheFolder)];
-	path =  [path stringByAppendingPathComponent:[[[self class] keyForURL:[request url]] stringByAppendingPathExtension:@"cacheddata"]];
+	path =  [path stringByAppendingPathComponent:[[[self class] keyForURL:[request url]] stringByAppendingPathExtension:@"html"]];
 	[[self accessLock] unlock];
 	return path;
 }
@@ -382,7 +382,12 @@ static NSString *permanentCacheFolder = @"PermanentStore";
 // Borrowed from: http://stackoverflow.com/questions/652300/using-md5-hash-on-a-string-in-cocoa
 + (NSString *)keyForURL:(NSURL *)url
 {
-	const char *cStr = [[url absoluteString] UTF8String];
+	NSString *urlString = [url absoluteString];
+	// Strip trailing slashes so http://allseeing-i.com/ASIHTTPRequest/ is cached the same as http://allseeing-i.com/ASIHTTPRequest
+	if ([[urlString substringFromIndex:[urlString length]-1] isEqualToString:@"/"]) {
+		urlString = [urlString substringToIndex:[urlString length]-1];
+	}
+	const char *cStr = [urlString UTF8String];
 	unsigned char result[16];
 	CC_MD5(cStr, (CC_LONG)strlen(cStr), result);
 	return [NSString stringWithFormat:@"%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",result[0], result[1], result[2], result[3], result[4], result[5], result[6], result[7],result[8], result[9], result[10], result[11],result[12], result[13], result[14], result[15]]; 	
@@ -446,23 +451,6 @@ static NSString *permanentCacheFolder = @"PermanentStore";
 	return NO;
 }
-/*
-NSURLCache compatibility
-*/
-- (NSCachedURLResponse *)cachedResponseForRequest:(NSURLRequest *)request
-{
-	NSData *data = [self cachedResponseDataForURL:[request URL]];
-	NSDictionary *headers = [self cachedResponseHeadersForURL:[request URL]];
-	if (!data || !headers) {
-		return [super cachedResponseForRequest:request];
-	}
-	NSString *mimeType = nil;
-	NSStringEncoding charset;
-	[ASIHTTPRequest parseMimeType:&mimeType andResponseEncoding:&charset fromContentType:[headers objectForKey:@"Content-Type"]];
-	NSURLResponse *urlResponse = [[[NSURLResponse alloc] initWithURL:[request URL] MIMEType:mimeType expectedContentLength:[data length] textEncodingName:nil] autorelease];
-	return [[NSCachedURLResponse alloc] initWithResponse:urlResponse data:data];
-}
-
 @synthesize storagePath;
 @synthesize defaultCachePolicy;
 @synthesize accessLock;
--- a/Classes/ASIHTTPRequest.m
View file @bad64e2
+++ b/Classes/ASIHTTPRequest.m
View file @bad64e2
@@ -24,7 +24,7 @@
 #import "ASIDataCompressor.h"
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.7-102 2010-10-03";
+NSString *ASIHTTPRequestVersion = @"v1.7-106 2010-10-09";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
--- a/Classes/ASIWebPageRequest.h
View file @bad64e2
+++ b/Classes/ASIWebPageRequest.h
View file @bad64e2
@@ -17,12 +17,30 @@
 @class ASINetworkQueue;
+// Used internally for storing what type of data we got from the server
 typedef enum _ASIWebContentType {
     ASINotParsedWebContentType = 0,
     ASIHTMLWebContentType = 1,
     ASICSSWebContentType = 2
 } ASIWebContentType;
+// These correspond with the urlReplacementMode property of ASIWebPageRequest
+typedef enum _ASIURLReplacementMode {
+
+	// Don't modify html or css content at all
+    ASIDontModifyURLs = 0,
+
+	// Replace external resources urls (images, stylesheets etc) with data uris, so their content is embdedded directly in the html/css
+    ASIReplaceExternalResourcesWithData = 1,
+
+	// Replace external resource urls with the url of locally cached content
+	// You must set the baseURL of a WebView / UIWebView to a file url pointing at the downloadDestinationPath of the main ASIWebPageRequest if you want to display your content
+    // See the Mac or iPhone example projects for a demonstration of how to do this
+	// The hrefs of all hyperlinks are changed to use absolute urls when using this mode
+	ASIReplaceExternalResourcesWithLocalURLs = 2
+} ASIURLReplacementMode;
+
+
 @interface ASIWebPageRequest : ASIHTTPRequest {
@@ -43,11 +61,8 @@ typedef enum _ASIWebContentType {
 	// For example, a request for an image can be created by a request for a stylesheet which was created by a request for a web page
 	ASIWebPageRequest *parentRequest;
-	// If set to YES, ASIWebPageRequest will replace the urls of supported external resources with data urls that contain the the content of the external url
+	// Controls what ASIWebPageRequest does with external resources. See the notes above for more.
-	// This allows you to cache a complete webpage in a single file
+	ASIURLReplacementMode urlReplacementMode;
-	// If set to NO, ASIWebPageRequest will still download the content of external resource URLS, but will not make changes to CSS or HTML
-	// If you set an ASIDownloadCache for this request and also use it as NSURLCache's sharedCache, webViews and UIWebViews should still be able load many external resources from disk without fetching them again
-	BOOL replaceURLsWithDataURLs;
 }
 // Will return a data URI that contains a base64 version of the content at this url
@@ -60,5 +75,5 @@ typedef enum _ASIWebContentType {
 @property (retain, nonatomic) ASIWebPageRequest *parentRequest;
-@property (assign, nonatomic) BOOL replaceURLsWithDataURLs;
+@property (assign, nonatomic) ASIURLReplacementMode urlReplacementMode;
 @end
--- a/Classes/ASIWebPageRequest.m
View file @bad64e2
+++ b/Classes/ASIWebPageRequest.m
View file @bad64e2
@@ -13,7 +13,7 @@
 // An xPath query that controls the external resources ASIWebPageRequest will fetch
 // By default, it will fetch stylesheets, javascript files, images, frames, iframes, and html 5 video / audio
-static xmlChar *xpathExpr = (xmlChar *)"//link/@href|//script/@src|//img/@src|//frame/@src|//iframe/@src|//style|//*/@style|//source/@src";
+static xmlChar *xpathExpr = (xmlChar *)"//link/@href|//a/@href|//script/@src|//img/@src|//frame/@src|//iframe/@src|//style|//*/@style|//source/@src";
 static NSLock *xmlParsingLock = nil;
 static NSMutableArray *requestsUsingXMLParser = nil;
@@ -25,6 +25,7 @@ static NSMutableArray *requestsUsingXMLParser = nil;
 - (void)parseAsCSS;
 - (void)addURLToFetch:(NSString *)newURL;
 + (NSArray *)CSSURLsFromString:(NSString *)string;
+- (NSString *)relativePathTo:(NSString *)destinationPath fromPath:(NSString *)sourcePath;
 @property (retain, nonatomic) ASINetworkQueue *externalResourceQueue;
 @property (retain, nonatomic) NSMutableDictionary *resourceList;
 @end
@@ -52,7 +53,7 @@ static NSMutableArray *requestsUsingXMLParser = nil;
 - (void)requestFinished
 {
 	complete = NO;
-	if ([self mainRequest]) {
+	if ([self mainRequest] || [self didUseCachedResponse]) {
 		[super requestFinished];
 		[super markAsFinished];
 		return;
@@ -117,7 +118,7 @@ static NSMutableArray *requestsUsingXMLParser = nil;
 		[externalResourceRequest setCacheStoragePolicy:[self cacheStoragePolicy]];
 		[externalResourceRequest setUserInfo:[NSDictionary dictionaryWithObject:theURL forKey:@"Path"]];
 		[externalResourceRequest setParentRequest:self];
-		[externalResourceRequest setReplaceURLsWithDataURLs:[self replaceURLsWithDataURLs]];
+		[externalResourceRequest setUrlReplacementMode:[self urlReplacementMode]];
 		[externalResourceRequest setShouldResetDownloadProgress:NO];
 		[externalResourceRequest setDelegate:self];
 		[externalResourceRequest setUploadProgressDelegate:self];
@@ -185,7 +186,7 @@ static NSMutableArray *requestsUsingXMLParser = nil;
 		[externalResourceRequest setCacheStoragePolicy:[self cacheStoragePolicy]];
 		[externalResourceRequest setUserInfo:[NSDictionary dictionaryWithObject:theURL forKey:@"Path"]];
 		[externalResourceRequest setParentRequest:self];
-		[externalResourceRequest setReplaceURLsWithDataURLs:[self replaceURLsWithDataURLs]];
+		[externalResourceRequest setUrlReplacementMode:[self urlReplacementMode]];
 		[externalResourceRequest setShouldResetDownloadProgress:NO];
 		[externalResourceRequest setDelegate:self];
 		[externalResourceRequest setUploadProgressDelegate:self];
@@ -222,7 +223,7 @@ static NSMutableArray *requestsUsingXMLParser = nil;
 - (void)finishedFetchingExternalResources:(ASINetworkQueue *)queue
 {
-	if ([self replaceURLsWithDataURLs]) {
+	if ([self urlReplacementMode] != ASIDontModifyURLs) {
 		if (webContentType == ASICSSWebContentType) {
 			NSMutableString *parsedResponse;
 			NSError *err = nil;
@@ -292,8 +293,8 @@ static NSMutableArray *requestsUsingXMLParser = nil;
 	[self setResponseHeaders:newHeaders];
 	// Write the parsed content back to the cache
-	if ([self replaceURLsWithDataURLs]) {
+	if ([self urlReplacementMode] != ASIDontModifyURLs) {
-		[[self downloadCache] storeResponseForRequest:self maxAge:[self secondsToCache]];
+		//[[self downloadCache] storeResponseForRequest:self maxAge:[self secondsToCache]];
 	}
 	[super requestFinished];
@@ -341,7 +342,8 @@ static NSMutableArray *requestsUsingXMLParser = nil;
 			for (NSString *theURL in externalResources) {
 				[self addURLToFetch:theURL];
 			}
-		} else {
+		} else if (![[parentName lowercaseString] isEqualToString:@"a"]) {
+			NSLog(@"%@",value);
 			[self addURLToFetch:value];
 		}
 		if (nodes->nodeTab[i]->type != XML_NAMESPACE_DECL) {
@@ -395,6 +397,7 @@ static NSMutableArray *requestsUsingXMLParser = nil;
 	int i;
 	for(i = size - 1; i >= 0; i--) {
 		assert(nodes->nodeTab[i]);
+		NSString *parentName  = [NSString stringWithCString:(char *)nodes->nodeTab[i]->parent->name encoding:[self responseEncoding]];
 		NSString *nodeName  = [NSString stringWithCString:(char *)nodes->nodeTab[i]->name encoding:[self responseEncoding]];
 		NSString *value = [NSString stringWithCString:(char *)xmlNodeGetContent(nodes->nodeTab[i]) encoding:[self responseEncoding]];
 		if ([[nodeName lowercaseString] isEqualToString:@"style"]) {
@@ -408,6 +411,11 @@ static NSMutableArray *requestsUsingXMLParser = nil;
 				}
 			}
 			xmlNodeSetContent(nodes->nodeTab[i], (xmlChar *)[value cStringUsingEncoding:[self responseEncoding]]);
+		} else if ([self urlReplacementMode] == ASIReplaceExternalResourcesWithLocalURLs && [[parentName lowercaseString] isEqualToString:@"a"]) {
+			NSString *newURL = [[NSURL URLWithString:value relativeToURL:[self url]] absoluteString];
+			if (newURL) {
+				xmlNodeSetContent(nodes->nodeTab[i], (xmlChar *)[newURL cStringUsingEncoding:[self responseEncoding]]);
+			}
 		} else {
 			NSString *newURL = [self contentForExternalURL:value];
 			if (newURL) {
@@ -491,8 +499,39 @@ static NSMutableArray *requestsUsingXMLParser = nil;
 	return urls;
 }
+- (NSString *)relativePathTo:(NSString *)destinationPath fromPath:(NSString *)sourcePath
+{
+	NSArray *sourcePathComponents = [sourcePath pathComponents];
+	NSArray *destinationPathComponents = [destinationPath pathComponents];
+	NSUInteger i;
+	NSString *newPath = @"";
+	NSString *sourcePathComponent, *destinationPathComponent;
+	for (i=0; i<[sourcePathComponents count]; i++) {
+		sourcePathComponent = [sourcePathComponents objectAtIndex:i];
+		if ([destinationPathComponents count] > i) {
+			destinationPathComponent = [destinationPathComponents objectAtIndex:i];
+			if (![sourcePathComponent isEqualToString:destinationPathComponent]) {
+				NSUInteger i2;
+				for (i2=i+1; i2<[sourcePathComponents count]; i2++) {
+					newPath = [newPath stringByAppendingPathComponent:@".."];
+				}
+				newPath = [newPath stringByAppendingPathComponent:destinationPathComponent];
+				for (i2=i+1; i2<[destinationPathComponents count]; i2++) {
+					newPath = [newPath stringByAppendingPathComponent:[destinationPathComponents objectAtIndex:i2]];
+				}
+				break;
+			}
+		}
+	}
+	return newPath;
+}
+
 - (NSString *)contentForExternalURL:(NSString *)theURL
 {
+	if ([self urlReplacementMode] == ASIReplaceExternalResourcesWithLocalURLs) {
+		NSString *resourcePath = [[resourceList objectForKey:theURL] objectForKey:@"DataPath"];
+		return [self relativePathTo:resourcePath fromPath:[self downloadDestinationPath]];
+	}
 	NSData *data;
 	if ([[resourceList objectForKey:theURL] objectForKey:@"DataPath"]) {
 		data = [NSData dataWithContentsOfFile:[[resourceList objectForKey:theURL] objectForKey:@"DataPath"]];
@@ -522,7 +561,7 @@ static NSMutableArray *requestsUsingXMLParser = nil;
 		unsigned char result[16];
 		CC_MD5(cStr, (CC_LONG)strlen(cStr), result);
 		NSString *md5 = [NSString stringWithFormat:@"%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",result[0], result[1], result[2], result[3], result[4], result[5], result[6], result[7],result[8], result[9], result[10], result[11],result[12], result[13], result[14], result[15]]; 	
-		return [NSTemporaryDirectory() stringByAppendingPathComponent:md5];
+		return [[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:[md5 stringByAppendingPathExtension:@"html"]];
 	}
 }
@@ -530,5 +569,5 @@ static NSMutableArray *requestsUsingXMLParser = nil;
 @synthesize externalResourceQueue;
 @synthesize resourceList;
 @synthesize parentRequest;
-@synthesize replaceURLsWithDataURLs;
+@synthesize urlReplacementMode;
 @end
--- a/Mac Sample/AppDelegate.m
View file @bad64e2
+++ b/Mac Sample/AppDelegate.m
View file @bad64e2
@@ -393,6 +393,7 @@
 		[listener use];
 		return;
 	}
+
 	// If the user clicked on a link, let's tell the webview to ignore it, and we'll load it ourselves
 	[self fetchURL:[NSURL URLWithString:[[request URL] absoluteString] relativeToURL:[NSURL URLWithString:[urlField stringValue]]]];
 	[listener ignore];
@@ -400,22 +401,19 @@
 - (void)fetchURL:(NSURL *)url
 {
-	// This allows our ASIDownloadCache to masquerade as as NSURLCache
-	// It allows the webView to load the content we downloaded when replaceURLsWithDataURLs is NO 
-	[NSURLCache setSharedURLCache:[ASIDownloadCache sharedCache]];
 	ASIWebPageRequest *request = [ASIWebPageRequest requestWithURL:url];
 	[request setDidFailSelector:@selector(webPageFetchFailed:)];
 	[request setDidFinishSelector:@selector(webPageFetchSucceeded:)];
 	[request setDelegate:self];
 	[request setShowAccurateProgress:NO];
 	[request setDownloadProgressDelegate:progressIndicator];
-	[request setReplaceURLsWithDataURLs:([dataURICheckbox state] == NSOnState)];
+	[request setUrlReplacementMode:([dataURICheckbox state] == NSOnState ? ASIReplaceExternalResourcesWithData : ASIReplaceExternalResourcesWithLocalURLs)];
 	// It is strongly recommended that you set both a downloadCache and a downloadDestinationPath for all ASIWebPageRequests
 	[request setDownloadCache:[ASIDownloadCache sharedCache]];
-	[request setDownloadDestinationPath:[[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"fink"]];
+	[request setDownloadDestinationPath:[[ASIDownloadCache sharedCache] pathToStoreCachedResponseDataForRequest:request]];
-	[[ASIDownloadCache sharedCache] setShouldRespectCacheControlHeaders:NO];
+	//[[ASIDownloadCache sharedCache] setShouldRespectCacheControlHeaders:NO];
 	[request startAsynchronous];
 }
@@ -426,13 +424,22 @@
 - (void)webPageFetchSucceeded:(ASIHTTPRequest *)request
 {
+	NSURL *baseURL;
+	if ([dataURICheckbox state] == NSOnState) {
+		baseURL = [request url];
+
+		// If we're using ASIReplaceExternalResourcesWithLocalURLs, we must set the baseURL to point to our locally cached file
+	} else {
+		baseURL = [NSURL fileURLWithPath:[request downloadDestinationPath]];
+	}
+
 	if ([request downloadDestinationPath]) {
 		NSString *response = [NSString stringWithContentsOfFile:[request downloadDestinationPath] encoding:[request responseEncoding] error:nil];
 		[webPageSource setString:response];
-		[[webView mainFrame] loadHTMLString:response baseURL:[request url]];	
+		[[webView mainFrame] loadHTMLString:response baseURL:baseURL];
 	} else {
 		[webPageSource setString:[request responseString]];
-		[[webView mainFrame] loadHTMLString:[request responseString] baseURL:[request url]];
+		[[webView mainFrame] loadHTMLString:[request responseString] baseURL:baseURL];
 	}
 	[urlField setStringValue:[[request url] absoluteString]];
--- a/Mac.xcodeproj/project.pbxproj
View file @bad64e2
+++ b/Mac.xcodeproj/project.pbxproj
View file @bad64e2
--- a/iPhone Sample/RequestProgressCell.h
View file @bad64e2
+++ b/iPhone Sample/RequestProgressCell.h
View file @bad64e2
@@ -14,5 +14,5 @@
 }
 + (id)cell;
-@property (assign, nonatomic) UIProgressView *progressView;
+@property (retain, nonatomic) UIProgressView *progressView;
 @end
--- a/iPhone Sample/RequestProgressCell.m
View file @bad64e2
+++ b/iPhone Sample/RequestProgressCell.m
View file @bad64e2
@@ -22,6 +22,12 @@
 	return cell;
 }
+- (void)dealloc
+{
+	[progressView release];
+	[super dealloc];
+}
+
 - (void)layoutSubviews
 {
 	[super layoutSubviews];
--- a/iPhone Sample/WebPageViewController.m
View file @bad64e2
+++ b/iPhone Sample/WebPageViewController.m
View file @bad64e2
@@ -32,10 +32,6 @@
 	[self setRequestsInProgress:[NSMutableArray array]];
 	[[self tableView] reloadData];
-	
-	// This allows our ASIDownloadCache to masquerade as as NSURLCache
-	// It allows the webView to load the content we downloaded when replaceURLsWithDataURLs is NO 
-	[NSURLCache setSharedURLCache:[ASIDownloadCache sharedCache]];
 	[request setDelegate:nil];
 	[request cancel];
@@ -46,11 +42,12 @@
 	[request setDelegate:self];
 	[request setDownloadProgressDelegate:self];
 	[request setShowAccurateProgress:NO];
-	[request setReplaceURLsWithDataURLs:[replaceURLsSwitch isOn]];
+	[request setUrlReplacementMode:([replaceURLsSwitch isOn] ? ASIReplaceExternalResourcesWithData : ASIReplaceExternalResourcesWithLocalURLs)];
 	// It is strongly recommended that you set both a downloadCache and a downloadDestinationPath for all ASIWebPageRequests
 	[request setDownloadCache:[ASIDownloadCache sharedCache]];
-	[request setDownloadDestinationPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Documents"] stringByAppendingPathComponent:@"webpage"]];
+	[request setCachePolicy:ASIOnlyLoadIfNotCachedCachePolicy];
+	[request setDownloadDestinationPath:[[ASIDownloadCache sharedCache] pathToStoreCachedResponseDataForRequest:request]];
 	[[ASIDownloadCache sharedCache] setShouldRespectCacheControlHeaders:NO];
 	[request startAsynchronous];
@@ -63,13 +60,22 @@
 - (void)webPageFetchSucceeded:(ASIHTTPRequest *)theRequest
 {
+	NSURL *baseURL;
+	if ([replaceURLsSwitch isOn]) {
+		baseURL = [theRequest url];
+
+	// If we're using ASIReplaceExternalResourcesWithLocalURLs, we must set the baseURL to point to our locally cached file
+	} else {
+		baseURL = [NSURL fileURLWithPath:[request downloadDestinationPath]];
+	}
+
 	if ([theRequest downloadDestinationPath]) {
 		NSString *response = [NSString stringWithContentsOfFile:[theRequest downloadDestinationPath] encoding:[theRequest responseEncoding] error:nil];
 		[responseField setText:response];
-		[webView loadHTMLString:response baseURL:[theRequest url]];	
+		[webView loadHTMLString:response baseURL:baseURL];
 	} else {
 		[responseField setText:[theRequest responseString]];
-		[webView loadHTMLString:[theRequest responseString] baseURL:[theRequest url]];
+		[webView loadHTMLString:[theRequest responseString] baseURL:baseURL];
 	}
 	[urlField setText:[[theRequest url] absoluteString]];