Updating uri_builder::append_query to use a switch statement and adding a test.

Author: stgates

Release/include/cpprest/uri_builder.h

@@ -244,10 +244,19 @@ namespace web
             {
                 auto encodingCheck = [](int ch)
                 {
-                    // Encode '&', ';', and '=' since they are used
-                    // as delimiters in query component.
-                    return ch == '&' || ch == ';' || ch == '=' || !::web::details::uri_parser::is_query_character(ch)
-                        || ch == '%' || ch == '+';
+                    switch (ch)
+                    {
+                        // Encode '&', ';', and '=' since they are used
+                        // as delimiters in query component.
+                    case '&':
+                    case ';':
+                    case '=':
+                    case '%':
+                    case '+':
+                        return true;
+                    default:
+                        return !::web::details::uri_parser::is_query_character(ch);
+                    }
                 };
                 encodedName = uri::encode_impl(encodedName, encodingCheck);
                 encodedValue = uri::encode_impl(encodedValue, encodingCheck);

Release/tests/functional/uri/uri_builder_tests.cpp

@@ -321,6 +321,13 @@ TEST(append_query_string)
     VERIFY_ARE_EQUAL(U("key1=value1&key2=value2&key3=value3&key4=value4&key5=1&key6=val6&key%3D%26%3B=%3D%26%3Bvalue"), builder.query());
 }
 
+TEST(append_query_string_no_encode)
+{
+    uri_builder builder;
+    builder.append_query(U("key=&;"), U("=&;value"), false);
+    VERIFY_ARE_EQUAL(U("key=&;==&;value"), builder.query());
+}
+
 TEST(append_string)
 {
     // with just path