/ - Diff - Pithos MacOS & iOS Common Lib - Greek Research and Technology Network's projects

Revision cc176feb

b/asi-http-request-with-pithos/.gitattributes
	1	*.pbxproj -crlf -diff -merge

b/asi-http-request-with-pithos/.gitignore
10	10	*.pbxuser
11	11	*.mode1v3
12	12	External/GHUnit/*
	13	.svn

+    {
     	[self showTitle];
     	UIInterfaceOrientation o = [[UIApplication sharedApplication] statusBarOrientation];
     	UIInterfaceOrientation o = (UIInterfaceOrientation)[[UIApplication sharedApplication] statusBarOrientation];
     	CGFloat angle = 0;
     	switch (o) {
     		case UIDeviceOrientationLandscapeLeft: angle = 90; break;
-...
     + (void)dismiss
+    {
     	[[sharedDialog parentViewController] dismissModalViewControllerAnimated:YES];
     	if ([sharedDialog respondsToSelector:@selector(presentingViewController)])
     		[[sharedDialog presentingViewController] dismissModalViewControllerAnimated:YES];
     	else
     		[[sharedDialog parentViewController] dismissModalViewControllerAnimated:YES];
+    }
     - (void)viewDidDisappear:(BOOL)animated
-...
     	if (self == sharedDialog) {
     		[[self class] dismiss];
     	} else {
     		[[self parentViewController] dismissModalViewControllerAnimated:YES];
     		if ([self respondsToSelector:@selector(presentingViewController)])
     			[[self presentingViewController] dismissModalViewControllerAnimated:YES];
     		else
     			[[self parentViewController] dismissModalViewControllerAnimated:YES];
+    	}
+    }

     			[outputData increaseLengthBy:halfLength];
+    		}
     		zStream.next_out = [outputData mutableBytes] + zStream.total_out-bytesProcessedAlready;
     		zStream.next_out = (Bytef*)[outputData mutableBytes] + zStream.total_out-bytesProcessedAlready;
     		zStream.avail_out = (unsigned int)([outputData length] - (zStream.total_out-bytesProcessedAlready));
     		status = deflate(&zStream, shouldFinish ? Z_FINISH : Z_NO_FLUSH);
-...
+    		}
     		// Write the deflated data out to the destination file
     		[outputStream write:[outputData bytes] maxLength:[outputData length]];
     		[outputStream write:(const uint8_t *)[outputData bytes] maxLength:[outputData length]];
     		// Make sure nothing went wrong
     		if ([inputStream streamStatus] == NSStreamEventErrorOccurred) {
     			if (err) {
     				*err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Compression of %@ failed because we were unable to write to the destination data file at &@",sourcePath,destinationPath],NSLocalizedDescriptionKey,[outputStream streamError],NSUnderlyingErrorKey,nil]];
     				*err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Compression of %@ failed because we were unable to write to the destination data file at %@",sourcePath,destinationPath],NSLocalizedDescriptionKey,[outputStream streamError],NSUnderlyingErrorKey,nil]];
+                }
     			[compressor closeStream];
     			return NO;
-...
     + (NSError *)deflateErrorWithCode:(int)code
+    {
     	return [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Compression of data failed with code %hi",code],NSLocalizedDescriptionKey,nil]];
     	return [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Compression of data failed with code %d",code],NSLocalizedDescriptionKey,nil]];
+    }
     @synthesize streamReady;

     			[outputData increaseLengthBy:halfLength];
+    		}
     		zStream.next_out = [outputData mutableBytes] + zStream.total_out-bytesProcessedAlready;
     		zStream.next_out = (Bytef*)[outputData mutableBytes] + zStream.total_out-bytesProcessedAlready;
     		zStream.avail_out = (unsigned int)([outputData length] - (zStream.total_out-bytesProcessedAlready));
     		status = inflate(&zStream, Z_NO_FLUSH);
-...
+    		}
     		// Write the inflated data out to the destination file
     		[outputStream write:[outputData bytes] maxLength:[outputData length]];
     		[outputStream write:(Bytef*)[outputData bytes] maxLength:[outputData length]];
     		// Make sure nothing went wrong
     		if ([inputStream streamStatus] == NSStreamEventErrorOccurred) {
     			if (err) {
     				*err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Decompression of %@ failed because we were unable to write to the destination data file at &@",sourcePath,destinationPath],NSLocalizedDescriptionKey,[outputStream streamError],NSUnderlyingErrorKey,nil]];
     				*err = [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Decompression of %@ failed because we were unable to write to the destination data file at %@",sourcePath,destinationPath],NSLocalizedDescriptionKey,[outputStream streamError],NSUnderlyingErrorKey,nil]];
+                }
     			[decompressor closeStream];
     			return NO;
-...
     + (NSError *)inflateErrorWithCode:(int)code
+    {
     	return [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Decompression of data failed with code %hi",code],NSLocalizedDescriptionKey,nil]];
     	return [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Decompression of data failed with code %d",code],NSLocalizedDescriptionKey,nil]];
+    }
     @synthesize streamReady;

     // A helper function that determines if the server has requested data should not be cached by looking at the request's response headers
     + (BOOL)serverAllowsResponseCachingForRequest:(ASIHTTPRequest *)request;
     // A list of file extensions that we know won't be readable by a webview when accessed locally
     // If we're asking for a path to cache a particular url and it has one of these extensions, we change it to '.html'
     + (NSArray *)fileExtensionsToHandleAsHTML;
     @property (assign, nonatomic) ASICachePolicy defaultCachePolicy;
     @property (retain, nonatomic) NSString *storagePath;
     @property (retain) NSRecursiveLock *accessLock;

     static NSString *sessionCacheFolder = @"SessionStore";
     static NSString *permanentCacheFolder = @"PermanentStore";
     static NSArray *fileExtensionsToHandleAsHTML = nil;
     @interface ASIDownloadCache ()
     + (NSString *)keyForURL:(NSURL *)url;
-...
     @implementation ASIDownloadCache
     + (void)initialize
+    {
     	if (self == [ASIDownloadCache class]) {
     		// Obviously this is not an exhaustive list, but hopefully these are the most commonly used and this will 'just work' for the widest range of people
     		// I imagine many web developers probably use url rewriting anyway
     		fileExtensionsToHandleAsHTML = [[NSArray alloc] initWithObjects:@"asp",@"aspx",@"jsp",@"php",@"rb",@"py",@"pl",@"cgi", nil];
+    	}
+    }
     - (id)init
+    {
     	self = [super init];
-...
     - (NSDate *)expiryDateForRequest:(ASIHTTPRequest *)request maxAge:(NSTimeInterval)maxAge
+    {
     	NSMutableDictionary *responseHeaders = [NSMutableDictionary dictionaryWithDictionary:[request responseHeaders]];
     	// If we weren't given a custom max-age, lets look for one in the response headers
     	if (!maxAge) {
     		NSString *cacheControl = [[responseHeaders objectForKey:@"Cache-Control"] lowercaseString];
     		if (cacheControl) {
     			NSScanner *scanner = [NSScanner scannerWithString:cacheControl];
     			[scanner scanUpToString:@"max-age" intoString:NULL];
     			if ([scanner scanString:@"max-age" intoString:NULL]) {
     				[scanner scanString:@"=" intoString:NULL];
     				[scanner scanDouble:&maxAge];
+    			}
+    		}
+    	}
     	// RFC 2612 says max-age must override any Expires header
     	if (maxAge) {
     		return [[NSDate date] addTimeInterval:maxAge];
     	} else {
     		NSString *expires = [responseHeaders objectForKey:@"Expires"];
     		if (expires) {
     			return [ASIHTTPRequest dateFromRFC1123String:expires];
+    		}
+    	}
     	return nil;
       return [ASIHTTPRequest expiryDateForRequest:request maxAge:maxAge];
+    }
     - (void)storeResponseForRequest:(ASIHTTPRequest *)request maxAge:(NSTimeInterval)maxAge
-...
     	if ([request responseData]) {
     		[[request responseData] writeToFile:dataPath atomically:NO];
     	} else if ([request downloadDestinationPath] && ![[request downloadDestinationPath] isEqualToString:dataPath]) {
     	} else if ([request downloadDestinationPath] && ![[request downloadDestinationPath] isEqualToString:dataPath]) {
     		NSError *error = nil;
     		[[[[NSFileManager alloc] init] autorelease] copyItemAtPath:[request downloadDestinationPath] toPath:dataPath error:&error];
             NSFileManager* manager = [[NSFileManager alloc] init];
             if ([manager fileExistsAtPath:dataPath]) {
                 [manager removeItemAtPath:dataPath error:&error];
+            }
             [manager copyItemAtPath:[request downloadDestinationPath] toPath:dataPath error:&error];
             [manager release];
+    	}
     	[[self accessLock] unlock];
+    }
-...
+    {
     	// Grab the file extension, if there is one. We do this so we can save the cached response with the same file extension - this is important if you want to display locally cached data in a web view
     	NSString *extension = [[url path] pathExtension];
     	if (![extension length]) {
     	// If the url doesn't have an extension, we'll add one so a webview can read it when locally cached
     	// If the url has the extension of a common web scripting language, we'll change the extension on the cached path to html for the same reason
     	if (![extension length] || [[[self class] fileExtensionsToHandleAsHTML] containsObject:[extension lowercaseString]]) {
     		extension = @"html";
+    	}
     	return [self pathToFile:[[[self class] keyForURL:url] stringByAppendingPathExtension:extension]];
+    }
     + (NSArray *)fileExtensionsToHandleAsHTML
+    {
     	return fileExtensionsToHandleAsHTML;
+    }
     - (NSString *)pathToCachedResponseHeadersForURL:(NSURL *)url
+    {
     	return [self pathToFile:[[[self class] keyForURL:url] stringByAppendingPathExtension:@"cachedheaders"]];
-...
     	// Grab the file extension, if there is one. We do this so we can save the cached response with the same file extension - this is important if you want to display locally cached data in a web view
     	NSString *extension = [[[request url] path] pathExtension];
     	if (![extension length]) {
     	// If the url doesn't have an extension, we'll add one so a webview can read it when locally cached
     	// If the url has the extension of a common web scripting language, we'll change the extension on the cached path to html for the same reason
     	if (![extension length] || [[[self class] fileExtensionsToHandleAsHTML] containsObject:[extension lowercaseString]]) {
     		extension = @"html";
+    	}
     	path =  [path stringByAppendingPathComponent:[[[self class] keyForURL:[request url]] stringByAppendingPathExtension:extension]];

     #pragma mark utilities
     - (NSString*)encodeURL:(NSString *)string
+    {
     	NSString *newString = NSMakeCollectable([(NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (CFStringRef)string, NULL, CFSTR(":/?#[]@!$ &'()*+,;=\"<>%{}|\\^~`"), CFStringConvertNSStringEncodingToEncoding([self stringEncoding])) autorelease]);
     	NSString *newString = [NSMakeCollectable(CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (CFStringRef)string, NULL, CFSTR(":/?#[]@!$ &'()*+,;=\"<>%{}|\\^~`"), CFStringConvertNSStringEncodingToEncoding([self stringEncoding]))) autorelease];
     	if (newString) {
     		return newString;
+    	}
-...
     	self = [super initWithURL:newURL];
     	[self setPostFormat:ASIURLEncodedPostFormat];
     	[self setStringEncoding:NSUTF8StringEncoding];
             [self setRequestMethod:@"POST"];
     	return self;
+    }
-...
     	[super buildPostBody];
     #if DEBUG_FORM_DATA_REQUEST
     	NSLog(@"%@",[self debugBodyString]);
     	ASI_DEBUG_LOG(@"%@",[self debugBodyString]);
     	[self setDebugBodyString:nil];
     #endif
+    }

     	NSString *password;
     	// User-Agent for this request
     	NSString *userAgent;
     	NSString *userAgentString;
     	// Domain used for NTLM authentication
     	NSString *domain;
-...
     // And also by ASIS3Request
     + (NSString *)base64forData:(NSData *)theData;
     // Returns the expiration date for the request.
     // Calculated from the Expires response header property, unless maxAge is non-zero or
     // there exists a non-zero max-age property in the Cache-Control response header.
     + (NSDate *)expiryDateForRequest:(ASIHTTPRequest *)request maxAge:(NSTimeInterval)maxAge;
     // Returns a date from a string in RFC1123 format
     + (NSDate *)dateFromRFC1123String:(NSString *)string;
-...
     @property (retain) NSString *username;
     @property (retain) NSString *password;
     @property (retain) NSString *userAgent;
     @property (retain) NSString *userAgentString;
     @property (retain) NSString *domain;
     @property (retain) NSString *proxyUsername;

     #import "ASIDataCompressor.h"
     // Automatically set on build
     NSString *ASIHTTPRequestVersion = @"v1.8.1-8 2011-06-05";
     NSString *ASIHTTPRequestVersion = @"v1.8.1-61 2011-09-19";
     static NSString *defaultUserAgent = nil;
-...
     // When YES, bandwidth will be automatically throttled when using WWAN (3G/Edge/GPRS)
     // Wifi will not be throttled
     static BOOL shouldThrottleBandwithForWWANOnly = NO;
     static BOOL shouldThrottleBandwidthForWWANOnly = NO;
     #endif
     // Mediates access to the session cookies so requests
-...
     	[connectionInfo release];
     	[requestID release];
     	[dataDecompressor release];
     	[userAgent release];
     	[userAgentString release];
     	#if NS_BLOCKS_AVAILABLE
     	[self releaseBlocksOnMainThread];
-...
     		[authenticationNeededBlock release];
     		authenticationNeededBlock = nil;
+    	}
     	if (requestRedirectedBlock) {
     		[blocks addObject:requestRedirectedBlock];
     		[requestRedirectedBlock release];
     		requestRedirectedBlock = nil;
+    	}
     	[[self class] performSelectorOnMainThread:@selector(releaseBlocks:) withObject:blocks waitUntilDone:[NSThread isMainThread]];
+    }
     // Always called on main thread
-...
     - (void)cancelOnRequestThread
+    {
     	#if DEBUG_REQUEST_STATUS
     	NSLog(@"[STATUS] Request cancelled: %@",self);
     	ASI_DEBUG_LOG(@"[STATUS] Request cancelled: %@",self);
     	#endif
     	[[self cancelledLock] lock];
-...
     - (void)startSynchronous
+    {
     #if DEBUG_REQUEST_STATUS || DEBUG_THROTTLING
     	NSLog(@"[STATUS] Starting synchronous request %@",self);
     	ASI_DEBUG_LOG(@"[STATUS] Starting synchronous request %@",self);
     #endif
     	[self setSynchronous:YES];
     	[self setRunLoopMode:ASIHTTPRequestRunLoopMode];
-...
     - (void)startAsynchronous
+    {
     #if DEBUG_REQUEST_STATUS || DEBUG_THROTTLING
     	NSLog(@"[STATUS] Starting asynchronous request %@",self);
     	ASI_DEBUG_LOG(@"[STATUS] Starting asynchronous request %@",self);
     #endif
     	[sharedQueue addOperation:self];
+    }
-...
     		#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_4_0
     		if ([ASIHTTPRequest isMultitaskingSupported] && [self shouldContinueWhenAppEntersBackground]) {
     			backgroundTask = [[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler:^{
     				// Synchronize the cleanup call on the main thread in case
     				// the task actually finishes at around the same time.
     				dispatch_async(dispatch_get_main_queue(), ^{
     					if (backgroundTask != UIBackgroundTaskInvalid)
+    					{
     						[[UIApplication sharedApplication] endBackgroundTask:backgroundTask];
     						backgroundTask = UIBackgroundTaskInvalid;
     						[self cancel];
+    					}
     				});
     			}];
                 if (!backgroundTask || backgroundTask == UIBackgroundTaskInvalid) {
                     backgroundTask = [[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler:^{
                         // Synchronize the cleanup call on the main thread in case
                         // the task actually finishes at around the same time.
                         dispatch_async(dispatch_get_main_queue(), ^{
                             if (backgroundTask != UIBackgroundTaskInvalid)
+                            {
                                 [[UIApplication sharedApplication] endBackgroundTask:backgroundTask];
                                 backgroundTask = UIBackgroundTaskInvalid;
                                 [self cancel];
+                            }
                         });
                     }];
+                }
+    		}
     		#endif
-...
     	// Do we want to send credentials before we are asked for them?
     	if (![self shouldPresentCredentialsBeforeChallenge]) {
     		#if DEBUG_HTTP_AUTHENTICATION
     		NSLog(@"[AUTH] Request %@ will not send credentials to the server until it asks for them",self);
     		ASI_DEBUG_LOG(@"[AUTH] Request %@ will not send credentials to the server until it asks for them",self);
     		#endif
     		return;
+    	}
-...
     			[self addBasicAuthenticationHeaderWithUsername:[self username] andPassword:[self password]];
     			#if DEBUG_HTTP_AUTHENTICATION
     			NSLog(@"[AUTH] Request %@ has a username and password set, and was manually configured to use BASIC. Will send credentials without waiting for an authentication challenge",self);
     			ASI_DEBUG_LOG(@"[AUTH] Request %@ has a username and password set, and was manually configured to use BASIC. Will send credentials without waiting for an authentication challenge",self);
     			#endif
     		} else {
-...
     						if (CFHTTPMessageApplyCredentialDictionary(request, (CFHTTPAuthenticationRef)[credentials objectForKey:@"Authentication"], (CFDictionaryRef)[credentials objectForKey:@"Credentials"], NULL)) {
     							[self setAuthenticationScheme:[credentials objectForKey:@"AuthenticationScheme"]];
     							#if DEBUG_HTTP_AUTHENTICATION
     							NSLog(@"[AUTH] Request %@ found cached credentials (%@), will reuse without waiting for an authentication challenge",self,[credentials objectForKey:@"AuthenticationScheme"]);
     							ASI_DEBUG_LOG(@"[AUTH] Request %@ found cached credentials (%@), will reuse without waiting for an authentication challenge",self,[credentials objectForKey:@"AuthenticationScheme"]);
     							#endif
     						} else {
     							[[self class] removeAuthenticationCredentialsFromSessionStore:[credentials objectForKey:@"Credentials"]];
     							#if DEBUG_HTTP_AUTHENTICATION
     							NSLog(@"[AUTH] Failed to apply cached credentials to request %@. These will be removed from the session store, and this request will wait for an authentication challenge",self);
     							ASI_DEBUG_LOG(@"[AUTH] Failed to apply cached credentials to request %@. These will be removed from the session store, and this request will wait for an authentication challenge",self);
     							#endif
+    						}
-...
     						NSDictionary *usernameAndPassword = [credentials objectForKey:@"Credentials"];
     						[self addBasicAuthenticationHeaderWithUsername:[usernameAndPassword objectForKey:(NSString *)kCFHTTPAuthenticationUsername] andPassword:[usernameAndPassword objectForKey:(NSString *)kCFHTTPAuthenticationPassword]];
     						#if DEBUG_HTTP_AUTHENTICATION
     						NSLog(@"[AUTH] Request %@ found cached BASIC credentials from a previous request. Will send credentials without waiting for an authentication challenge",self);
     						ASI_DEBUG_LOG(@"[AUTH] Request %@ found cached BASIC credentials from a previous request. Will send credentials without waiting for an authentication challenge",self);
     						#endif
+    					}
+    				}
-...
     	// Build and set the user agent string if the request does not already have a custom user agent specified
     	if (![[self requestHeaders] objectForKey:@"User-Agent"]) {
     		NSString *userAgentString = [self userAgent];
     		if (!userAgentString) {
     			userAgentString = [ASIHTTPRequest defaultUserAgentString];
     		NSString *tempUserAgentString = [self userAgentString];
     		if (!tempUserAgentString) {
     			tempUserAgentString = [ASIHTTPRequest defaultUserAgentString];
+    		}
     		if (userAgentString) {
     			[self addRequestHeader:@"User-Agent" value:userAgentString];
     		if (tempUserAgentString) {
     			[self addRequestHeader:@"User-Agent" value:tempUserAgentString];
+    		}
+    	}
-...
     		} else {
     			[self setPostBodyReadStream:[ASIInputStream inputStreamWithFileAtPath:[self postBodyFilePath] request:self]];
+    		}
     		[self setReadStream:[(NSInputStream *)CFReadStreamCreateForStreamedHTTPRequest(kCFAllocatorDefault, request,(CFReadStreamRef)[self postBodyReadStream]) autorelease]];
     		[self setReadStream:[NSMakeCollectable(CFReadStreamCreateForStreamedHTTPRequest(kCFAllocatorDefault, request,(CFReadStreamRef)[self postBodyReadStream])) autorelease]];
         } else {
     		// If we have a request body, we'll stream it from memory using our custom stream, so that we can measure bandwidth use and it can be bandwidth-throttled if necessary
-...
     			} else if ([self postBody]) {
     				[self setPostBodyReadStream:[ASIInputStream inputStreamWithData:[self postBody] request:self]];
+    			}
     			[self setReadStream:[(NSInputStream *)CFReadStreamCreateForStreamedHTTPRequest(kCFAllocatorDefault, request,(CFReadStreamRef)[self postBodyReadStream]) autorelease]];
     			[self setReadStream:[NSMakeCollectable(CFReadStreamCreateForStreamedHTTPRequest(kCFAllocatorDefault, request,(CFReadStreamRef)[self postBodyReadStream])) autorelease]];
     		} else {
     			[self setReadStream:[(NSInputStream *)CFReadStreamCreateForHTTPRequest(kCFAllocatorDefault, request) autorelease]];
     			[self setReadStream:[NSMakeCollectable(CFReadStreamCreateForHTTPRequest(kCFAllocatorDefault, request)) autorelease]];
+    		}
+    	}
-...
         // Handle SSL certificate settings
         //
         if([[[[self url] scheme] lowercaseString] isEqualToString:@"https"]) {
             NSMutableDictionary *sslProperties = [NSMutableDictionary dictionaryWithCapacity:1];
         if([[[[self url] scheme] lowercaseString] isEqualToString:@"https"]) {
             // Tell CFNetwork not to validate SSL certificates
             if (![self validatesSecureCertificate]) {
                 [sslProperties setObject:(NSString *)kCFBooleanFalse forKey:(NSString *)kCFStreamSSLValidatesCertificateChain];
+            }
                 // see: http://iphonedevelopment.blogspot.com/2010/05/nsstream-tcp-and-ssl.html
                 NSDictionary *sslProperties = [[NSDictionary alloc] initWithObjectsAndKeys:
                                           [NSNumber numberWithBool:YES], kCFStreamSSLAllowsExpiredCertificates,
                                           [NSNumber numberWithBool:YES], kCFStreamSSLAllowsAnyRoot,
                                           [NSNumber numberWithBool:NO],  kCFStreamSSLValidatesCertificateChain,
                                           kCFNull,kCFStreamSSLPeerName,
                                           nil];
                 CFReadStreamSetProperty((CFReadStreamRef)[self readStream],
                                         kCFStreamPropertySSLSettings,
                                         (CFTypeRef)sslProperties);
                 [sslProperties release];
+            }
             // Tell CFNetwork to use a client certificate
             if (clientCertificateIdentity) {
                 NSMutableDictionary *sslProperties = [NSMutableDictionary dictionaryWithCapacity:1];
     			NSMutableArray *certificates = [NSMutableArray arrayWithCapacity:[clientCertificates count]+1];
     			// The first object in the array is our SecIdentityRef
-...
     			for (id cert in clientCertificates) {
     				[certificates addObject:cert];
+    			}
                 [sslProperties setObject:certificates forKey:(NSString *)kCFStreamSSLCertificates];
                 CFReadStreamSetProperty((CFReadStreamRef)[self readStream], kCFStreamPropertySSLSettings, sslProperties);
+            }
             CFReadStreamSetProperty((CFReadStreamRef)[self readStream], kCFStreamPropertySSLSettings, sslProperties);
+        }
     	//
-...
     			// Check if we should have expired this connection
     			} else if ([[[self connectionInfo] objectForKey:@"expires"] timeIntervalSinceNow] < 0) {
     				#if DEBUG_PERSISTENT_CONNECTIONS
     				NSLog(@"[CONNECTION] Not re-using connection #%i because it has expired",[[[self connectionInfo] objectForKey:@"id"] intValue]);
     				ASI_DEBUG_LOG(@"[CONNECTION] Not re-using connection #%i because it has expired",[[[self connectionInfo] objectForKey:@"id"] intValue]);
     				#endif
     				[persistentConnectionsPool removeObject:[self connectionInfo]];
     				[self setConnectionInfo:nil];
-...
     			} else if ([[self connectionInfo] objectForKey:@"request"] != nil) {
                     //Some other request reused this connection already - we'll have to create a new one
     				#if DEBUG_PERSISTENT_CONNECTIONS
                     NSLog(@"%@ - Not re-using connection #%i for request #%i because it is already used by request #%i",self,[[[self connectionInfo] objectForKey:@"id"] intValue],[[self requestID] intValue],[[[self connectionInfo] objectForKey:@"request"] intValue]);
                     ASI_DEBUG_LOG(@"%@ - Not re-using connection #%i for request #%i because it is already used by request #%i",self,[[[self connectionInfo] objectForKey:@"id"] intValue],[[self requestID] intValue],[[[self connectionInfo] objectForKey:@"request"] intValue]);
     				#endif
                     [self setConnectionInfo:nil];
+                }
-...
     		CFReadStreamSetProperty((CFReadStreamRef)[self readStream],  kCFStreamPropertyHTTPAttemptPersistentConnection, kCFBooleanTrue);
     		#if DEBUG_PERSISTENT_CONNECTIONS
     		NSLog(@"[CONNECTION] Request #%@ will use connection #%i",[self requestID],[[[self connectionInfo] objectForKey:@"id"] intValue]);
     		ASI_DEBUG_LOG(@"[CONNECTION] Request #%@ will use connection #%i",[self requestID],[[[self connectionInfo] objectForKey:@"id"] intValue]);
     		#endif
-...
     	} else {
     		#if DEBUG_PERSISTENT_CONNECTIONS
     		NSLog(@"[CONNECTION] Request %@ will not use a persistent connection",self);
     		ASI_DEBUG_LOG(@"[CONNECTION] Request %@ will not use a persistent connection",self);
     		#endif
+    	}
-...
     			[self setLastBytesSent:totalBytesSent];
     			// Find out how much data we've uploaded so far
     			[self setTotalBytesSent:[NSMakeCollectable([(NSNumber *)CFReadStreamCopyProperty((CFReadStreamRef)[self readStream], kCFStreamPropertyHTTPRequestBytesWrittenCount) autorelease]) unsignedLongLongValue]];
     			[self setTotalBytesSent:[[NSMakeCollectable(CFReadStreamCopyProperty((CFReadStreamRef)[self readStream], kCFStreamPropertyHTTPRequestBytesWrittenCount)) autorelease] unsignedLongLongValue]];
     			if (totalBytesSent > lastBytesSent) {
     				// We've uploaded more data,  reset the timeout
-...
     				#if DEBUG_REQUEST_STATUS
     				if ([self totalBytesSent] == [self postLength]) {
     					NSLog(@"[STATUS] Request %@ finished uploading data",self);
     					ASI_DEBUG_LOG(@"[STATUS] Request %@ finished uploading data",self);
+    				}
     				#endif
+    			}
-...
     - (void)requestFinished
+    {
     #if DEBUG_REQUEST_STATUS || DEBUG_THROTTLING
     	NSLog(@"[STATUS] Request finished: %@",self);
     	ASI_DEBUG_LOG(@"[STATUS] Request finished: %@",self);
     #endif
     	if ([self error] || [self mainRequest]) {
     		return;
-...
     - (void)failWithError:(NSError *)theError
+    {
     #if DEBUG_REQUEST_STATUS || DEBUG_THROTTLING
     	NSLog(@"[STATUS] Request %@: %@",self,(theError == ASIRequestCancelledError ? @"Cancelled" : @"Failed"));
     	ASI_DEBUG_LOG(@"[STATUS] Request %@: %@",self,(theError == ASIRequestCancelledError ? @"Cancelled" : @"Failed"));
     #endif
     	[self setComplete:YES];
-...
     	if (theError && [theError code] != ASIAuthenticationErrorType && [theError code] != ASITooMuchRedirectionErrorType) {
     		[connectionsLock lock];
     		#if DEBUG_PERSISTENT_CONNECTIONS
     		NSLog(@"[CONNECTION] Request #%@ failed and will invalidate connection #%@",[self requestID],[[self connectionInfo] objectForKey:@"id"]);
     		ASI_DEBUG_LOG(@"[CONNECTION] Request #%@ failed and will invalidate connection #%@",[self requestID],[[self connectionInfo] objectForKey:@"id"]);
     		#endif
     		[[self connectionInfo] removeObjectForKey:@"request"];
     		[persistentConnectionsPool removeObject:[self connectionInfo]];
-...
     	#if DEBUG_REQUEST_STATUS
     	if ([self totalBytesSent] == [self postLength]) {
     		NSLog(@"[STATUS] Request %@ received response headers",self);
     		ASI_DEBUG_LOG(@"[STATUS] Request %@ received response headers",self);
+    	}
     	#endif
     	[self setResponseHeaders:[(NSDictionary *)CFHTTPMessageCopyAllHeaderFields(message) autorelease]];
     	[self setResponseHeaders:[NSMakeCollectable(CFHTTPMessageCopyAllHeaderFields(message)) autorelease]];
     	[self setResponseStatusCode:(int)CFHTTPMessageGetResponseStatusCode(message)];
     	[self setResponseStatusMessage:[(NSString *)CFHTTPMessageCopyResponseStatusLine(message) autorelease]];
     	[self setResponseStatusMessage:[NSMakeCollectable(CFHTTPMessageCopyResponseStatusLine(message)) autorelease]];
     	if ([self downloadCache] && ([[self downloadCache] canUseCachedDataForRequest:self])) {
-...
     	} else {
     		#if DEBUG_HTTP_AUTHENTICATION
     		if ([self authenticationScheme]) {
     			NSLog(@"[AUTH] Request %@ has passed %@ authentication",self,[self authenticationScheme]);
     			ASI_DEBUG_LOG(@"[AUTH] Request %@ has passed %@ authentication",self,[self authenticationScheme]);
+    		}
     		#endif
+    	}
-...
     		if (!requestAuthentication && [[self authenticationScheme] isEqualToString:(NSString *)kCFHTTPAuthenticationSchemeBasic] && [self username] && [self password] && [self useSessionPersistence]) {
     			#if DEBUG_HTTP_AUTHENTICATION
     			NSLog(@"[AUTH] Request %@ passed BASIC authentication, and will save credentials in the session store for future use",self);
     			ASI_DEBUG_LOG(@"[AUTH] Request %@ passed BASIC authentication, and will save credentials in the session store for future use",self);
     			#endif
     			NSMutableDictionary *newCredentials = [NSMutableDictionary dictionaryWithCapacity:2];
-...
     		NSString *connectionHeader = [[[self responseHeaders] objectForKey:@"Connection"] lowercaseString];
     		NSString *httpVersion = NSMakeCollectable([(NSString *)CFHTTPMessageCopyVersion(message) autorelease]);
     		NSString *httpVersion = [NSMakeCollectable(CFHTTPMessageCopyVersion(message)) autorelease];
     		// Don't re-use the connection if the server is HTTP 1.0 and didn't send Connection: Keep-Alive
     		if (![httpVersion isEqualToString:(NSString *)kCFHTTPVersion1_0] || [connectionHeader isEqualToString:@"keep-alive"]) {
-...
     						[self setConnectionCanBeReused:YES];
     						[self setPersistentConnectionTimeoutSeconds:timeout];
     						#if DEBUG_PERSISTENT_CONNECTIONS
     							NSLog(@"[CONNECTION] Got a keep-alive header, will keep this connection open for %f seconds", [self persistentConnectionTimeoutSeconds]);
     							ASI_DEBUG_LOG(@"[CONNECTION] Got a keep-alive header, will keep this connection open for %f seconds", [self persistentConnectionTimeoutSeconds]);
     						#endif
+    					}
-...
     				} else {
     					[self setConnectionCanBeReused:YES];
     					#if DEBUG_PERSISTENT_CONNECTIONS
     						NSLog(@"[CONNECTION] Got no keep-alive header, will keep this connection open for %f seconds", [self persistentConnectionTimeoutSeconds]);
     						ASI_DEBUG_LOG(@"[CONNECTION] Got no keep-alive header, will keep this connection open for %f seconds", [self persistentConnectionTimeoutSeconds]);
     					#endif
+    				}
+    			}
-...
     	[self setRequestCookies:[NSMutableArray array]];
     	#if DEBUG_REQUEST_STATUS
     	NSLog(@"[STATUS] Request will redirect (code: %i): %@",responseCode,self);
     	ASI_DEBUG_LOG(@"[STATUS] Request will redirect (code: %i): %@",responseCode,self);
     	#endif
     	return YES;
-...
     	if (user && pass) {
     		#if DEBUG_HTTP_AUTHENTICATION
     		NSLog(@"[AUTH] Request %@ will use credentials set on its url",self);
     		ASI_DEBUG_LOG(@"[AUTH] Request %@ will use credentials set on its url",self);
     		#endif
     	} else {
-...
     			pass = [[self mainRequest] password];
     			#if DEBUG_HTTP_AUTHENTICATION
     			NSLog(@"[AUTH] Request %@ will use credentials from its parent request",self);
     			ASI_DEBUG_LOG(@"[AUTH] Request %@ will use credentials from its parent request",self);
     			#endif
     		// Let's try to use the ones set in this object
-...
     			pass = [self password];
     			#if DEBUG_HTTP_AUTHENTICATION
     			NSLog(@"[AUTH] Request %@ will use username and password properties as credentials",self);
     			ASI_DEBUG_LOG(@"[AUTH] Request %@ will use username and password properties as credentials",self);
     			#endif
+    		}
+    	}
-...
     			pass = [authenticationCredentials password];
     			#if DEBUG_HTTP_AUTHENTICATION
     			if (user && pass) {
     				NSLog(@"[AUTH] Request %@ will use credentials from the keychain",self);
     				ASI_DEBUG_LOG(@"[AUTH] Request %@ will use credentials from the keychain",self);
+    			}
     			#endif
+    		}
-...
     - (void)retryUsingSuppliedCredentials
+    {
     	#if DEBUG_HTTP_AUTHENTICATION
     		NSLog(@"[AUTH] Request %@ received credentials from its delegate or an ASIAuthenticationDialog, will retry",self);
     		ASI_DEBUG_LOG(@"[AUTH] Request %@ received credentials from its delegate or an ASIAuthenticationDialog, will retry",self);
     	#endif
     	//If the url was changed by the delegate, our CFHTTPMessageRef will be NULL and we'll go back to the start
     	if (!request) {
-...
     - (void)cancelAuthentication
+    {
     	#if DEBUG_HTTP_AUTHENTICATION
     		NSLog(@"[AUTH] Request %@ had authentication cancelled by its delegate or an ASIAuthenticationDialog",self);
     		ASI_DEBUG_LOG(@"[AUTH] Request %@ had authentication cancelled by its delegate or an ASIAuthenticationDialog",self);
     	#endif
     	[self performSelector:@selector(failAuthentication) onThread:[[self class] threadForRequest:self] withObject:nil waitUntilDone:NO];
+    }
-...
     		CFHTTPMessageRef responseHeader = (CFHTTPMessageRef) CFReadStreamCopyProperty((CFReadStreamRef)[self readStream],kCFStreamPropertyHTTPResponseHeader);
     		proxyAuthentication = CFHTTPAuthenticationCreateFromResponse(NULL, responseHeader);
     		CFRelease(responseHeader);
     		[self setProxyAuthenticationScheme:[(NSString *)CFHTTPAuthenticationCopyMethod(proxyAuthentication) autorelease]];
     		[self setProxyAuthenticationScheme:[NSMakeCollectable(CFHTTPAuthenticationCopyMethod(proxyAuthentication)) autorelease]];
+    	}
     	// If we haven't got a CFHTTPAuthenticationRef by now, something is badly wrong, so we'll have to give up
-...
     	// Get the authentication realm
     	[self setProxyAuthenticationRealm:nil];
     	if (!CFHTTPAuthenticationRequiresAccountDomain(proxyAuthentication)) {
     		[self setProxyAuthenticationRealm:[(NSString *)CFHTTPAuthenticationCopyRealm(proxyAuthentication) autorelease]];
     		[self setProxyAuthenticationRealm:[NSMakeCollectable(CFHTTPAuthenticationCopyRealm(proxyAuthentication)) autorelease]];
+    	}
     	// See if authentication is valid
-...
     		CFHTTPMessageRef responseHeader = (CFHTTPMessageRef) CFReadStreamCopyProperty((CFReadStreamRef)[self readStream],kCFStreamPropertyHTTPResponseHeader);
     		requestAuthentication = CFHTTPAuthenticationCreateFromResponse(NULL, responseHeader);
     		CFRelease(responseHeader);
     		[self setAuthenticationScheme:[(NSString *)CFHTTPAuthenticationCopyMethod(requestAuthentication) autorelease]];
     		[self setAuthenticationScheme:[NSMakeCollectable(CFHTTPAuthenticationCopyMethod(requestAuthentication)) autorelease]];
+    	}
     	if (!requestAuthentication) {
     		#if DEBUG_HTTP_AUTHENTICATION
     		NSLog(@"[AUTH] Request %@ failed to read authentication information from response headers",self);
     		ASI_DEBUG_LOG(@"[AUTH] Request %@ failed to read authentication information from response headers",self);
     		#endif
     		[self cancelLoad];
-...
     	// Get the authentication realm
     	[self setAuthenticationRealm:nil];
     	if (!CFHTTPAuthenticationRequiresAccountDomain(requestAuthentication)) {
     		[self setAuthenticationRealm:[(NSString *)CFHTTPAuthenticationCopyRealm(requestAuthentication) autorelease]];
     		[self setAuthenticationRealm:[NSMakeCollectable(CFHTTPAuthenticationCopyRealm(requestAuthentication)) autorelease]];
+    	}
     	#if DEBUG_HTTP_AUTHENTICATION
-...
     			realm = @"";
+    		}
     		if ([self authenticationScheme] != (NSString *)kCFHTTPAuthenticationSchemeNTLM || [self authenticationRetryCount] == 0) {
     			NSLog(@"[AUTH] Request %@ received 401 challenge and must authenticate using %@%@",self,[self authenticationScheme],realm);
     			ASI_DEBUG_LOG(@"[AUTH] Request %@ received 401 challenge and must authenticate using %@%@",self,[self authenticationScheme],realm);
     		} else {
     			NSLog(@"[AUTH] Request %@ NTLM handshake step %i",self,[self authenticationRetryCount]+1);
     			ASI_DEBUG_LOG(@"[AUTH] Request %@ NTLM handshake step %i",self,[self authenticationRetryCount]+1);
+    		}
     	#endif
-...
     		if (err.domain == kCFStreamErrorDomainHTTP && (err.error == kCFStreamErrorHTTPAuthenticationBadUserName || err.error == kCFStreamErrorHTTPAuthenticationBadPassword)) {
     			#if DEBUG_HTTP_AUTHENTICATION
     			NSLog(@"[AUTH] Request %@ had bad credentials, will remove them from the session store if they are cached",self);
     			ASI_DEBUG_LOG(@"[AUTH] Request %@ had bad credentials, will remove them from the session store if they are cached",self);
     			#endif
     			// Prevent more than one request from asking for credentials at once
-...
     			if ([self error] || [self isCancelled]) {
     				#if DEBUG_HTTP_AUTHENTICATION
     				NSLog(@"[AUTH] Request %@ failed or was cancelled while waiting to access credentials",self);
     				ASI_DEBUG_LOG(@"[AUTH] Request %@ failed or was cancelled while waiting to access credentials",self);
     				#endif
     				[delegateAuthenticationLock unlock];
-...
     				if (credentials && [self applyCredentials:[credentials objectForKey:@"Credentials"]]) {
     					#if DEBUG_HTTP_AUTHENTICATION
     					NSLog(@"[AUTH] Request %@ will reuse cached credentials from the session (%@)",self,[credentials objectForKey:@"AuthenticationScheme"]);
     					ASI_DEBUG_LOG(@"[AUTH] Request %@ will reuse cached credentials from the session (%@)",self,[credentials objectForKey:@"AuthenticationScheme"]);
     					#endif
     					[delegateAuthenticationLock unlock];
-...
     			if ([self willAskDelegateForCredentials]) {
     				#if DEBUG_HTTP_AUTHENTICATION
     				NSLog(@"[AUTH] Request %@ will ask its delegate for credentials to use",self);
     				ASI_DEBUG_LOG(@"[AUTH] Request %@ will ask its delegate for credentials to use",self);
     				#endif
     				[delegateAuthenticationLock unlock];
-...
     			if ([self showAuthenticationDialog]) {
     				#if DEBUG_HTTP_AUTHENTICATION
     				NSLog(@"[AUTH] Request %@ will ask ASIAuthenticationDialog for credentials",self);
     				ASI_DEBUG_LOG(@"[AUTH] Request %@ will ask ASIAuthenticationDialog for credentials",self);
     				#endif
     				[delegateAuthenticationLock unlock];
-...
+    		}
     		#if DEBUG_HTTP_AUTHENTICATION
     		NSLog(@"[AUTH] Request %@ has no credentials to present and must give up",self);
     		ASI_DEBUG_LOG(@"[AUTH] Request %@ has no credentials to present and must give up",self);
     		#endif
     		[self cancelLoad];
-...
     			// We've failed NTLM authentication twice, we should assume our credentials are wrong
     		} else if ([self authenticationScheme] == (NSString *)kCFHTTPAuthenticationSchemeNTLM && [self authenticationRetryCount ] == 2) {
     			#if DEBUG_HTTP_AUTHENTICATION
     			NSLog(@"[AUTH] Request %@ has failed NTLM authentication",self);
     			ASI_DEBUG_LOG(@"[AUTH] Request %@ has failed NTLM authentication",self);
     			#endif
     			[self failWithError:ASIAuthenticationError];
-...
     		} else {
     			#if DEBUG_HTTP_AUTHENTICATION
     			NSLog(@"[AUTH] Request %@ had credentials and they were not marked as bad, but we got a 401 all the same.",self);
     			ASI_DEBUG_LOG(@"[AUTH] Request %@ had credentials and they were not marked as bad, but we got a 401 all the same.",self);
     			#endif
     			[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIInternalErrorWhileApplyingCredentialsType userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"Failed to apply credentials to request",NSLocalizedDescriptionKey,nil]]];
-...
     		if ([self error] || [self isCancelled]) {
     			#if DEBUG_HTTP_AUTHENTICATION
     			NSLog(@"[AUTH] Request %@ failed or was cancelled while waiting to access credentials",self);
     			ASI_DEBUG_LOG(@"[AUTH] Request %@ failed or was cancelled while waiting to access credentials",self);
     			#endif
     			[delegateAuthenticationLock unlock];
-...
     			if (credentials && [self applyCredentials:[credentials objectForKey:@"Credentials"]]) {
     				#if DEBUG_HTTP_AUTHENTICATION
     				NSLog(@"[AUTH] Request %@ will reuse cached credentials from the session (%@)",self,[credentials objectForKey:@"AuthenticationScheme"]);
     				ASI_DEBUG_LOG(@"[AUTH] Request %@ will reuse cached credentials from the session (%@)",self,[credentials objectForKey:@"AuthenticationScheme"]);
     				#endif
     				[delegateAuthenticationLock unlock];
-...
     				[self startRequest];
     			} else {
     				#if DEBUG_HTTP_AUTHENTICATION
     				NSLog(@"[AUTH] Request %@ failed to apply credentials",self);
     				ASI_DEBUG_LOG(@"[AUTH] Request %@ failed to apply credentials",self);
     				#endif
     				[delegateAuthenticationLock unlock];
     				[self failWithError:[NSError errorWithDomain:NetworkRequestErrorDomain code:ASIInternalErrorWhileApplyingCredentialsType userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"Failed to apply credentials to request",NSLocalizedDescriptionKey,nil]]];
-...
     		if ([self willAskDelegateForCredentials]) {
     			#if DEBUG_HTTP_AUTHENTICATION
     			NSLog(@"[AUTH] Request %@ will ask its delegate for credentials to use",self);
     			ASI_DEBUG_LOG(@"[AUTH] Request %@ will ask its delegate for credentials to use",self);
     			#endif
     			[delegateAuthenticationLock unlock];
-...
     		if ([self showAuthenticationDialog]) {
     			#if DEBUG_HTTP_AUTHENTICATION
     			NSLog(@"[AUTH] Request %@ will ask ASIAuthenticationDialog for credentials",self);
     			ASI_DEBUG_LOG(@"[AUTH] Request %@ will ask ASIAuthenticationDialog for credentials",self);
     			#endif
     			[delegateAuthenticationLock unlock];
-...
+    		}
     		#if DEBUG_HTTP_AUTHENTICATION
     		NSLog(@"[AUTH] Request %@ has no credentials to present and must give up",self);
     		ASI_DEBUG_LOG(@"[AUTH] Request %@ has no credentials to present and must give up",self);
     		#endif
     		[delegateAuthenticationLock unlock];
     		[self failWithError:ASIAuthenticationError];
-...
     	if ([self complete] || [self isCancelled]) {
     		[[self cancelledLock] unlock];
     		[pool release];
     		[pool drain];
     		return;
+    	}
-...
+    	}
     	CFRelease(self);
     	[pool release];
     	[pool drain];
+    }
     - (BOOL)willAskDelegateToConfirmRedirect
-...
+    {
     #if DEBUG_REQUEST_STATUS
     	NSLog(@"[STATUS] Request %@ finished downloading data (%qu bytes)",self, [self totalBytesRead]);
     	ASI_DEBUG_LOG(@"[STATUS] Request %@ finished downloading data (%qu bytes)",self, [self totalBytesRead]);
     #endif
     	[self setStatusTimer:nil];
     	[self setDownloadComplete:YES];
-...
     	[progressLock lock];
     	// Find out how much data we've uploaded so far
     	[self setLastBytesSent:totalBytesSent];
     	[self setTotalBytesSent:[NSMakeCollectable([(NSNumber *)CFReadStreamCopyProperty((CFReadStreamRef)[self readStream], kCFStreamPropertyHTTPRequestBytesWrittenCount) autorelease]) unsignedLongLongValue]];
     	[self setTotalBytesSent:[[NSMakeCollectable(CFReadStreamCopyProperty((CFReadStreamRef)[self readStream], kCFStreamPropertyHTTPRequestBytesWrittenCount)) autorelease] unsignedLongLongValue]];
     	[self setComplete:YES];
     	if (![self contentLength]) {
     		[self setContentLength:[self totalBytesRead]];
-...
+    	}
     	#if DEBUG_PERSISTENT_CONNECTIONS
     	if ([self requestID]) {
     		NSLog(@"[CONNECTION] Request #%@ finished using connection #%@",[self requestID], [[self connectionInfo] objectForKey:@"id"]);
     		ASI_DEBUG_LOG(@"[CONNECTION] Request #%@ finished using connection #%@",[self requestID], [[self connectionInfo] objectForKey:@"id"]);
+    	}
     	#endif
     	[[self connectionInfo] removeObjectForKey:@"request"];
-...
     	// If request has asked delegate or ASIAuthenticationDialog for credentials
     	} else if ([self authenticationNeeded]) {
     		CFRunLoopStop(CFRunLoopGetCurrent());
             // Do nothing.
+    	}
+    }
-...
     	// dealloc won't be called when running with GC, so we'll clean these up now
     	if (request) {
     		CFMakeCollectable(request);
     		CFRelease(request);
     		request = nil;
+    	}
     	if (requestAuthentication) {
     		CFMakeCollectable(requestAuthentication);
     		CFRelease(requestAuthentication);
     		requestAuthentication = nil;
+    	}
     	if (proxyAuthentication) {
     		CFMakeCollectable(proxyAuthentication);
     		CFRelease(proxyAuthentication);
     		proxyAuthentication = nil;
+    	}
         BOOL wasInProgress = inProgress;
-...
         if (!wasFinished)
             [self didChangeValueForKey:@"isFinished"];
     	CFRunLoopStop(CFRunLoopGetCurrent());
     	#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_4_0
     	if ([ASIHTTPRequest isMultitaskingSupported] && [self shouldContinueWhenAppEntersBackground]) {
     		dispatch_async(dispatch_get_main_queue(), ^{
-...
     		[self setWillRetryRequest:NO];
     		#if DEBUG_PERSISTENT_CONNECTIONS
     			NSLog(@"[CONNECTION] Request attempted to use connection #%@, but it has been closed - will retry with a new connection", [[self connectionInfo] objectForKey:@"id"]);
     			ASI_DEBUG_LOG(@"[CONNECTION] Request attempted to use connection #%@, but it has been closed - will retry with a new connection", [[self connectionInfo] objectForKey:@"id"]);
     		#endif
     		[connectionsLock lock];
     		[[self connectionInfo] removeObjectForKey:@"request"];
-...
     		return YES;
+    	}
     	#if DEBUG_PERSISTENT_CONNECTIONS
     		NSLog(@"[CONNECTION] Request attempted to use connection #%@, but it has been closed - we have already retried with a new connection, so we must give up", [[self connectionInfo] objectForKey:@"id"]);
     		ASI_DEBUG_LOG(@"[CONNECTION] Request attempted to use connection #%@, but it has been closed - we have already retried with a new connection, so we must give up", [[self connectionInfo] objectForKey:@"id"]);
     	#endif
     	return NO;
+    }
-...
     - (void)handleStreamError
+    {
     	NSError *underlyingError = NSMakeCollectable([(NSError *)CFReadStreamCopyError((CFReadStreamRef)[self readStream]) autorelease]);
     	NSError *underlyingError = [NSMakeCollectable(CFReadStreamCopyError((CFReadStreamRef)[self readStream])) autorelease];
     	if (![self error]) { // We may already have handled this error
-...
     		} else {
     #if TARGET_OS_IPHONE
     			NSDictionary *proxySettings = NSMakeCollectable([(NSDictionary *)CFNetworkCopySystemProxySettings() autorelease]);
     			NSDictionary *proxySettings = [NSMakeCollectable(CFNetworkCopySystemProxySettings()) autorelease];
     #else
     			NSDictionary *proxySettings = NSMakeCollectable([(NSDictionary *)SCDynamicStoreCopyProxies(NULL) autorelease]);
     			NSDictionary *proxySettings = [NSMakeCollectable(SCDynamicStoreCopyProxies(NULL)) autorelease];
     #endif
     			proxies = NSMakeCollectable([(NSArray *)CFNetworkCopyProxiesForURL((CFURLRef)[self url], (CFDictionaryRef)proxySettings) autorelease]);
     			proxies = [NSMakeCollectable(CFNetworkCopyProxiesForURL((CFURLRef)[self url], (CFDictionaryRef)proxySettings)) autorelease];
     			// Now check to see if the proxy settings contained a PAC url, we need to run the script to get the real list of proxies if so
     			NSDictionary *settings = [proxies objectAtIndex:0];
-...
     		// Obtain the list of proxies by running the autoconfiguration script
     		CFErrorRef err = NULL;
     		NSArray *proxies = NSMakeCollectable([(NSArray *)CFNetworkCopyProxiesForAutoConfigurationScript((CFStringRef)script,(CFURLRef)[self url], &err) autorelease]);
     		NSArray *proxies = [NSMakeCollectable(CFNetworkCopyProxiesForAutoConfigurationScript((CFStringRef)script,(CFURLRef)[self url], &err)) autorelease];
     		if (!err && [proxies count] > 0) {
     			NSDictionary *settings = [proxies objectAtIndex:0];
     			[self setProxyHost:[settings objectForKey:(NSString *)kCFProxyHostNameKey]];
-...
     		NSDictionary *existingConnection = [persistentConnectionsPool objectAtIndex:i];
     		if (![existingConnection objectForKey:@"request"] && [[existingConnection objectForKey:@"expires"] timeIntervalSinceNow] <= 0) {
     #if DEBUG_PERSISTENT_CONNECTIONS
     			NSLog(@"[CONNECTION] Closing connection #%i because it has expired",[[existingConnection objectForKey:@"id"] intValue]);
     			ASI_DEBUG_LOG(@"[CONNECTION] Closing connection #%i because it has expired",[[existingConnection objectForKey:@"id"] intValue]);
     #endif
     			NSInputStream *stream = [existingConnection objectForKey:@"stream"];
     			if (stream) {
-...
+    }
     #pragma mark NSCopying
     - (id)copyWithZone:(NSZone *)zone
+    {
     	// Don't forget - this will return a retained copy!
-...
     	[newRequest setShouldUseRFC2616RedirectBehaviour:[self shouldUseRFC2616RedirectBehaviour]];
     	[newRequest setShouldAttemptPersistentConnection:[self shouldAttemptPersistentConnection]];
     	[newRequest setPersistentConnectionTimeoutSeconds:[self persistentConnectionTimeoutSeconds]];
         [newRequest setAuthenticationScheme:[self authenticationScheme]];
     	return newRequest;
+    }
-...
     		if ([self username] && [self password]) {
     			NSDictionary *usernameAndPassword = [theCredentials objectForKey:@"Credentials"];
     			NSString *storedUsername = [usernameAndPassword objectForKey:(NSString *)kCFHTTPAuthenticationUsername];
     			NSString *storedPassword = [usernameAndPassword objectForKey:(NSString *)kCFHTTPAuthenticationUsername];
     			NSString *storedPassword = [usernameAndPassword objectForKey:(NSString *)kCFHTTPAuthenticationPassword];
     			if (![storedUsername isEqualToString:[self username]] || ![storedPassword isEqualToString:[self password]]) {
     				continue;
+    			}
-...
+    		}
     		return [[defaultUserAgent retain] autorelease];
+    	}
     	return nil;
+    }
     + (void)setDefaultUserAgentString:(NSString *)agent
-...
     	if (!MIMEType) {
     		return @"application/octet-stream";
+    	}
         return NSMakeCollectable([(NSString *)MIMEType autorelease]);
         return [NSMakeCollectable(MIMEType) autorelease];
+    }
     #pragma mark bandwidth measurement / throttling
-...
     				if ([self readStreamIsScheduled]) {
     					[self unscheduleReadStream];
     					#if DEBUG_THROTTLING
     					NSLog(@"[THROTTLING] Sleeping request %@ until after %@",self,throttleWakeUpTime);
     					ASI_DEBUG_LOG(@"[THROTTLING] Sleeping request %@ until after %@",self,throttleWakeUpTime);
     					#endif
+    				}
     			} else {
     				if (![self readStreamIsScheduled]) {
     					[self scheduleReadStream];
     					#if DEBUG_THROTTLING
     					NSLog(@"[THROTTLING] Waking up request %@",self);
     					ASI_DEBUG_LOG(@"[THROTTLING] Waking up request %@",self);
     					#endif
+    				}
+    			}
-...
     #if TARGET_OS_IPHONE
     	[bandwidthThrottlingLock lock];
     	BOOL throttle = isBandwidthThrottled || (!shouldThrottleBandwithForWWANOnly && (maxBandwidthPerSecond > 0));
     	BOOL throttle = isBandwidthThrottled || (!shouldThrottleBandwidthForWWANOnly && (maxBandwidthPerSecond > 0));
     	[bandwidthThrottlingLock unlock];
     	return throttle;
     #else
-...
+    		}
+    	}
     	#if DEBUG_THROTTLING
     	NSLog(@"[THROTTLING] ===Used: %u bytes of bandwidth in last measurement period===",bandwidthUsedInLastSecond);
     	ASI_DEBUG_LOG(@"[THROTTLING] ===Used: %u bytes of bandwidth in last measurement period===",bandwidthUsedInLastSecond);
     	#endif
     	[bandwidthUsageTracker addObject:[NSNumber numberWithUnsignedLong:bandwidthUsedInLastSecond]];
     	[bandwidthMeasurementDate release];
-...
     	// Are we performing bandwidth throttling?
     	if (
     	#if TARGET_OS_IPHONE
     	isBandwidthThrottled || (!shouldThrottleBandwithForWWANOnly && (maxBandwidthPerSecond))
     	isBandwidthThrottled || (!shouldThrottleBandwidthForWWANOnly && (maxBandwidthPerSecond))
     	#else
     	maxBandwidthPerSecond
     	#endif
-...
     		[ASIHTTPRequest setMaxBandwidthPerSecond:0];
     		[bandwidthThrottlingLock lock];
     		isBandwidthThrottled = NO;
     		shouldThrottleBandwithForWWANOnly = NO;
     		shouldThrottleBandwidthForWWANOnly = NO;
     		[bandwidthThrottlingLock unlock];
+    	}
+    }
-...
     + (void)throttleBandwidthForWWANUsingLimit:(unsigned long)limit
+    {
     	[bandwidthThrottlingLock lock];
     	shouldThrottleBandwithForWWANOnly = YES;
     	shouldThrottleBandwidthForWWANOnly = YES;
     	maxBandwidthPerSecond = limit;
     	[ASIHTTPRequest registerForNetworkReachabilityNotifications];
     	[bandwidthThrottlingLock unlock];
-...
         @synchronized(self) {
             return [[defaultCache retain] autorelease];
+        }
     	return nil;
+    }
-...
         BOOL runAlways = YES; // Introduced to cheat Static Analyzer
     	while (runAlways) {
     		NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     		CFRunLoopRun();
     		[pool release];
             CFRunLoopRunInMode(kCFRunLoopDefaultMode, 1.0e10, true);
     		[pool drain];
+    	}
     	// Should never be called, but anyway
-...
         return [[[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding] autorelease];
+    }
     + (NSDate *)expiryDateForRequest:(ASIHTTPRequest *)request maxAge:(NSTimeInterval)maxAge
+    {
     	NSDictionary *responseHeaders = [request responseHeaders];
     	// If we weren't given a custom max-age, lets look for one in the response headers
     	if (!maxAge) {
     		NSString *cacheControl = [[responseHeaders objectForKey:@"Cache-Control"] lowercaseString];
     		if (cacheControl) {
     			NSScanner *scanner = [NSScanner scannerWithString:cacheControl];
     			[scanner scanUpToString:@"max-age" intoString:NULL];
     			if ([scanner scanString:@"max-age" intoString:NULL]) {
     				[scanner scanString:@"=" intoString:NULL];
     				[scanner scanDouble:&maxAge];
+    			}
+    		}
+    	}
     	// RFC 2612 says max-age must override any Expires header
     	if (maxAge) {
     		return [[NSDate date] addTimeInterval:maxAge];
     	} else {
     		NSString *expires = [responseHeaders objectForKey:@"Expires"];
     		if (expires) {
     			return [ASIHTTPRequest dateFromRFC1123String:expires];
+    		}
+    	}
     	return nil;
+    }
     // Based on hints from http://stackoverflow.com/questions/1850824/parsing-a-rfc-822-date-with-nsdateformatter
     + (NSDate *)dateFromRFC1123String:(NSString *)string
+    {
-...
     @synthesize username;
     @synthesize password;
     @synthesize userAgent;
     @synthesize userAgentString;
     @synthesize domain;
     @synthesize proxyUsername;
     @synthesize proxyPassword;

     // Debug output configuration options
     // ======
     // If defined will use the specified function for debug logging
     // Otherwise use NSLog
     #ifndef ASI_DEBUG_LOG
         #define ASI_DEBUG_LOG NSLog
     #endif
     // When set to 1 ASIHTTPRequests will print information about what a request is doing
     #ifndef DEBUG_REQUEST_STATUS
     	#define DEBUG_REQUEST_STATUS 0
-...
     // When set to 1, ASIHTTPRequests will print information about HTTP authentication (Basic, Digest or NTLM) to the console
     #ifndef DEBUG_HTTP_AUTHENTICATION
     #define DEBUG_HTTP_AUTHENTICATION 0
         #define DEBUG_HTTP_AUTHENTICATION 0
     #endif

b/asi-http-request-with-pithos/Classes/ASIInputStream.m
58	58	}
59	59	[request performThrottling];
60	60	}
61		[ASIHTTPRequest incrementBandwidthUsedInLastSecond:toRead];
62	61	[readLock unlock];
63		return [stream read:buffer maxLength:toRead];
	62	NSInteger rv = [stream read:buffer maxLength:toRead];
	63	if (rv > 0)
	64	[ASIHTTPRequest incrementBandwidthUsedInLastSecond:rv];
	65	return rv;
64	66	}
65	67
66	68	/*

     //  Known issue: You cannot use startSychronous with an ASIWebPageRequest
     #import "ASIHTTPRequest.h"
     #import <libxml/HTMLparser.h>
     #import <libxml/xmlsave.h>
     #import <libxml/xpath.h>
     #import <libxml/xpathInternals.h>
     @class ASINetworkQueue;
-...
     	NSMutableDictionary *resourceList;
     	// Used internally for parsing HTML (with libxml)
     	xmlDocPtr doc;
     	struct _xmlDoc *doc;
     	// If the response is an HTML or CSS file, this will be set so the content can be correctly parsed when it has finished fetching external resources
     	ASIWebContentType webContentType;
-...
     	// Controls what ASIWebPageRequest does with external resources. See the notes above for more.
     	ASIURLReplacementMode urlReplacementMode;
     	// When set to NO, loading will stop when an external resource fails to load. Defaults to YES
     	BOOL shouldIgnoreExternalResourceErrors;
+    }
     // Will return a data URI that contains a base64 version of the content at this url
-...
     @property (retain, nonatomic) ASIWebPageRequest *parentRequest;
     @property (assign, nonatomic) ASIURLReplacementMode urlReplacementMode;
     @property (assign, nonatomic) BOOL shouldIgnoreExternalResourceErrors;
     @end

     #import "ASIWebPageRequest.h"
     #import "ASINetworkQueue.h"
     #import <CommonCrypto/CommonHMAC.h>
     #import <libxml/HTMLparser.h>
     #import <libxml/xmlsave.h>
     #import <libxml/xpath.h>
     #import <libxml/xpathInternals.h>
     // 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
-...
+    	}
+    }
     - (id)initWithURL:(NSURL *)newURL
+    {
     	self = [super initWithURL:newURL];
     	[self setShouldIgnoreExternalResourceErrors:YES];
     	return self;
+    }
     - (void)dealloc
+    {
     	[externalResourceQueue cancelAllOperations];
-...
     // We override it to stop that happening, and instead do that work in the bottom of finishedFetchingExternalResources:
     - (void)markAsFinished
+    {
     	if ([self error]) {
     		[super markAsFinished];
+    	}
+    }
     // This method is normally responsible for telling delegates we are done, but it happens to be the most convenient place to parse the responses
-...
     	[[self externalResourceQueue] cancelAllOperations];
     	[self setExternalResourceQueue:[ASINetworkQueue queue]];
     	[[self externalResourceQueue] setDelegate:self];
     	[[self externalResourceQueue] setShouldCancelAllRequestsOnFailure:[self shouldIgnoreExternalResourceErrors]];
     	[[self externalResourceQueue] setShowAccurateProgress:[self showAccurateProgress]];
     	[[self externalResourceQueue] setQueueDidFinishSelector:@selector(finishedFetchingExternalResources:)];
     	[[self externalResourceQueue] setRequestDidFinishSelector:@selector(externalResourceFetchSucceeded:)];
-...
     	[[self externalResourceQueue] cancelAllOperations];
     	[self setExternalResourceQueue:[ASINetworkQueue queue]];
     	[[self externalResourceQueue] setDelegate:self];
     	[[self externalResourceQueue] setShouldCancelAllRequestsOnFailure:[self shouldIgnoreExternalResourceErrors]];
     	[[self externalResourceQueue] setShowAccurateProgress:[self showAccurateProgress]];
     	[[self externalResourceQueue] setQueueDidFinishSelector:@selector(finishedFetchingExternalResources:)];
     	[[self externalResourceQueue] setRequestDidFinishSelector:@selector(externalResourceFetchSucceeded:)];
-...
     - (void)externalResourceFetchFailed:(ASIHTTPRequest *)externalResourceRequest
+    {
     	[self failWithError:[externalResourceRequest error]];
     	if ([[self externalResourceQueue] shouldCancelAllRequestsOnFailure]) {
     		[self failWithError:[externalResourceRequest error]];
+    	}
+    }
     - (void)finishedFetchingExternalResources:(ASINetworkQueue *)queue
-...
     @synthesize resourceList;
     @synthesize parentRequest;
     @synthesize urlReplacementMode;
     @synthesize shouldIgnoreExternalResourceErrors;
     @end

     // Response:
     // X-CDN-Enabled: True
     // X-CDN-URI: http://cdn.cloudfiles.mosso.com/c1234
     // X-CDN-SSL-URI: https://cdn.ssl.cloudfiles.mosso.com/c1234
     // X-CDN-TTL: 86400
     + (id)containerInfoRequest:(NSString *)containerName;
     - (BOOL)cdnEnabled;
     - (NSString *)cdnURI;
     - (NSString *)cdnSSLURI;
     - (NSUInteger)cdnTTL;

+    }
     - (BOOL)cdnEnabled {
     	return [[[self responseHeaders] objectForKey:@"X-Cdn-Enabled"] boolValue];
         NSNumber *enabled = [[self responseHeaders] objectForKey:@"X-CDN-Enabled"];
         if (!enabled) {
             enabled = [[self responseHeaders] objectForKey:@"X-Cdn-Enabled"];
+        }
     	return [enabled boolValue];
+    }
     - (NSString *)cdnURI {
     	return [[self responseHeaders] objectForKey:@"X-Cdn-Uri"];
     	NSString *uri = [[self responseHeaders] objectForKey:@"X-CDN-URI"];
         if (!uri) {
             uri = [[self responseHeaders] objectForKey:@"X-Cdn-Uri"];
+        }
         return uri;
+    }
     - (NSString *)cdnSSLURI {
         NSString *uri = [[self responseHeaders] objectForKey:@"X-CDN-SSL-URI"];
         if (!uri) {
             uri = [[self responseHeaders] objectForKey:@"X-Cdn-Ssl-Uri"];
+        }
     	return uri;
+    }
     - (NSUInteger)cdnTTL {
     	return [[[self responseHeaders] objectForKey:@"X-Ttl"] intValue];
         NSNumber *ttl = [[self responseHeaders] objectForKey:@"X-TTL"];
         if (!ttl) {
             ttl = [[self responseHeaders] objectForKey:@"X-Ttl"];
+        }
         return [ttl intValue];
+    }
     #pragma mark -
-...
     	if (ttl > 0) {
     		[request addRequestHeader:@"X-Ttl" value:[NSString stringWithFormat:@"%i", ttl]];
+    	}
     	[request addRequestHeader:@"X-Cdn-Enabled" value:cdnEnabled ? @"True" : @"False"];
     	[request addRequestHeader:@"X-CDN-Enabled" value:cdnEnabled ? @"True" : @"False"];
     	return request;
+    }

     -(void) dealloc {
     	[name release];
     	[cdnURL release];
     	[referrerACL release];
     	[useragentACL release];
     	[super dealloc];
+    }

... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff

Synnefo » Pithos MacOS & iOS Common Lib

Revision cc176feb