Merge branch 'master' of https://github.com/tomohisa/AFNetworking into tomohisa-master

Conflicts:
	AFNetworking/AFHTTPClient.m

AFNetworking/AFHTTPClient.m

@@ -669,8 +669,8 @@ static void AFNetworkReachabilityReleaseCallback(const void *info) {
         return nil;
     }
     
-    self.stringEncoding = (NSStringEncoding)[aDecoder decodeIntegerForKey:@"stringEncoding"];
-    self.parameterEncoding = (AFHTTPClientParameterEncoding)[aDecoder decodeIntegerForKey:@"parameterEncoding"];
+    self.stringEncoding = [aDecoder decodeIntegerForKey:@"stringEncoding"];
+    self.parameterEncoding = [aDecoder decodeIntegerForKey:@"parameterEncoding"];
     self.registeredHTTPOperationClassNames = [aDecoder decodeObjectForKey:@"registeredHTTPOperationClassNames"];
     self.defaultHeaders = [aDecoder decodeObjectForKey:@"defaultHeaders"];
     
@@ -954,7 +954,6 @@ NSTimeInterval const kAFUploadStream3GSuggestedDelay = 0.2;
     if ([self streamStatus] == NSStreamStatusClosed) {
         return 0;
     }
-    
     NSInteger bytesRead = 0;
     
     while ((NSUInteger)bytesRead < MIN(length, self.numberOfBytesInPacket)) {
@@ -969,7 +968,6 @@ NSTimeInterval const kAFUploadStream3GSuggestedDelay = 0.2;
             }
         }
     }
-
     return bytesRead;
 }
 
@@ -1112,6 +1110,11 @@ typedef enum {
 }
 
 - (BOOL)hasBytesAvailable {
+    // Allows `read:maxLength:` to be called again if `AFMultipartFormFinalBoundary` doesn't fit into the avaiable buffer
+    if (_phase == AFFinalBoundaryPhase) {
+        return YES;
+    }
+    
     switch (self.inputStream.streamStatus) {
         case NSStreamStatusNotOpen:
         case NSStreamStatusOpening:
@@ -1197,7 +1200,6 @@ typedef enum {
             _phase = AFEncapsulationBoundaryPhase;
             break;
     }
-    
     _phaseReadOffset = 0;
     
     return YES;