Merge branch 'master' of github.com:pokeb/asi-http-request

@@ -10,3 +10,4 @@ profile
 *.pbxuser
 *.pbxuser
 *.mode1v3
 *.mode1v3
 External/GHUnit/*
 External/GHUnit/*
+.svn

@@ -189,7 +189,7 @@
 		// Make sure nothing went wrong
 		// Make sure nothing went wrong
 		if ([inputStream streamStatus] == NSStreamEventErrorOccurred) {
 		if ([inputStream streamStatus] == NSStreamEventErrorOccurred) {
 			if (err) {
 			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];
 			[compressor closeStream];
 			return NO;
 			return NO;

@@ -186,7 +186,7 @@
 		// Make sure nothing went wrong
 		// Make sure nothing went wrong
 		if ([inputStream streamStatus] == NSStreamEventErrorOccurred) {
 		if ([inputStream streamStatus] == NSStreamEventErrorOccurred) {
 			if (err) {
 			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];
 			[decompressor closeStream];
 			return NO;
 			return NO;

@@ -105,7 +105,7 @@ static BOOL isBandwidthThrottled = NO;
 
 
 // When YES, bandwidth will be automatically throttled when using WWAN (3G/Edge/GPRS)
 // When YES, bandwidth will be automatically throttled when using WWAN (3G/Edge/GPRS)
 // Wifi will not be throttled
 // Wifi will not be throttled
-static BOOL shouldThrottleBandwithForWWANOnly = NO;
+static BOOL shouldThrottleBandwidthForWWANOnly = NO;
 #endif
 #endif
 
 
 // Mediates access to the session cookies so requests
 // Mediates access to the session cookies so requests
@@ -4080,6 +4080,7 @@ static NSOperationQueue *sharedQueue = nil;
 	[newRequest setShouldUseRFC2616RedirectBehaviour:[self shouldUseRFC2616RedirectBehaviour]];
 	[newRequest setShouldUseRFC2616RedirectBehaviour:[self shouldUseRFC2616RedirectBehaviour]];
 	[newRequest setShouldAttemptPersistentConnection:[self shouldAttemptPersistentConnection]];
 	[newRequest setShouldAttemptPersistentConnection:[self shouldAttemptPersistentConnection]];
 	[newRequest setPersistentConnectionTimeoutSeconds:[self persistentConnectionTimeoutSeconds]];
 	[newRequest setPersistentConnectionTimeoutSeconds:[self persistentConnectionTimeoutSeconds]];
+    [newRequest setAuthenticationScheme:[self authenticationScheme]];
 	return newRequest;
 	return newRequest;
 }
 }
 
 
@@ -4492,7 +4493,7 @@ static NSOperationQueue *sharedQueue = nil;
 #if TARGET_OS_IPHONE
 #if TARGET_OS_IPHONE
 	[bandwidthThrottlingLock lock];
 	[bandwidthThrottlingLock lock];
 
 
-	BOOL throttle = isBandwidthThrottled || (!shouldThrottleBandwithForWWANOnly && (maxBandwidthPerSecond > 0));
+	BOOL throttle = isBandwidthThrottled || (!shouldThrottleBandwidthForWWANOnly && (maxBandwidthPerSecond > 0));
 	[bandwidthThrottlingLock unlock];
 	[bandwidthThrottlingLock unlock];
 	return throttle;
 	return throttle;
 #else
 #else
@@ -4572,7 +4573,7 @@ static NSOperationQueue *sharedQueue = nil;
 	// Are we performing bandwidth throttling?
 	// Are we performing bandwidth throttling?
 	if (
 	if (
 	#if TARGET_OS_IPHONE
 	#if TARGET_OS_IPHONE
-	isBandwidthThrottled || (!shouldThrottleBandwithForWWANOnly && (maxBandwidthPerSecond))
+	isBandwidthThrottled || (!shouldThrottleBandwidthForWWANOnly && (maxBandwidthPerSecond))
 	#else
 	#else
 	maxBandwidthPerSecond
 	maxBandwidthPerSecond
 	#endif
 	#endif
@@ -4624,7 +4625,7 @@ static NSOperationQueue *sharedQueue = nil;
 		[ASIHTTPRequest setMaxBandwidthPerSecond:0];
 		[ASIHTTPRequest setMaxBandwidthPerSecond:0];
 		[bandwidthThrottlingLock lock];
 		[bandwidthThrottlingLock lock];
 		isBandwidthThrottled = NO;
 		isBandwidthThrottled = NO;
-		shouldThrottleBandwithForWWANOnly = NO;
+		shouldThrottleBandwidthForWWANOnly = NO;
 		[bandwidthThrottlingLock unlock];
 		[bandwidthThrottlingLock unlock];
 	}
 	}
 }
 }
@@ -4632,7 +4633,7 @@ static NSOperationQueue *sharedQueue = nil;
 + (void)throttleBandwidthForWWANUsingLimit:(unsigned long)limit
 + (void)throttleBandwidthForWWANUsingLimit:(unsigned long)limit
 {	
 {	
 	[bandwidthThrottlingLock lock];
 	[bandwidthThrottlingLock lock];
-	shouldThrottleBandwithForWWANOnly = YES;
+	shouldThrottleBandwidthForWWANOnly = YES;
 	maxBandwidthPerSecond = limit;
 	maxBandwidthPerSecond = limit;
 	[ASIHTTPRequest registerForNetworkReachabilityNotifications];	
 	[ASIHTTPRequest registerForNetworkReachabilityNotifications];	
 	[bandwidthThrottlingLock unlock];
 	[bandwidthThrottlingLock unlock];

@@ -22,6 +22,9 @@
 
 
 -(void) dealloc {
 -(void) dealloc {
 	[name release];
 	[name release];
+	[cdnURL release];
+	[referrerACL release];
+	[useragentACL release];
 	[super dealloc];
 	[super dealloc];
 }
 }
 
 

@@ -29,4 +29,13 @@
 @synthesize creationDate;
 @synthesize creationDate;
 @synthesize ownerID;
 @synthesize ownerID;
 @synthesize ownerName;
 @synthesize ownerName;
+
+- (void)dealloc
+{
+	[name release];
+	[creationDate release];
+	[ownerID release];
+	[ownerName release];
+}
+
 @end
 @end

@@ -115,6 +115,12 @@
     }
     }
 }
 }
 
 
+- (void)dealloc
+{
+    [popoverController release];
+    [rootPopoverButtonItem release];
+    [super dealloc];
+}
 
 
 @synthesize splitViewController;
 @synthesize splitViewController;
 @synthesize popoverController;
 @synthesize popoverController;