Merge pull request #339 from shabtaisharon/NETSDK-173

Fix an issue with & in filename
SpectraLogic · Aug 9, 2019 · 5262fe2 · 5262fe2
2 parents 8a4c415 + 7b6803e
commit 5262fe2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Ds3/Runtime/HttpHelper.cs b/Ds3/Runtime/HttpHelper.cs
@@ -32,7 +32,7 @@ internal static class HttpHelper
         /// <summary>
         /// Specified as "Query" by the RFC, forward slash (/) and question mark (?) without semicolon (;) and plus (+)
         /// </summary>
-        private static readonly char[] AllowedCharsQuery = Pchar.Concat("/?".ToArray()).Where(ch => ch != ';' && ch != '+').ToArray();
+        private static readonly char[] AllowedCharsQuery = Pchar.Concat("/?".ToArray()).Where(ch => ch != ';' && ch != '+' && ch != '&').ToArray();
 
         /// <summary>
         /// Specified as "Path" by the RFC, forward slash (/) without semicolon (;)

diff --git a/IntegrationTestDS3/IntegrationTestDS3Client.cs b/IntegrationTestDS3/IntegrationTestDS3Client.cs
@@ -1907,7 +1907,7 @@ public void TestPercentEncodingOfQuery()
                 var contentBytes = System.Text.Encoding.UTF8.GetBytes(content);
                 var contentBytesLength = contentBytes.Length;
 
-                var fileName = "שרון;/+";
+                var fileName = "שרון;/+&";
                 var objects = new List<Ds3Object>
                 {
                     new Ds3Object(fileName, contentBytesLength)