refactor out chunk framing

Author: kai-ion

src/aws-cpp-sdk-core/include/aws/core/http/windows/WinHttpSyncHttpClient.h

@@ -51,7 +51,6 @@ namespace Aws
             bool DoReceiveResponse(void* httpRequest) const override;
             bool DoQueryHeaders(void* httpRequest, std::shared_ptr<Aws::Http::HttpResponse>& response, Aws::StringStream& ss, uint64_t& read) const override;
             bool DoSendRequest(void* httpRequest) const override;
-            bool DoSendRequest(void* httpRequest, const std::shared_ptr<HttpRequest>& request) const;
             bool DoQueryDataAvailable(void* hHttpRequest, uint64_t& available) const override;
             bool DoReadData(void* hHttpRequest, char* body, uint64_t size, uint64_t& read) const override;
             void* GetClientModule() const override;

src/aws-cpp-sdk-core/include/aws/core/http/windows/WinINetSyncHttpClient.h

@@ -49,7 +49,6 @@ namespace Aws
             bool DoReceiveResponse(void* hHttpRequest) const override;
             bool DoQueryHeaders(void* hHttpRequest, std::shared_ptr<Aws::Http::HttpResponse>& response, Aws::StringStream& ss, uint64_t& read) const override;
             bool DoSendRequest(void* hHttpRequest) const override;
-            bool DoSendRequest(void* hHttpRequest, const std::shared_ptr<HttpRequest>& request) const override;
             bool DoQueryDataAvailable(void* hHttpRequest, uint64_t& available) const override;
             bool DoReadData(void* hHttpRequest, char* body, uint64_t size, uint64_t& read) const override;
             void* GetClientModule() const override;

src/aws-cpp-sdk-core/include/aws/core/http/windows/WinSyncHttpClient.h

@@ -11,7 +11,6 @@
 #include <aws/core/auth/AWSAuthSigner.h>
 #include <aws/core/http/HttpClient.h>
 #include <aws/core/http/standard/StandardHttpResponse.h>
-#include <aws/core/utils/UnreferencedParam.h>
 
 namespace Aws
 {
@@ -93,10 +92,6 @@ namespace Aws
             virtual bool DoReceiveResponse(void* hHttpRequest) const = 0;
             virtual bool DoQueryHeaders(void* hHttpRequest, std::shared_ptr<Aws::Http::HttpResponse>& response, Aws::StringStream& ss, uint64_t& read) const = 0;
             virtual bool DoSendRequest(void* hHttpRequest) const = 0;
-            virtual bool DoSendRequest(void* hHttpRequest, const std::shared_ptr<HttpRequest>& request) const { 
-                AWS_UNREFERENCED_PARAM(request);
-                return DoSendRequest(hHttpRequest); 
-            }
             virtual bool DoQueryDataAvailable(void* hHttpRequest, uint64_t& available) const = 0;
             virtual bool DoReadData(void* hHttpRequest, char* body, uint64_t size, uint64_t& read) const = 0;
             virtual void* GetClientModule() const = 0;

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

@@ -735,25 +735,6 @@ bool WinHttpSyncHttpClient::DoSendRequest(void* hHttpRequest) const
     return success;
 }
 
-bool WinHttpSyncHttpClient::DoSendRequest(void* hHttpRequest, const std::shared_ptr<HttpRequest>& request) const
-{
-    // Check if this is a Transfer-Encoding: chunked request
-    if (request->HasTransferEncoding() && request->GetTransferEncoding().find("chunked") != Aws::String::npos) {
-        // For chunked requests, use WINHTTP_IGNORE_REQUEST_TOTAL_LENGTH
-        bool success = WinHttpSendRequest(hHttpRequest, NULL, 0, NULL, 0, 0xFFFFFFFF, 0) != 0;
-        if (!success)
-        {
-            DWORD lastError = GetLastError();
-            AWS_LOGSTREAM_ERROR(GetLogTag(), "WinHttpSendRequest failed for chunked request. Error: " << lastError << " (0x" << std::hex << lastError << std::dec << ")");
-            AzWinHttpLogLastError("WinHttpSendRequest");
-        }
-        return success;
-    } else {
-        // For regular requests, use the original method
-        return DoSendRequest(hHttpRequest);
-    }
-}
-
 bool WinHttpSyncHttpClient::DoQueryDataAvailable(void* hHttpRequest, uint64_t& available) const
 {
     return (WinHttpQueryDataAvailable(hHttpRequest, (LPDWORD)&available) != 0);

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

@@ -216,21 +216,6 @@ bool WinINetSyncHttpClient::DoSendRequest(void* hHttpRequest) const
     return (HttpSendRequestEx(hHttpRequest, NULL, NULL, 0, 0) != 0);
 }
 
-bool WinINetSyncHttpClient::DoSendRequest(void* hHttpRequest, const std::shared_ptr<HttpRequest>& request) const
-{
-    // Check if this is a Transfer-Encoding: chunked request
-    if (request->HasTransferEncoding() && request->GetTransferEncoding().find("chunked") != Aws::String::npos) {
-        // For chunked encoding, use HttpSendRequestEx with unknown total length
-        INTERNET_BUFFERSA buffers = {0};
-        buffers.dwStructSize = sizeof(INTERNET_BUFFERSA);
-        buffers.dwBufferTotal = 0; // Unknown total length for chunked
-        return (HttpSendRequestExA(hHttpRequest, &buffers, NULL, 0, 0) != 0);
-    } else {
-        // For regular requests, use the simple HttpSendRequestEx
-        return (HttpSendRequestExA(hHttpRequest, NULL, NULL, 0, 0) != 0);
-    }
-}
-
 bool WinINetSyncHttpClient::DoQueryDataAvailable(void* hHttpRequest, uint64_t& available) const
 {
     return (InternetQueryDataAvailable(hHttpRequest, (LPDWORD)&available, /*reserved*/ 0, /*reserved*/ 0) != 0);

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

@@ -98,13 +98,10 @@ void WinSyncHttpClient::AddHeadersToRequest(const std::shared_ptr<HttpRequest>&
 bool WinSyncHttpClient::StreamPayloadToRequest(const std::shared_ptr<HttpRequest>& request, void* hHttpRequest, Aws::Utils::RateLimits::RateLimiterInterface* writeLimiter) const
 {
     bool success = true;
+    bool isChunked = request->HasTransferEncoding() && request->GetTransferEncoding() == Aws::Http::CHUNKED_VALUE;
     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();
@@ -148,10 +145,9 @@ bool WinSyncHttpClient::StreamPayloadToRequest(const std::shared_ptr<HttpRequest
         payloadStream->seekg(startingPos, payloadStream->beg);
     }
 
-    // For chunked requests, finalize the transfer
-    if (success && request->HasTransferEncoding() && request->GetTransferEncoding().find("chunked") != Aws::String::npos)
+    if (success && isChunked)
     {
-        FinalizeWriteData(hHttpRequest);
+      FinalizeWriteData(hHttpRequest);
     }
 
     if(success)
@@ -360,7 +356,7 @@ std::shared_ptr<HttpResponse> WinSyncHttpClient::MakeRequest(const std::shared_p
 
         AddHeadersToRequest(request, hHttpRequest);
         OverrideOptionsOnRequestHandle(hHttpRequest);
-        if (DoSendRequest(hHttpRequest, request) && StreamPayloadToRequest(request, hHttpRequest, writeLimiter))
+        if (DoSendRequest(hHttpRequest) && StreamPayloadToRequest(request, hHttpRequest, writeLimiter))
         {
             success = BuildSuccessResponse(request, response, hHttpRequest, readLimiter);
         }