Merge branch 'master' into experimental-uiimageview-category-refactoring

This commit is contained in:
Mattt Thompson 2012-02-14 09:13:26 -08:00
commit 09a5329bb8

View file

@ -232,11 +232,11 @@ static inline BOOL AFStateTransitionIsValid(AFOperationState fromState, AFOperat
}
- (void)setAuthenticationAgainstProtectionSpaceBlock:(BOOL (^)(NSURLConnection *, NSURLProtectionSpace *))block {
self.authenticationAgainstProtectionSpaceBlock = block;
self.authenticationAgainstProtectionSpace = block;
}
- (void)setAuthenticationChallengeBlock:(void (^)(NSURLConnection *connection, NSURLAuthenticationChallenge *challenge))block {
self.authenticationChallengeBlock = block;
self.authenticationChallenge = block;
}
- (void)setState:(AFOperationState)state {