update to test changes

Author: kai-ion

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

@@ -627,29 +627,51 @@ void WinHttpSyncHttpClient::DoAddHeaders(void* hHttpRequest, Aws::String& header
 
 uint64_t WinHttpSyncHttpClient::DoWriteData(void* hHttpRequest, char* streamBuffer, uint64_t bytesRead, bool isChunked) const
 {
-    AWS_UNREFERENCED_PARAM(isChunked);
     DWORD bytesWritten = 0;
-    if (!WinHttpWriteData(hHttpRequest, streamBuffer, (DWORD)bytesRead, &bytesWritten))
+    uint64_t totalBytesWritten = 0;
+    const char CRLF[] = "\r\n";
+
+    if (isChunked)
     {
-        DWORD lastError = GetLastError();
-        AWS_LOGSTREAM_ERROR(GetLogTag(), "WinHttpWriteData failed. Error: " << lastError << " (0x" << std::hex << lastError << std::dec << "), bytesToWrite: " << bytesRead);
-        AzWinHttpLogLastError("WinHttpWriteData");
-        return 0;
+        Aws::String chunkSizeHexString = StringUtils::ToHexString(bytesRead) + CRLF;
+
+        if (!AzCallWinHttp("WinHttpWriteData", WinHttpWriteData, hHttpRequest, chunkSizeHexString.c_str(), (DWORD)chunkSizeHexString.size(), &bytesWritten))
+        {
+            return totalBytesWritten;
+        }
+        totalBytesWritten += bytesWritten;
+        if (!AzCallWinHttp("WinHttpWriteData", WinHttpWriteData, hHttpRequest, streamBuffer, (DWORD)bytesRead, &bytesWritten))
+        {
+            return totalBytesWritten;
+        }
+        totalBytesWritten += bytesWritten;
+        if (!AzCallWinHttp("WinHttpWriteData", WinHttpWriteData, hHttpRequest, CRLF, (DWORD)(sizeof(CRLF) - 1), &bytesWritten))
+        {
+            return totalBytesWritten;
+        }
+        totalBytesWritten += bytesWritten;
     }
-    return bytesWritten;
+    else
+    {
+        if (!AzCallWinHttp("WinHttpWriteData", WinHttpWriteData, hHttpRequest, streamBuffer, (DWORD)bytesRead, &bytesWritten))
+        {
+            return totalBytesWritten;
+        }
+        totalBytesWritten += bytesWritten;
+    }
+
+    return totalBytesWritten;
 }
 
 uint64_t WinHttpSyncHttpClient::FinalizeWriteData(void* hHttpRequest) const
 {
-    // For chunked requests, signal end of data by writing 0 bytes
     DWORD bytesWritten = 0;
-    if (!WinHttpWriteData(hHttpRequest, NULL, 0, &bytesWritten))
+    const char trailingCRLF[] = "0\r\n\r\n";
+    if (!AzCallWinHttp("WinHttpWriteData", WinHttpWriteData, hHttpRequest, trailingCRLF, (DWORD)(sizeof(trailingCRLF) - 1), &bytesWritten))
     {
-        DWORD lastError = GetLastError();
-        AWS_LOGSTREAM_ERROR(GetLogTag(), "WinHttpWriteData finalize failed. Error: " << lastError << " (0x" << std::hex << lastError << std::dec << ")");
-        AzWinHttpLogLastError("WinHttpWriteData-Finalize");
         return 0;
     }
+
     return bytesWritten;
 }
 

src/aws-cpp-sdk-core/source/http/windows/WinSyncHttpClient.cpp

@@ -101,6 +101,10 @@ bool WinSyncHttpClient::StreamPayloadToRequest(const std::shared_ptr<HttpRequest
     auto payloadStream = request->GetContentBody();
     if(payloadStream)
     {
+        // Check if this is AWS chunked encoding
+        bool isChunked = request->HasHeader("content-encoding") && 
+                        request->GetHeaderValue("content-encoding").find("aws-chunked") != Aws::String::npos;
+        
         uint64_t bytesWritten;
         uint64_t bytesToRead = HTTP_REQUEST_WRITE_BUFFER_LENGTH;
         auto startingPos = payloadStream->tellg();
@@ -115,7 +119,7 @@ bool WinSyncHttpClient::StreamPayloadToRequest(const std::shared_ptr<HttpRequest
             bytesWritten = 0;
             if (bytesRead > 0)
             {
-                bytesWritten = DoWriteData(hHttpRequest, streamBuffer, bytesRead, false);
+                bytesWritten = DoWriteData(hHttpRequest, streamBuffer, bytesRead, isChunked);
                 if (!bytesWritten)
                 {
                     success = false;