Merge lp:~marcustomlinson/net-cpp/fix_ppc_timeout-rtm into lp:net-cpp/rtm-14.09

[Marcus Tomlinson]

Explicitly cast milliseconds::count() to long

Explicitly cast milliseconds::count() to long.

On PPC, this method returns an 8-byte long long, of which libCurl is hardcoded to read only the first 4 bytes. Furthermore, PPC being Big Endian means that the first 4 bytes will be 0 for any number lower than 2147483648.

[Marcus Tomlinson (marcustomlinson)]

Top approving as this is literally the same change that has been approved here: https://code.launchpad.net/~marcustomlinson/net-cpp/fix_ppc_timeout/+merge/247100

[Marcus Tomlinson (marcustomlinson)]

> Top approving as this is literally the same change that has been approved
> here: https://code.launchpad.net/~marcustomlinson/net-
> cpp/fix_ppc_timeout/+merge/247100

Oh oops, apparently I don't have permissions to do that. nm

=== modified file 'src/core/net/http/impl/curl/request.h'
--- src/core/net/http/impl/curl/request.h	2014-05-14 10:07:20 +0000
+++ src/core/net/http/impl/curl/request.h	2015-01-23 11:36:49 +0000
@@ -88,7 +88,11 @@
         if (atomic_state.load() != core::net::http::Request::State::ready)
             throw core::net::http::Request::Errors::AlreadyActive{CORE_FROM_HERE()};
 
-        easy.set_option(::curl::Option::timeout_ms, timeout.count());
+        // timeout.count() is a long long, but curl uses varargs and wants a long.
+        // If timeout.count() overflows a long, we wait forever instead of roughly 24.8 days.
+        auto count = timeout.count();
+        long adjusted_timeout = count <= std::numeric_limits<long>::max() ? count : 0;
+        easy.set_option(::curl::Option::timeout_ms, adjusted_timeout);
     }
 
     Response execute(const Request::ProgressHandler& ph)