Merge branch 'bug-13'

Author: Lars Steiger

FsprgEmbeddedStore/FsprgEmbeddedStoreController.h

@@ -19,7 +19,6 @@
     id <FsprgEmbeddedStoreDelegate> delegate;
     NSString *storeHost;
     NSMutableDictionary *hostCertificates;
-    NSMapTable *connectionsToRequests;
 }
 
 - (WebView *)webView;

FsprgEmbeddedStore/FsprgEmbeddedStoreController.m

@@ -24,8 +24,6 @@ - (void)resizeContentDivE;
 - (void)webViewFrameChanged:(NSNotification *)aNotification;
 - (NSMutableDictionary *)hostCertificates;
 - (void)setHostCertificates:(NSMutableDictionary *)aHostCertificates;
-- (NSMapTable *)connectionsToRequests;
-- (void)setConnectionsToRequests:(NSMapTable *)aConnectionsToRequests;
 
 @end
 
@@ -47,11 +45,6 @@ - (id) init
 		[self setDelegate:nil];
 		[self setStoreHost:nil];
 		[self setHostCertificates:[NSMutableDictionary dictionary]];
-#if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
-		[self setConnectionsToRequests:[NSMapTable strongToStrongObjectsMapTable]];
-#else
-		[self setConnectionsToRequests:[NSMapTable mapTableWithStrongToStrongObjects]];
-#endif
 	}
 	return self;
 }
@@ -242,19 +235,6 @@ - (void)setHostCertificates:(NSMutableDictionary *)anHostCertificates
 	}
 }
 
-- (NSMapTable *)connectionsToRequests
-{
-	return [[connectionsToRequests retain] autorelease];
-}
-- (void)setConnectionsToRequests:(NSMapTable *)aConnectionsToRequests
-{
-	if (connectionsToRequests != aConnectionsToRequests) {
-		[aConnectionsToRequests retain];
-		[connectionsToRequests release];
-		connectionsToRequests = aConnectionsToRequests;
-	}
-}
-
 
 #pragma mark - WebFrameLoadDelegate
 
@@ -332,69 +312,28 @@ - (WebView *)webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)
 
 #pragma mark - WebResourceLoadDelegate
 
-- (NSURLRequest *)webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource
-{
 #if RETRIEVE_SSL_CERTIFICATES
-	NSURL *URL = [request URL];
-	NSString *host = [URL host];
-	if ([[self hostCertificates] objectForKey:host] == nil)
-	{
-		NSURLConnection *connection = [[[NSURLConnection alloc] initWithRequest:request delegate:self] autorelease];
-		[[self connectionsToRequests] setObject:request forKey:connection];
-	}
-#endif
-	return request;
-}
-
-#pragma mark - NURLConnection delegate
-
-#if RETRIEVE_SSL_CERTIFICATES
-- (NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheResponse:(NSCachedURLResponse *)cachedResponse
-{
-	return cachedResponse;
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
-{
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
+- (BOOL)webView:(WebView *)sender resource:(id)identifier canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace forDataSource:(WebDataSource *)dataSource
 {
+    return TRUE;
 }
 
-- (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse
+- (void)webView:(WebView *)sender resource:(id)identifier didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)dataSource
 {
-	return request;
-}
-
-- (void)connectionDidFinishLoading:(NSURLConnection *)connection
-{
-	[[self connectionsToRequests] setObject:nil forKey:connection];
-}
-
-- (BOOL)connection:(NSURLConnection *)connection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace
-{
-	return YES;
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge;
-{
-	SecTrustRef trustRef = [[challenge protectionSpace] serverTrust];
-	SecTrustResultType resultType;
-	SecTrustEvaluate(trustRef, &resultType);
-	NSUInteger count = (NSUInteger)SecTrustGetCertificateCount(trustRef);
+    SecTrustRef trustRef = [[challenge protectionSpace] serverTrust];
+    SecTrustResultType resultType;
+    SecTrustEvaluate(trustRef, &resultType);
+    NSUInteger count = (NSUInteger)SecTrustGetCertificateCount(trustRef);
 
     NSMutableArray *certificates = [NSMutableArray arrayWithCapacity:count];
-	CFIndex idx;
-	for (idx = 0; idx < (CFIndex)count; idx++) {
-		SecCertificateRef certificateRef = SecTrustGetCertificateAtIndex(trustRef, idx);
-		[certificates addObject:(id)certificateRef];
-	}
+    CFIndex idx;
+    for (idx = 0; idx < (CFIndex)count; idx++) {
+        SecCertificateRef certificateRef = SecTrustGetCertificateAtIndex(trustRef, idx);
+        [certificates addObject:(id)certificateRef];
+    }
 
-	NSURLRequest *request = [[self connectionsToRequests] objectForKey:connection];
-	NSURL *URL = [request URL];
-	NSString *host = [URL host];
-	[[self hostCertificates] setObject:certificates forKey:host];
+    NSString *host = [[challenge protectionSpace] host];
+    [[self hostCertificates] setObject:certificates forKey:host];
 
     [[challenge sender] useCredential:[NSURLCredential credentialForTrust:trustRef] forAuthenticationChallenge:challenge];
 }
@@ -407,7 +346,6 @@ - (void)dealloc
 	[self setDelegate:nil];
 	[self setStoreHost:nil];
 	[self setHostCertificates:nil];
-	[self setConnectionsToRequests:nil];
 
 	[super dealloc];
 }