Updated Branches: refs/heads/master 5c08162d0 -> e7b16f4b0
Don't URL-encode FileTransfer.upload's response field. Fixes issue https://issues.apache.org/jira/browse/CB-1571 Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/e7b16f4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/e7b16f4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/e7b16f4b Branch: refs/heads/master Commit: e7b16f4b0b20d5a257cac140f115da0e194369b3 Parents: 5c08162 Author: Andrew Grieve <agri...@chromium.org> Authored: Tue Oct 2 15:06:33 2012 -0400 Committer: Andrew Grieve <agri...@chromium.org> Committed: Tue Oct 2 15:06:33 2012 -0400 ---------------------------------------------------------------------- CordovaLib/Classes/CDVFileTransfer.m | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/e7b16f4b/CordovaLib/Classes/CDVFileTransfer.m ---------------------------------------------------------------------- diff --git a/CordovaLib/Classes/CDVFileTransfer.m b/CordovaLib/Classes/CDVFileTransfer.m index 5b4e75b..04f4e93 100644 --- a/CordovaLib/Classes/CDVFileTransfer.m +++ b/CordovaLib/Classes/CDVFileTransfer.m @@ -398,6 +398,7 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream) for (CDVFileTransferDelegate* delegate in [activeTransfers allValues]) { [delegate.connection cancel]; } + [activeTransfers removeAllObjects]; } @@ -427,7 +428,7 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream) uploadResponse = [[NSString alloc] initWithData:self.responseData encoding:NSUTF8StringEncoding]; uploadResult = [NSMutableDictionary dictionaryWithCapacity:3]; if (uploadResponse != nil) { - [uploadResult setObject:[uploadResponse stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:@"response"]; + [uploadResult setObject:uploadResponse forKey:@"response"]; } [uploadResult setObject:[NSNumber numberWithInt:self.bytesTransfered] forKey:@"bytesSent"]; [uploadResult setObject:[NSNumber numberWithInt:self.responseCode] forKey:@"responseCode"];
