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:
commit
42fecdc138
1 changed files with 1 additions and 1 deletions
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue