Merge pull request #426 from sharwell/fix-422

Include a Content-Length header with all PUT/POST requests

Author: alanquillin

src/corelib/Providers/Rackspace/ProviderBase`1.cs

@@ -606,10 +606,12 @@ protected Response StreamRESTRequest(CloudIdentity identity, Uri absoluteUri, Ht
         /// The base implementation returns a <see cref="JsonRequestSettings"/> object initialized with the following values.
         ///
         /// <list type="bullet">
-        /// <item>The <see cref="RequestSettings.RetryCount"/> is 2.</item>
+        /// <item>The <see cref="RequestSettings.RetryCount"/> is 0.</item>
         /// <item>The <see cref="RequestSettings.RetryDelay"/> is 200 milliseconds.</item>
         /// <item>The <see cref="RequestSettings.Non200SuccessCodes"/> contains <see cref="HttpStatusCode.Unauthorized"/> and <see cref="HttpStatusCode.Conflict"/>, along with the values in <paramref name="non200SuccessCodes"/> (if any).</item>
         /// <item>The <see cref="RequestSettings.UserAgent"/> is set to <see cref="UserAgentGenerator.UserAgent"/>.</item>
+        /// <item>The <see cref="RequestSettings.AllowZeroContentLength"/> is set to <see langword="true"/>.</item>
+        /// <item>The <see cref="RequestSettings.ConnectionLimit"/> is set to <see cref="ConnectionLimit"/>.</item>
         /// <item>Other properties are set to the default values for <see cref="JsonRequestSettings"/>.</item>
         /// </list>
         ///
@@ -629,6 +631,7 @@ protected virtual RequestSettings BuildDefaultRequestSettings(IEnumerable<HttpSt
                 RetryDelay = TimeSpan.FromMilliseconds(200),
                 Non200SuccessCodes = non200SuccessCodesAggregate,
                 UserAgent = UserAgentGenerator.UserAgent,
+                AllowZeroContentLength = true,
                 ConnectionLimit = ConnectionLimit,
             };
         }

src/testing/integration/Providers/Rackspace/UserObjectStorageTests.cs

@@ -1606,7 +1606,7 @@ public void TestCreateObjectWithMetadata()
         [TestMethod]
         [TestCategory(TestCategories.User)]
         [TestCategory(TestCategories.ObjectStorage)]
-        [DeploymentItem("DarkKnightRises.jpg")]
+        [DeploymentItem("Providers/Rackspace/CloudFiles/DarkKnightRises.jpg")]
         public void TestCreateLargeObject()
         {
             IObjectStorageProvider provider = Bootstrapper.CreateObjectStorageProvider();
@@ -1648,7 +1648,7 @@ public void TestCreateLargeObject()
         [TestMethod]
         [TestCategory(TestCategories.User)]
         [TestCategory(TestCategories.ObjectStorage)]
-        [DeploymentItem("DarkKnightRises.jpg")]
+        [DeploymentItem("Providers/Rackspace/CloudFiles/DarkKnightRises.jpg")]
         public void TestVerifyLargeObjectETag()
         {
             IObjectStorageProvider provider = Bootstrapper.CreateObjectStorageProvider();
@@ -1698,7 +1698,7 @@ public void TestVerifyLargeObjectETag()
         [TestMethod]
         [TestCategory(TestCategories.User)]
         [TestCategory(TestCategories.ObjectStorage)]
-        [DeploymentItem("DarkKnightRises.jpg")]
+        [DeploymentItem("Providers/Rackspace/CloudFiles/DarkKnightRises.jpg")]
         public void TestExtractArchiveTar()
         {
             CloudFilesProvider provider = (CloudFilesProvider)Bootstrapper.CreateObjectStorageProvider();
@@ -1750,7 +1750,7 @@ public void TestExtractArchiveTar()
         [TestMethod]
         [TestCategory(TestCategories.User)]
         [TestCategory(TestCategories.ObjectStorage)]
-        [DeploymentItem("DarkKnightRises.jpg")]
+        [DeploymentItem("Providers/Rackspace/CloudFiles/DarkKnightRises.jpg")]
         public void TestExtractArchiveTarGz()
         {
             CloudFilesProvider provider = (CloudFilesProvider)Bootstrapper.CreateObjectStorageProvider();
@@ -1807,7 +1807,7 @@ public void TestExtractArchiveTarGz()
         [TestMethod]
         [TestCategory(TestCategories.User)]
         [TestCategory(TestCategories.ObjectStorage)]
-        [DeploymentItem("DarkKnightRises.jpg")]
+        [DeploymentItem("Providers/Rackspace/CloudFiles/DarkKnightRises.jpg")]
         public void TestExtractArchiveTarBz2()
         {
             CloudFilesProvider provider = (CloudFilesProvider)Bootstrapper.CreateObjectStorageProvider();
@@ -1863,7 +1863,7 @@ public void TestExtractArchiveTarBz2()
         [TestMethod]
         [TestCategory(TestCategories.User)]
         [TestCategory(TestCategories.ObjectStorage)]
-        [DeploymentItem("DarkKnightRises.jpg")]
+        [DeploymentItem("Providers/Rackspace/CloudFiles/DarkKnightRises.jpg")]
         public void TestExtractArchiveTarGzCreateContainer()
         {
             CloudFilesProvider provider = (CloudFilesProvider)Bootstrapper.CreateObjectStorageProvider();

src/testing/integration/integration.csproj

@@ -137,7 +137,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Providers\Rackspace\CloudFiles\DarkKnightRises.jpg">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />