Merge branch 'master' into arcified

lukeredpath · Jun 30, 2011 · 012a6ea · 012a6ea
2 parents d13be27 + 5378a50
commit 012a6ea
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/Classes/LRRestyResponse.m b/Classes/LRRestyResponse.m
@@ -13,6 +13,8 @@
 
 NSDictionary *extractCookiesFromHeaders(NSDictionary *headers, NSURL *url)
 {
+  if (headers == nil) return [NSDictionary dictionary];
+
   NSMutableDictionary *cookies = [NSMutableDictionary dictionary];
   for (NSHTTPCookie *cookie in [NSHTTPCookie cookiesWithResponseHeaderFields:headers forURL:url]) {
     [cookies setObject:cookie forKey:cookie.name];

diff --git a/LRResty.xcodeproj/project.pbxproj b/LRResty.xcodeproj/project.pbxproj
@@ -1459,6 +1459,8 @@
 				GCC_PREFIX_HEADER = "LRResty/LRResty-Prefix.pch";
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = /usr/local/lib;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PRODUCT_NAME = LRResty;
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = iphoneos;
@@ -1478,6 +1480,8 @@
 				GCC_PREFIX_HEADER = "LRResty/LRResty-Prefix.pch";
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INSTALL_PATH = /usr/local/lib;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PRODUCT_NAME = LRResty;
 				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = iphoneos;
@@ -1584,6 +1588,7 @@
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = Tests/Support;
 				INFOPLIST_FILE = "Resources/Acceptance Tests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
@@ -1617,6 +1622,7 @@
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = Tests/Support;
 				INFOPLIST_FILE = "Resources/Acceptance Tests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
@@ -1700,6 +1706,7 @@
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = Tests/Support;
 				INFOPLIST_FILE = "Resources/Acceptance Tests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,
@@ -1732,6 +1739,7 @@
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = Tests/Support;
 				INFOPLIST_FILE = "Resources/Acceptance Tests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.0;
 				OTHER_LDFLAGS = (
 					"-framework",
 					Foundation,

diff --git a/Tests/Acceptance/StreamingTests.m b/Tests/Acceptance/StreamingTests.m
@@ -32,12 +32,12 @@ - (void)testCanPerformGetRequestAndStreamResponse
 
 - (void)testCancellationUsingTwitterStream;
 {
-  NSMutableArray *chunks = [NSMutableArray array];
+  __block NSMutableArray *chunks = [NSMutableArray array];
 
   [client setUsername:TwitterUsername password:TwitterPassword];
 
   [client get:@"http://stream.twitter.com/1/statuses/sample.json"
-    onData:^(NSData *chunk, BOOL *cancel) {
+       onData:^(NSData *chunk, BOOL *cancel) {
       if (chunk) {
         [chunks addObject:chunk];
       }