Showing
5 changed files
with
5 additions
and
5 deletions
| @@ -262,7 +262,6 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy | @@ -262,7 +262,6 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy | ||
| 262 | [self setLastActivityTime:[[NSDate new] autorelease]]; | 262 | [self setLastActivityTime:[[NSDate new] autorelease]]; |
| 263 | 263 | ||
| 264 | // Wait for the request to finish | 264 | // Wait for the request to finish |
| 265 | - NSDate* endDate = [NSDate distantFuture]; | ||
| 266 | while (!complete) { | 265 | while (!complete) { |
| 267 | 266 | ||
| 268 | //See if we need to timeout | 267 | //See if we need to timeout |
| @@ -283,8 +282,9 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy | @@ -283,8 +282,9 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy | ||
| 283 | break; | 282 | break; |
| 284 | } | 283 | } |
| 285 | [self updateProgressIndicators]; | 284 | [self updateProgressIndicators]; |
| 286 | - CFRunLoopRunInMode(ASIHTTPRequestRunMode,0.5,YES); | 285 | + |
| 287 | - //[[NSRunLoop currentRunLoop] runMode:NSRunLoopCommonModes beforeDate:endDate]; | 286 | + //This thread should wait for 1/4 second for the stream to do something. We'll stop early if it does. |
| 287 | + CFRunLoopRunInMode(ASIHTTPRequestRunMode,0.25,YES); | ||
| 288 | } | 288 | } |
| 289 | 289 | ||
| 290 | [pool release]; | 290 | [pool release]; |
| @@ -227,7 +227,7 @@ More tests needed for: | @@ -227,7 +227,7 @@ More tests needed for: | ||
| 227 | foundCookie = YES; | 227 | foundCookie = YES; |
| 228 | success = [[cookie decodedValue] isEqualToString:@"This is the value"]; | 228 | success = [[cookie decodedValue] isEqualToString:@"This is the value"]; |
| 229 | STAssertTrue(success,@"Failed to store the correct value for a cookie"); | 229 | STAssertTrue(success,@"Failed to store the correct value for a cookie"); |
| 230 | - success = [[cookie domain] isEqualToString:@".allseeing-i.com"]; | 230 | + success = [[cookie domain] isEqualToString:@"allseeing-i.com"]; |
| 231 | STAssertTrue(success,@"Failed to store the correct domain for a cookie"); | 231 | STAssertTrue(success,@"Failed to store the correct domain for a cookie"); |
| 232 | success = [[cookie path] isEqualToString:@"/asi-http-request/tests"]; | 232 | success = [[cookie path] isEqualToString:@"/asi-http-request/tests"]; |
| 233 | STAssertTrue(success,@"Failed to store the correct path for a cookie"); | 233 | STAssertTrue(success,@"Failed to store the correct path for a cookie"); |
| @@ -279,7 +279,7 @@ More tests needed for: | @@ -279,7 +279,7 @@ More tests needed for: | ||
| 279 | NSDictionary *cookieProperties = [[[NSMutableDictionary alloc] init] autorelease]; | 279 | NSDictionary *cookieProperties = [[[NSMutableDictionary alloc] init] autorelease]; |
| 280 | [cookieProperties setValue:@"Test Value" forKey:NSHTTPCookieValue]; | 280 | [cookieProperties setValue:@"Test Value" forKey:NSHTTPCookieValue]; |
| 281 | [cookieProperties setValue:@"ASIHTTPRequestTestCookie" forKey:NSHTTPCookieName]; | 281 | [cookieProperties setValue:@"ASIHTTPRequestTestCookie" forKey:NSHTTPCookieName]; |
| 282 | - [cookieProperties setValue:@".allseeing-i.com" forKey:NSHTTPCookieDomain]; | 282 | + [cookieProperties setValue:@"allseeing-i.com" forKey:NSHTTPCookieDomain]; |
| 283 | [cookieProperties setValue:[NSDate dateWithTimeIntervalSinceNow:60*60*4] forKey:NSHTTPCookieExpires]; | 283 | [cookieProperties setValue:[NSDate dateWithTimeIntervalSinceNow:60*60*4] forKey:NSHTTPCookieExpires]; |
| 284 | [cookieProperties setValue:@"/asi-http-request/tests" forKey:NSHTTPCookiePath]; | 284 | [cookieProperties setValue:@"/asi-http-request/tests" forKey:NSHTTPCookiePath]; |
| 285 | cookie = [[[NSHTTPCookie alloc] initWithProperties:cookieProperties] autorelease]; | 285 | cookie = [[[NSHTTPCookie alloc] initWithProperties:cookieProperties] autorelease]; |
This diff is collapsed. Click to expand it.
This diff could not be displayed because it is too large.
This diff was suppressed by a .gitattributes entry.
-
Please register or login to post a comment