Merge branch 'master' of git://github.com/houyr/three20 into houyr/ma…

…ster
facebookarchive · Apr 17, 2009 · 3569cc1 · 3569cc1
2 parents e0e37fd + fe17419
commit 3569cc1
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/src/TTURLRequest.m b/src/TTURLRequest.m
@@ -15,7 +15,7 @@ @implementation TTURLRequest
   httpBody = _httpBody, parameters = _parameters, contentType = _contentType,
   cachePolicy = _cachePolicy, cacheExpirationAge = _cacheExpirationAge, cacheKey = _cacheKey,
   timestamp = _timestamp, userInfo = _userInfo, isLoading = _isLoading,
-  shouldHandleCookies = _shouldHandleCookies, respondedFromCache = _respondedFromCache;
+  shouldHandleCookies = _shouldHandleCookies, respondedFromCache = _respondedFromCache, headers = _headers;
 
 + (TTURLRequest*)request {
   return [[[TTURLRequest alloc] init] autorelease];
@@ -67,6 +67,7 @@ - (void)dealloc {
   [_timestamp release];
   [_cacheKey release];
   [_userInfo release];
+  [_headers release];
   [super dealloc];
 }
 
@@ -161,6 +162,13 @@ - (NSData*)generatePostBody {
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
+- (void)setValue:(NSString *)value forHTTPHeaderField:(NSString *)field {
+	if (!_headers) {
+		_headers = [[NSMutableDictionary alloc] init];
+	}
+	[_headers setObject:value forKey:field];
+}
+
 - (NSMutableDictionary*)parameters {
   if (!_parameters) {
     _parameters = [[NSMutableDictionary alloc] init];

diff --git a/src/TTURLRequestQueue.m b/src/TTURLRequestQueue.m
@@ -110,6 +110,14 @@ - (void)connectToURL:(NSURL*)url {
     if (body) {
       [urlRequest setHTTPBody:body];
     }
+
+	NSMutableDictionary *headers = request.headers;
+	if (headers && [headers count] > 0){
+	  for (NSString *key in headers) {
+		[urlRequest setValue:[headers objectForKey:key] forHTTPHeaderField:key];
+	  }
+	}
+
   }
 
   _connection = [[NSURLConnection alloc] initWithRequest:urlRequest delegate:self];

diff --git a/src/Three20/TTURLRequest.h b/src/Three20/TTURLRequest.h
@@ -7,6 +7,7 @@
   NSString* _httpMethod;
   NSData* _httpBody;
   NSMutableDictionary* _parameters;
+  NSMutableDictionary* _headers;
   NSString* _contentType;
   NSMutableArray* _delegates;
   id<TTURLResponse> _response;
@@ -20,6 +21,11 @@
   BOOL _respondedFromCache;
 }
 
+/**
+ * custom request headers
+ */
+@property(nonatomic,readonly) NSMutableDictionary* headers;
+
 /**
  * An object that receives messages about the progress of the request.
  */
@@ -101,6 +107,11 @@
  */
 - (void)cancel;
 
+/**
+ * Sets the specified HTTP header field.
+ */
+- (void)setValue:(NSString *)value forHTTPHeaderField:(NSString *)field;
+
 @end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////