Ben Copsey

Merge branch 'master' of https://github.com/0xced/asi-http-request into 0xced-master

@@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
12 @interface ASIDownloadCache : NSObject <ASICacheDelegate> { 12 @interface ASIDownloadCache : NSObject <ASICacheDelegate> {
13 13
14 // The default cache policy for this cache 14 // The default cache policy for this cache
15 - // Requests that store data in the cache will use this cache policy if their cache policy is set to ASIDefaultCachePolicy 15 + // Requests that store data in the cache will use this cache policy if their cache policy is set to ASIUseDefaultCachePolicy
16 - // Defaults to ASIReloadIfDifferentCachePolicy 16 + // Defaults to ASIAskServerIfModifiedWhenStaleCachePolicy
17 ASICachePolicy defaultCachePolicy; 17 ASICachePolicy defaultCachePolicy;
18 18
19 // The directory in which cached data will be stored 19 // The directory in which cached data will be stored
@@ -287,7 +287,7 @@ typedef void (^ASIDataBlock)(NSData *data); @@ -287,7 +287,7 @@ typedef void (^ASIDataBlock)(NSData *data);
287 // Called on the delegate (if implemented) when the request starts. Default is requestStarted: 287 // Called on the delegate (if implemented) when the request starts. Default is requestStarted:
288 SEL didStartSelector; 288 SEL didStartSelector;
289 289
290 - // Called on the delegate (if implemented) when the request receives response headers. Default is requestDidReceiveResponseHeaders: 290 + // Called on the delegate (if implemented) when the request receives response headers. Default is request:didReceiveResponseHeaders:
291 SEL didReceiveResponseHeadersSelector; 291 SEL didReceiveResponseHeadersSelector;
292 292
293 // Called on the delegate (if implemented) when the request receives a Location header and shouldRedirect is YES 293 // Called on the delegate (if implemented) when the request receives a Location header and shouldRedirect is YES
@@ -22,5 +22,12 @@ @@ -22,5 +22,12 @@
22 <string>1.0</string> 22 <string>1.0</string>
23 <key>NSMainNibFile</key> 23 <key>NSMainNibFile</key>
24 <string>iPadMainWindow</string> 24 <string>iPadMainWindow</string>
  25 + <key>UISupportedInterfaceOrientations</key>
  26 + <array>
  27 + <string>UIInterfaceOrientationPortrait</string>
  28 + <string>UIInterfaceOrientationPortraitUpsideDown</string>
  29 + <string>UIInterfaceOrientationLandscapeLeft</string>
  30 + <string>UIInterfaceOrientationLandscapeRight</string>
  31 + </array>
25 </dict> 32 </dict>
26 </plist> 33 </plist>
This diff was suppressed by a .gitattributes entry.