Merge branch 'development' of https://git01.codeplex.com/forks/kreuzerkrieg/casablancatimeout into timeout_pull_request

Author: stgates

Release/include/cpprest/http_client.h

@@ -193,17 +193,27 @@ class http_client_config
     /// <returns>The timeout (in seconds) used for each send and receive operation on the client.</returns>
     utility::seconds timeout() const
     {
-        return m_timeout;
-    }
-
-    /// <summary>
-    /// Set the timeout
-    /// </summary>
-    /// <param name="timeout">The timeout (in seconds) used for each send and receive operation on the client.</param>
-    void set_timeout(const utility::seconds &timeout)
-    {
-        m_timeout = timeout;
-    }
+        return std::chrono::duration_cast<utility::seconds>(m_timeout);
+    }
+
+	/// <summary>
+	/// Get the timeout
+	/// </summary>
+	/// <returns>The timeout (in whatever duration) used for each send and receive operation on the client.</returns>
+	template <class T>
+	T timeout() const
+	{
+		return std::chrono::duration_cast<T>(m_timeout);
+	}
+	/// <summary>
+	/// Set the timeout
+	/// </summary>
+	/// <param name="timeout">The timeout (duration from microseconds range and up) used for each send and receive operation on the client.</param>
+	template <class T>
+	void set_timeout(const T &timeout)
+	{
+		m_timeout = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
+	}
 
     /// <summary>
     /// Get the client chunk size.
@@ -317,7 +327,7 @@ class http_client_config
     // Whether or not to guarantee ordering, i.e. only using one underlying TCP connection.
     bool m_guarantee_order;
 
-    utility::seconds m_timeout;
+    std::chrono::microseconds m_timeout;
     size_t m_chunksize;
 
 #if !defined(__cplusplus_winrt)

Release/src/http/client/http_client_asio.cpp

@@ -329,7 +329,7 @@ class asio_context : public request_context, public std::enable_shared_from_this
     : request_context(client, request)
     , m_content_length(0)
     , m_needChunked(false)
-    , m_timer(static_cast<int>(client->client_config().timeout().count()))
+    , m_timer(client->client_config().timeout())
     , m_connection(connection)
 #if defined(__APPLE__) || (defined(ANDROID) || defined(__ANDROID__))
     , m_openssl_failed(false)
@@ -1059,8 +1059,8 @@ class asio_context : public request_context, public std::enable_shared_from_this
     {
     public:
 
-        timeout_timer(int seconds) :
-        m_duration(boost::posix_time::milliseconds(seconds * 1000)),
+        timeout_timer(const std::chrono::microseconds& timeout) :
+        m_duration(timeout),
         m_state(created),
         m_timer(crossplat::threadpool::shared_instance().service())
         {}
@@ -1131,10 +1131,10 @@ class asio_context : public request_context, public std::enable_shared_from_this
             timedout
         };
 
-        boost::posix_time::milliseconds m_duration;
+        std::chrono::microseconds m_duration;
         timer_state m_state;
         std::weak_ptr<asio_context> m_ctx;
-        boost::asio::deadline_timer m_timer;
+        boost::asio::steady_timer m_timer;
     };
 
     uint64_t m_content_length;

Release/src/http/client/http_client_winhttp.cpp

@@ -395,8 +395,10 @@ class winhttp_client : public _http_client_communicator
         }
 
         // Set timeouts.
-        const auto timeout = config.timeout();
-        const int milliseconds = 1000 * static_cast<int>(timeout.count());
+        int milliseconds = static_cast<int>(
+			std::chrono::duration_cast<std::chrono::milliseconds>(config.timeout()).count()
+			);
+		milliseconds = std::max<decltype(milliseconds)>(milliseconds, 1);
         if(!WinHttpSetTimeouts(m_hSession,
             milliseconds,
             milliseconds,

Release/src/http/client/http_client_winrt.cpp

@@ -463,9 +463,11 @@ class winrt_client : public _http_client_communicator
         }
 
         // Set timeout.
-        const auto timeout = config.timeout();
-        const int secs = static_cast<int>(timeout.count());
-        hr = winrt_context->m_hRequest->SetProperty(XHR_PROP_TIMEOUT, secs * 1000);
+        ULONGLONG timeout = static_cast<ULONGLONG>(
+			std::chrono::duration_cast<std::chrono::milliseconds>(config.timeout()).count()
+			);
+		timeout = std::max<decltype(timeout)>(timeout, std::numeric_limits<decltype(timeout)>::min() + 1);
+        hr = winrt_context->m_hRequest->SetProperty(XHR_PROP_TIMEOUT, timeout);
         if (FAILED(hr))
         {
             request->report_error(hr, L"Failure to set HTTP request properties");

Release/tests/functional/http/client/client_construction.cpp

@@ -172,6 +172,13 @@ TEST_FIXTURE(uri_address, get_client_config)
 
     const http_client_config& config2 = client.client_config();
     VERIFY_ARE_EQUAL(config2.timeout().count(), timeout.count());
+	std::chrono::milliseconds milli_timeout = config2.timeout();
+	VERIFY_ARE_EQUAL(milli_timeout.count(),
+		std::chrono::duration_cast<std::chrono::milliseconds>(timeout).count());
+	auto micro_timeout = config.timeout<std::chrono::microseconds>();
+	VERIFY_ARE_EQUAL(micro_timeout.count(),
+		std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
+	
     VERIFY_ARE_EQUAL(config2.chunksize(), 1024);
 }
 

Release/tests/functional/http/client/connections_and_errors.cpp

@@ -139,6 +139,19 @@ TEST_FIXTURE(uri_address, request_timeout)
 #endif
 }
 
+#ifdef _WIN32 // winhttp client
+TEST_FIXTURE(uri_address, winhttp_request_timeout)
+{
+	test_http_server::scoped_server scoped(m_uri);
+	http_client_config config;
+	config.set_timeout(std::chrono::microseconds(500));
+
+	http_client client(m_uri, config);
+	auto responseTask = client.request(methods::GET);
+	VERIFY_THROWS_HTTP_ERROR_CODE(responseTask.get(), std::errc::timed_out);
+}
+#endif
+
 TEST_FIXTURE(uri_address, invalid_method)
 {
     web::http::uri uri(U("http://www.bing.com/"));