Ben Copsey

Ensure sync requests on main thread call blocks synchronously

Fix blocks test
... ... @@ -24,7 +24,7 @@
#import "ASIDataCompressor.h"
// Automatically set on build
NSString *ASIHTTPRequestVersion = @"v1.7-125 2010-10-31";
NSString *ASIHTTPRequestVersion = @"v1.7-126 2010-10-31";
NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
... ... @@ -1672,7 +1672,7 @@ static NSOperationQueue *sharedQueue = nil;
#if NS_BLOCKS_AVAILABLE
- (void)performBlockOnMainThread:(ASIBasicBlock)block
{
[self performSelectorOnMainThread:@selector(callBlock:) withObject:[[block copy] autorelease] waitUntilDone:NO];
[self performSelectorOnMainThread:@selector(callBlock:) withObject:[[block copy] autorelease] waitUntilDone:[NSThread isMainThread]];
}
- (void)callBlock:(ASIBasicBlock)block
... ...
... ... @@ -69,9 +69,9 @@
GHAssertTrue(receivedHeaders,@"Failed to call received headers block");
GHAssertTrue(complete,@"Failed to call completed block");
BOOL success = (totalBytesReceived == 130050);
BOOL success = (totalBytesReceived == 457);
GHAssertTrue(success,@"Failed to call bytes received block, or got wrong amount of data");
success = (totalDownloadSize == 130050);
success = (totalDownloadSize == 457);
GHAssertTrue(success,@"Failed to call download size increment block");
success = (totalBytesSent == [dataToSend length]);
... ...