Merge branch 'stream-rl-fix' of https://github.com/sptramer/AFNetworking into sptramer-stream-rl-fix

Conflicts:
	AFNetworking/AFURLConnectionOperation.m
This commit is contained in:
Mattt Thompson 2012-09-14 10:52:55 -07:00
commit 42fecdc138

View file

@ -257,7 +257,7 @@ static inline BOOL AFStateTransitionIsValid(AFOperationState fromState, AFOperat
} }
- (void)setOutputStream:(NSOutputStream *)outputStream { - (void)setOutputStream:(NSOutputStream *)outputStream {
if (_outputStream == outputStream) { if (outputStream == _outputStream) {
return; return;
} }