iOS / asi-http-request

Go to a project
Toggle navigation Toggle navigation pinning
You need to sign in or sign up before continuing.
Ben Copsey
0fbb9740 1 parent 076dc89e

Fix a problem with credentials not being recreated when a new username and passw… 

…ord are supplied after a first failure
Turn off unit test injection in example app so it won't confuse people
Expand all
Inline Side-by-side
Showing 3 changed files with 35 additions and 19 deletions
@@ -51,7 +51,7 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy @@ -51,7 +51,7 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
51 //credentials = NULL; 51 //credentials = NULL;
52 request = NULL; 52 request = NULL;
53 responseHeaders = nil; 53 responseHeaders = nil;
54 - [self setTimeOutSeconds:30]; 54 + [self setTimeOutSeconds:10];
55 [self setUseKeychainPersistance:NO]; 55 [self setUseKeychainPersistance:NO];
56 [self setUseSessionPersistance:YES]; 56 [self setUseSessionPersistance:YES];
57 [self setUseCookiePersistance:YES]; 57 [self setUseCookiePersistance:YES];
@@ -603,6 +603,9 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy @@ -603,6 +603,9 @@ static void ReadStreamClientCallBack(CFReadStreamRef readStream, CFStreamEventTy
603 603
604 // check for bad credentials, so we can give the delegate a chance to replace them 604 // check for bad credentials, so we can give the delegate a chance to replace them
605 if (err.domain == kCFStreamErrorDomainHTTP && (err.error == kCFStreamErrorHTTPAuthenticationBadUserName || err.error == kCFStreamErrorHTTPAuthenticationBadPassword)) { 605 if (err.domain == kCFStreamErrorDomainHTTP && (err.error == kCFStreamErrorHTTPAuthenticationBadUserName || err.error == kCFStreamErrorHTTPAuthenticationBadPassword)) {
  606 +
  607 + [self setRequestCredentials:nil];
  608 +
606 ignoreError = YES; 609 ignoreError = YES;
607 [self setLastActivityTime:nil]; 610 [self setLastActivityTime:nil];
608 if ([delegate respondsToSelector:@selector(authorizationNeededForRequest:)]) { 611 if ([delegate respondsToSelector:@selector(authorizationNeededForRequest:)]) {
@@ -279,8 +279,8 @@ @@ -279,8 +279,8 @@
279 <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> 279 <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
280 <array> 280 <array>
281 <array> 281 <array>
282 - <integer>4</integer> 282 + <integer>11</integer>
283 - <integer>2</integer> 283 + <integer>5</integer>
284 <integer>0</integer> 284 <integer>0</integer>
285 </array> 285 </array>
286 </array> 286 </array>
@@ -322,7 +322,7 @@ @@ -322,7 +322,7 @@
322 <key>PBXProjectModuleGUID</key> 322 <key>PBXProjectModuleGUID</key>
323 <string>1CE0B20306471E060097A5F4</string> 323 <string>1CE0B20306471E060097A5F4</string>
324 <key>PBXProjectModuleLabel</key> 324 <key>PBXProjectModuleLabel</key>
325 - <string>ASIHTTPRequestTests.m</string> 325 + <string>ASIHTTPRequest.m</string>
326 <key>PBXSplitModuleInNavigatorKey</key> 326 <key>PBXSplitModuleInNavigatorKey</key>
327 <dict> 327 <dict>
328 <key>Split0</key> 328 <key>Split0</key>
@@ -330,11 +330,11 @@ @@ -330,11 +330,11 @@
330 <key>PBXProjectModuleGUID</key> 330 <key>PBXProjectModuleGUID</key>
331 <string>1CE0B20406471E060097A5F4</string> 331 <string>1CE0B20406471E060097A5F4</string>
332 <key>PBXProjectModuleLabel</key> 332 <key>PBXProjectModuleLabel</key>
333 - <string>ASIHTTPRequestTests.m</string> 333 + <string>ASIHTTPRequest.m</string>
334 <key>_historyCapacity</key> 334 <key>_historyCapacity</key>
335 <integer>0</integer> 335 <integer>0</integer>
336 <key>bookmark</key> 336 <key>bookmark</key>
337 - <string>B5B297070E7BCA3D000B04CD</string> 337 + <string>B5B297440E7BCD91000B04CD</string>
338 <key>history</key> 338 <key>history</key>
339 <array> 339 <array>
340 <string>B5731B8B0E4310180008024F</string> 340 <string>B5731B8B0E4310180008024F</string>
@@ -347,14 +347,14 @@ @@ -347,14 +347,14 @@
347 <string>B500B54C0E635A3200744D82</string> 347 <string>B500B54C0E635A3200744D82</string>
348 <string>B5CF35640E7A7B2C0050CBA7</string> 348 <string>B5CF35640E7A7B2C0050CBA7</string>
349 <string>B5B2969F0E7BC6C7000B04CD</string> 349 <string>B5B2969F0E7BC6C7000B04CD</string>
350 - <string>B5B296A10E7BC6C7000B04CD</string>  
351 - <string>B5B296BB0E7BC7E3000B04CD</string>  
352 <string>B5B296BC0E7BC7E3000B04CD</string> 350 <string>B5B296BC0E7BC7E3000B04CD</string>
353 <string>B5B296CC0E7BC846000B04CD</string> 351 <string>B5B296CC0E7BC846000B04CD</string>
354 - <string>B5B296FF0E7BCA3D000B04CD</string>  
355 - <string>B5B297000E7BCA3D000B04CD</string>  
356 <string>B5B297010E7BCA3D000B04CD</string> 352 <string>B5B297010E7BCA3D000B04CD</string>
357 - <string>B5B297020E7BCA3D000B04CD</string> 353 + <string>B5B297120E7BCB58000B04CD</string>
  354 + <string>B5B297340E7BCD41000B04CD</string>
  355 + <string>B5B297350E7BCD41000B04CD</string>
  356 + <string>B5B2973E0E7BCD91000B04CD</string>
  357 + <string>B5B2973F0E7BCD91000B04CD</string>
358 </array> 358 </array>
359 <key>prevStack</key> 359 <key>prevStack</key>
360 <array> 360 <array>
@@ -412,6 +412,18 @@ @@ -412,6 +412,18 @@
412 <string>B5B297040E7BCA3D000B04CD</string> 412 <string>B5B297040E7BCA3D000B04CD</string>
413 <string>B5B297050E7BCA3D000B04CD</string> 413 <string>B5B297050E7BCA3D000B04CD</string>
414 <string>B5B297060E7BCA3D000B04CD</string> 414 <string>B5B297060E7BCA3D000B04CD</string>
  415 + <string>B5B297140E7BCB58000B04CD</string>
  416 + <string>B5B297150E7BCB58000B04CD</string>
  417 + <string>B5B297280E7BCC8B000B04CD</string>
  418 + <string>B5B297370E7BCD41000B04CD</string>
  419 + <string>B5B297380E7BCD41000B04CD</string>
  420 + <string>B5B297390E7BCD41000B04CD</string>
  421 + <string>B5B2973A0E7BCD41000B04CD</string>
  422 + <string>B5B2973B0E7BCD41000B04CD</string>
  423 + <string>B5B297400E7BCD91000B04CD</string>
  424 + <string>B5B297410E7BCD91000B04CD</string>
  425 + <string>B5B297420E7BCD91000B04CD</string>
  426 + <string>B5B297430E7BCD91000B04CD</string>
415 </array> 427 </array>
416 </dict> 428 </dict>
417 <key>SplitCount</key> 429 <key>SplitCount</key>
@@ -609,8 +621,9 @@ @@ -609,8 +621,9 @@
609 <string>B5B296C80E7BC7E3000B04CD</string> 621 <string>B5B296C80E7BC7E3000B04CD</string>
610 <string>B5ABC8410E24CDE70072F422</string> 622 <string>B5ABC8410E24CDE70072F422</string>
611 <string>1CD10A99069EF8BA00B06720</string> 623 <string>1CD10A99069EF8BA00B06720</string>
612 - <string>/Users/ben/asi-http-request/asi-http-request.xcodeproj</string>  
613 <string>1C78EAAD065D492600B07095</string> 624 <string>1C78EAAD065D492600B07095</string>
  625 + <string>1C530D57069F1CE1000CFCEE</string>
  626 + <string>/Users/ben/asi-http-request/asi-http-request.xcodeproj</string>
614 </array> 627 </array>
615 <key>WindowString</key> 628 <key>WindowString</key>
616 <string>227 156 1432 976 0 0 1920 1178 </string> 629 <string>227 156 1432 976 0 0 1920 1178 </string>
@@ -850,7 +863,7 @@ @@ -850,7 +863,7 @@
850 <key>PBXProjectModuleGUID</key> 863 <key>PBXProjectModuleGUID</key>
851 <string>1CDD528C0622207200134675</string> 864 <string>1CDD528C0622207200134675</string>
852 <key>PBXProjectModuleLabel</key> 865 <key>PBXProjectModuleLabel</key>
853 - <string></string> 866 + <string>ASIHTTPRequest.m</string>
854 <key>StatusBarVisibility</key> 867 <key>StatusBarVisibility</key>
855 <true/> 868 <true/>
856 </dict> 869 </dict>
@@ -859,7 +872,7 @@ @@ -859,7 +872,7 @@
859 <key>Frame</key> 872 <key>Frame</key>
860 <string>{{0, 0}, {781, 212}}</string> 873 <string>{{0, 0}, {781, 212}}</string>
861 <key>RubberWindowFrame</key> 874 <key>RubberWindowFrame</key>
862 - <string>569 668 781 470 0 0 1920 1178 </string> 875 + <string>1148 334 781 470 0 0 1920 1178 </string>
863 </dict> 876 </dict>
864 <key>Module</key> 877 <key>Module</key>
865 <string>PBXNavigatorGroup</string> 878 <string>PBXNavigatorGroup</string>
@@ -885,7 +898,7 @@ @@ -885,7 +898,7 @@
885 <key>Frame</key> 898 <key>Frame</key>
886 <string>{{0, 217}, {781, 212}}</string> 899 <string>{{0, 217}, {781, 212}}</string>
887 <key>RubberWindowFrame</key> 900 <key>RubberWindowFrame</key>
888 - <string>569 668 781 470 0 0 1920 1178 </string> 901 + <string>1148 334 781 470 0 0 1920 1178 </string>
889 </dict> 902 </dict>
890 <key>Module</key> 903 <key>Module</key>
891 <string>PBXProjectFindModule</string> 904 <string>PBXProjectFindModule</string>
@@ -908,17 +921,17 @@ @@ -908,17 +921,17 @@
908 <key>TableOfContents</key> 921 <key>TableOfContents</key>
909 <array> 922 <array>
910 <string>1C530D57069F1CE1000CFCEE</string> 923 <string>1C530D57069F1CE1000CFCEE</string>
911 - <string>B5CF35C20E7A84E30050CBA7</string> 924 + <string>B5B297300E7BCD05000B04CD</string>
912 - <string>B5CF35C30E7A84E30050CBA7</string> 925 + <string>B5B297310E7BCD05000B04CD</string>
913 <string>1CDD528C0622207200134675</string> 926 <string>1CDD528C0622207200134675</string>
914 <string>1CD0528E0623707200166675</string> 927 <string>1CD0528E0623707200166675</string>
915 </array> 928 </array>
916 <key>WindowString</key> 929 <key>WindowString</key>
917 - <string>569 668 781 470 0 0 1920 1178 </string> 930 + <string>1148 334 781 470 0 0 1920 1178 </string>
918 <key>WindowToolGUID</key> 931 <key>WindowToolGUID</key>
919 <string>1C530D57069F1CE1000CFCEE</string> 932 <string>1C530D57069F1CE1000CFCEE</string>
920 <key>WindowToolIsVisible</key> 933 <key>WindowToolIsVisible</key>
921 - <false/> 934 + <true/>
922 </dict> 935 </dict>
923 <dict> 936 <dict>
924 <key>Identifier</key> 937 <key>Identifier</key>
This diff is collapsed. Click to expand it.