Fixed issues #144, #154, #153.

Author: JonathanHenson

aws-cpp-sdk-core/source/http/windows/WinHttpConnectionPoolMgr.cpp

@@ -43,15 +43,6 @@ void* WinHttpConnectionPoolMgr::CreateNewConnection(const Aws::String& host, Hos
 {
     HINTERNET newConnection = WinHttpConnect(GetOpenHandle(), StringUtils::ToWString(host.c_str()).c_str(), connectionContainer.port, 0);
 
-    if (newConnection)
-    {
-        DWORD timeoutMs = GetConnectTimeout();
-        DWORD requestMs = GetRequestTimeout();
-
-        WinHttpSetOption(newConnection, WINHTTP_OPTION_CONNECT_TIMEOUT, &timeoutMs, sizeof(timeoutMs));
-        WinHttpSetOption(newConnection, WINHTTP_OPTION_RECEIVE_TIMEOUT, &requestMs, sizeof(requestMs));
-    }
-
     return newConnection;
 }
 

aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp

@@ -77,6 +77,11 @@ WinHttpSyncHttpClient::WinHttpSyncHttpClient(const ClientConfiguration& config)
 
     SetOpenHandle(WinHttpOpen(openString.c_str(), winhttpFlags, proxyString.c_str(), nullptr, 0));
 
+    if (!WinHttpSetTimeouts(GetOpenHandle(), config.connectTimeoutMs, config.connectTimeoutMs, -1, config.requestTimeoutMs))
+    {
+        AWS_LOGSTREAM_WARN(GetLogTag(), "Error setting timeouts " << GetLastError());
+    }
+
     //add proxy auth credentials to everything using this handle.
     if (isUsingProxy)
     {

aws-cpp-sdk-core/source/utils/OSVersionInfo.cpp

@@ -90,9 +90,9 @@ Aws::String OSVersionInfo::ComputeOSVersionString() const
     return "non-windows/unknown";
 
 #else
-    OSVERSIONINFO versionInfo;
-    ZeroMemory(&versionInfo, sizeof(OSVERSIONINFO));
-    versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    OSVERSIONINFOA versionInfo;
+    ZeroMemory(&versionInfo, sizeof(OSVERSIONINFOA));
+    versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA);
     GetVersionExA(&versionInfo);
     Aws::StringStream ss;
     ss << "Windows/" << versionInfo.dwMajorVersion << "." << versionInfo.dwMinorVersion << "." << versionInfo.dwBuildNumber << "-" << versionInfo.szCSDVersion;