Permalink
Browse files

Merge branch 'master' into newlayout

  • Loading branch information...
2 parents 9e22dfb + 9c9e328 commit 32e18c03ff5a96516ec4e62e5b1f24258dbc1a98 @pokeb committed Mar 22, 2009
Showing with 6 additions and 0 deletions.
  1. +4 −0 Classes/ASIHTTPRequest.h
  2. +2 −0 Classes/ASIHTTPRequest.m
View
@@ -181,6 +181,9 @@ typedef enum _ASINetworkErrorType {
NSStringEncoding responseEncoding;
BOOL allowResumeForFileDownloads;
+
+ // Custom user information assosiated with the request
+ NSDictionary *userInfo;
}
#pragma mark init / dealloc
@@ -342,4 +345,5 @@ typedef enum _ASINetworkErrorType {
@property (assign) NSStringEncoding responseEncoding;
@property (assign) BOOL allowCompressedResponse;
@property (assign) BOOL allowResumeForFileDownloads;
+@property (retain) NSDictionary *userInfo;
@end
View
@@ -90,6 +90,7 @@ - (id)initWithURL:(NSURL *)newURL
[self setDidFinishSelector:@selector(requestFinished:)];
[self setDidFailSelector:@selector(requestFailed:)];
[self setDelegate:nil];
+ [self setUserInfo:nil];
url = [newURL retain];
cancelledLock = [[NSLock alloc] init];
return self;
@@ -1462,4 +1463,5 @@ + (int)uncompressZippedDataFromSource:(FILE *)source toDestination:(FILE *)dest
@synthesize responseEncoding;
@synthesize allowCompressedResponse;
@synthesize allowResumeForFileDownloads;
+@synthesize userInfo;
@end

0 comments on commit 32e18c0

Please sign in to comment.