Ben Copsey

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

@@ -953,8 +953,8 @@ static NSOperationQueue *sharedQueue = nil; @@ -953,8 +953,8 @@ static NSOperationQueue *sharedQueue = nil;
953 // Are any credentials set on this request that might be used for basic authentication? 953 // Are any credentials set on this request that might be used for basic authentication?
954 if ([self username] && [self password] && ![self domain]) { 954 if ([self username] && [self password] && ![self domain]) {
955 955
956 - // If we have stored credentials, is this server asking for basic authentication? If we don't have credentials, we'll assume basic 956 + // If we have stored credentials, is this server asking for basic authentication?
957 - if (!credentials || (CFStringRef)[credentials objectForKey:@"AuthenticationScheme"] == kCFHTTPAuthenticationSchemeBasic) { 957 + if ((CFStringRef)[credentials objectForKey:@"AuthenticationScheme"] == kCFHTTPAuthenticationSchemeBasic) {
958 [self addBasicAuthenticationHeaderWithUsername:[self username] andPassword:[self password]]; 958 [self addBasicAuthenticationHeaderWithUsername:[self username] andPassword:[self password]];
959 } 959 }
960 } 960 }