diff --git a/kroll b/kroll index a783b7135..a98eec2f6 160000 --- a/kroll +++ b/kroll @@ -1 +1 @@ -Subproject commit a783b7135b68878afb228973c8c1bfc18b8d613e +Subproject commit a98eec2f6f0c3be09e48709c27d451aef9dd3318 diff --git a/modules/ti.Network/HTTPClient.cpp b/modules/ti.Network/HTTPClient.cpp index 618c34c27..0d6d987a2 100644 --- a/modules/ti.Network/HTTPClient.cpp +++ b/modules/ti.Network/HTTPClient.cpp @@ -733,9 +733,10 @@ int CurlProgressCallback(HTTPClient* client, double dltotal, double dlnow, doubl if (client->IsAborted()) return CURLE_ABORTED_BY_CALLBACK; else - return 0; - - client->RequestDataSent((size_t)ulnow, (size_t)ultotal); + { + client->RequestDataSent((size_t)ulnow, (size_t)ultotal); + return CURLE_OK; + } } void HTTPClient::SetupCurlMethodType() diff --git a/sdk/__init__.py b/sdk/__init__.py index ac4e96679..27088173a 100644 --- a/sdk/__init__.py +++ b/sdk/__init__.py @@ -1,2 +1,2 @@ def get_titanium_version(): - return '1.2.0' + return '1.2.0.RC6-onsendstream-test'