Fix:duplicate trailing slashes in URIs

Author: pulimsr

src/aws-cpp-sdk-core/include/aws/core/http/URI.h

@@ -153,7 +153,7 @@ namespace Aws
                 {
                     m_pathSegments.push_back(segment);
                 }
-                m_pathHasTrailingSlash = (!segments.empty() && segments.back() == '/');
+                m_pathHasTrailingSlash = (m_pathSegments.empty() || !s_preservePathSeparators) && (!segments.empty() && segments.back() == '/');
             }
 
             /**

src/aws-cpp-sdk-core/source/http/URI.cpp

@@ -206,7 +206,7 @@ Aws::String URI::GetPath() const
         path.append(segment);
     }
 
-    if (m_pathSegments.empty() || (m_pathHasTrailingSlash && !s_preservePathSeparators))
+    if (m_pathSegments.empty() || m_pathHasTrailingSlash)
     {
         path.push_back('/');
     }
@@ -223,7 +223,7 @@ Aws::String URI::GetURLEncodedPath() const
         ss << '/' << StringUtils::URLEncode(segment.c_str());
     }
 
-    if (m_pathSegments.empty() || (m_pathHasTrailingSlash && !s_preservePathSeparators))
+    if (m_pathSegments.empty() || m_pathHasTrailingSlash)
     {
         ss << '/';
     }
@@ -243,7 +243,7 @@ Aws::String URI::GetURLEncodedPathRFC3986() const
         ss << '/' << urlEncodeSegment(segment, m_useRfcEncoding);
     }
 
-    if (m_pathSegments.empty() || (m_pathHasTrailingSlash && !s_preservePathSeparators))
+    if (m_pathSegments.empty() || m_pathHasTrailingSlash)
     {
         ss << '/';
     }