Merge pull request #471 from om2804/fixAddQueryParam

fix handling urls endwith "&" or "?"

Author: mythz

src/ServiceStack.Text/HttpUtils.cs

@@ -29,7 +29,11 @@ public static string AddQueryParam(this string url, object key, string val, bool
         public static string AddQueryParam(this string url, string key, string val, bool encode = true)
         {
             if (string.IsNullOrEmpty(url)) return null;
-            var prefix = url.IndexOf('?') == -1 ? "?" : "&";
+            var prefix = string.Empty;
+            if (!url.EndsWith("?") && !url.EndsWith("&"))
+            {
+                prefix = url.IndexOf('?') == -1 ? "?" : "&";
+            }
             return url + prefix + key + "=" + (encode ? val.UrlEncode() : val);
         }
 

tests/ServiceStack.Text.Tests/HttpUtilsTests.cs

@@ -13,6 +13,8 @@ public void Can_AddQueryParam()
             Assert.That("http://example.com?f=1".AddQueryParam("f", "2"), Is.EqualTo("http://example.com?f=1&f=2"));
             Assert.That("http://example.com?s=0&f=1&s=1".AddQueryParam("f", "2"), Is.EqualTo("http://example.com?s=0&f=1&s=1&f=2"));
             Assert.That("http://example.com?s=rf&f=1".AddQueryParam("f", "2"), Is.EqualTo("http://example.com?s=rf&f=1&f=2"));
+            Assert.That("http://example.com?".AddQueryParam("f", "1"), Is.EqualTo("http://example.com?f=1"));
+            Assert.That("http://example.com?f=1&".AddQueryParam("f", "2"), Is.EqualTo("http://example.com?f=1&f=2"));
         }
 
         [Test]