changing the streambuff type to a vector

Author: kai-ion

src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClientBase.h

@@ -100,18 +100,12 @@ namespace client
           m_serviceName(std::move(serviceName)),
           m_serviceUserAgentName(std::move(serviceUserAgentName)),
           m_httpClient(std::move(httpClient)),
-          m_errorMarshaller(std::move(errorMarshaller))
+          m_errorMarshaller(std::move(errorMarshaller)),
+          m_interceptors({
+              Aws::MakeShared<ChecksumInterceptor>("AwsSmithyClientBase", *m_clientConfig),
+              Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", *m_clientConfig, m_httpClient->IsDefaultAwsHttpClient())
+          })
         {
-            // Create modified config for chunking interceptor
-            Aws::Client::ClientConfiguration chunkingConfig(*m_clientConfig);
-            if (!m_httpClient->IsDefaultAwsHttpClient()) {
-                chunkingConfig.httpClientChunkedMode = Aws::Client::HttpClientChunkedMode::CLIENT_IMPLEMENTATION;
-            }
-            
-            m_interceptors = {
-                Aws::MakeShared<ChecksumInterceptor>("AwsSmithyClientBase", *m_clientConfig),
-                Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", chunkingConfig)
-            };
 
             baseInit();
         }

src/aws-cpp-sdk-core/include/smithy/client/features/ChunkingInterceptor.h

@@ -42,8 +42,6 @@ class AwsChunkedStreamBuf : public std::streambuf {
         if (m_request == nullptr) {
             AWS_LOGSTREAM_ERROR("AwsChunkedStream", "request is null");
         }
-
-        setg(nullptr, nullptr, nullptr);
     }
 
 protected:
@@ -134,8 +132,8 @@ class AwsChunkedIOStream : public Aws::IOStream {
  */
 class ChunkingInterceptor : public smithy::interceptor::Interceptor {
 public:
-    explicit ChunkingInterceptor(const Aws::Client::ClientConfiguration& config)
-        : m_httpClientChunkedMode(config.httpClientChunkedMode) {}
+    explicit ChunkingInterceptor(const Aws::Client::ClientConfiguration& config, bool isDefaultHttpClient = true)
+        : m_httpClientChunkedMode(isDefaultHttpClient ? config.httpClientChunkedMode : Aws::Client::HttpClientChunkedMode::CLIENT_IMPLEMENTATION) {}
     ~ChunkingInterceptor() override = default;
 
     ModifyRequestOutcome ModifyBeforeSigning(smithy::interceptor::InterceptorContext& context) override {

src/aws-cpp-sdk-core/source/client/AWSClient.cpp

@@ -118,14 +118,7 @@ struct RequestInfo
     }
 };
 
-static ClientConfiguration GetChunkingConfig(const ClientConfiguration& config, const std::shared_ptr<HttpClient>& httpClient)
-{
-    ClientConfiguration chunkingConfig(config);
-    if (!httpClient->IsDefaultAwsHttpClient()) {
-        chunkingConfig.httpClientChunkedMode = HttpClientChunkedMode::CLIENT_IMPLEMENTATION;
-    }
-    return chunkingConfig;
-}
+
 
 AWSClient::AWSClient(const Aws::Client::ClientConfiguration& configuration,
     const std::shared_ptr<Aws::Client::AWSAuthSigner>& signer,
@@ -149,7 +142,7 @@ AWSClient::AWSClient(const Aws::Client::ClientConfiguration& configuration,
     m_enableClockSkewAdjustment(configuration.enableClockSkewAdjustment),
     m_requestCompressionConfig(configuration.requestCompressionConfig),
     m_userAgentInterceptor{Aws::MakeShared<smithy::client::UserAgentInterceptor>(AWS_CLIENT_LOG_TAG, configuration, m_retryStrategy->GetStrategyName(), m_serviceName)},
-    m_interceptors{Aws::MakeShared<smithy::client::ChecksumInterceptor>(AWS_CLIENT_LOG_TAG), Aws::MakeShared<smithy::client::features::ChunkingInterceptor>(AWS_CLIENT_LOG_TAG, GetChunkingConfig(configuration, m_httpClient)), m_userAgentInterceptor}
+    m_interceptors{Aws::MakeShared<smithy::client::ChecksumInterceptor>(AWS_CLIENT_LOG_TAG), Aws::MakeShared<smithy::client::features::ChunkingInterceptor>(AWS_CLIENT_LOG_TAG, configuration, m_httpClient->IsDefaultAwsHttpClient()), m_userAgentInterceptor}
 {
 }
 
@@ -175,7 +168,7 @@ AWSClient::AWSClient(const Aws::Client::ClientConfiguration& configuration,
     m_enableClockSkewAdjustment(configuration.enableClockSkewAdjustment),
     m_requestCompressionConfig(configuration.requestCompressionConfig),
     m_userAgentInterceptor{Aws::MakeShared<smithy::client::UserAgentInterceptor>(AWS_CLIENT_LOG_TAG, configuration, m_retryStrategy->GetStrategyName(), m_serviceName)},
-    m_interceptors{Aws::MakeShared<smithy::client::ChecksumInterceptor>(AWS_CLIENT_LOG_TAG, configuration), Aws::MakeShared<smithy::client::features::ChunkingInterceptor>(AWS_CLIENT_LOG_TAG, GetChunkingConfig(configuration, m_httpClient)), m_userAgentInterceptor}
+    m_interceptors{Aws::MakeShared<smithy::client::ChecksumInterceptor>(AWS_CLIENT_LOG_TAG, configuration), Aws::MakeShared<smithy::client::features::ChunkingInterceptor>(AWS_CLIENT_LOG_TAG, configuration, m_httpClient->IsDefaultAwsHttpClient()), m_userAgentInterceptor}
 {
 }
 

src/aws-cpp-sdk-core/source/smithy/client/AwsSmithyClientBase.cpp

@@ -104,15 +104,9 @@ void AwsSmithyClientBase::baseCopyAssign(const AwsSmithyClientBase& other,
   m_httpClient = std::move(httpClient);
   m_errorMarshaller = std::move(errorMarshaller);
 
-  // Create modified config for chunking interceptor
-  Aws::Client::ClientConfiguration chunkingConfig(*m_clientConfig);
-  if (!m_httpClient->IsDefaultAwsHttpClient()) {
-    chunkingConfig.httpClientChunkedMode = Aws::Client::HttpClientChunkedMode::CLIENT_IMPLEMENTATION;
-  }
-  
   m_interceptors = Aws::Vector<std::shared_ptr<interceptor::Interceptor>>{
       Aws::MakeShared<ChecksumInterceptor>("AwsSmithyClientBase", *m_clientConfig),
-      Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", chunkingConfig)
+      Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", *m_clientConfig, m_httpClient->IsDefaultAwsHttpClient())
   };
 
   baseCopyInit();