Fix progress callback

arangodb · fceller · Sep 15, 2017 · Sep 7, 2017 · Sep 7, 2017 · Sep 7, 2017
commit 8868c64e7afa57304685b3298015c38b52436f0e
diff --git a/lib/SimpleHttpClient/Communicator.cpp b/lib/SimpleHttpClient/Communicator.cpp
@@ -306,7 +306,7 @@ void Communicator::createRequestInProgress(NewRequest const& newRequest) {
   curl_easy_setopt(handle, CURLOPT_PROXY, "");
 
   // the xfer/progress options are only used to handle request abortions
-  curl_easy_setopt(handle, CURLOPT_NOPROGRESS, 1L);
+  curl_easy_setopt(handle, CURLOPT_NOPROGRESS, 0L);
   curl_easy_setopt(handle, CURLOPT_XFERINFOFUNCTION, Communicator::curlProgress);
   curl_easy_setopt(handle, CURLOPT_XFERINFODATA, handleInProgress->_rip.get());
 
@@ -457,6 +457,7 @@ void Communicator::handleResult(CURL* handle, CURLcode rc) {
     case CURLE_ABORTED_BY_CALLBACK:
       TRI_ASSERT(rip->_aborted);
       rip->_callbacks._onError(TRI_COMMUNICATOR_REQUEST_ABORTED, {nullptr});
+      break;
     default:
       LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "Curl return " << rc;
       rip->_callbacks._onError(TRI_ERROR_INTERNAL, {nullptr});

diff --git a/tests/SimpleHttpClient/CommunicatorTest.cpp b/tests/SimpleHttpClient/CommunicatorTest.cpp
@@ -35,7 +35,7 @@
 using namespace arangodb;
 using namespace arangodb::communicator;
 
-TEST_CASE( "requests are properly aborted", "[communicator]" ) {
+TEST_CASE("requests are properly aborted", "[communicator]" ) {
   Communicator communicator;
 
   bool callbacksCalled = false;