@@ -12,8 +12,4 @@ public class FormdataNode extends HashValue implements Formdata {
   public FormdataNode(Context ctx) {
     super(ctx, null);
   }
-
-  @Override protected String decode(String value) {
-    return UrlParser.decode(value, false);
-  }
 }
@@ -30,14 +30,10 @@ public static QueryString queryString(Context ctx, String queryString) {
   }
 
   public static String decodePathSegment(String value) {
-    return decode(value, true);
-  }
-
-  public static String decode(String value, boolean isPath) {
     if (value == null || value.length() == 0) {
       return "";
     }
-    return decodeComponent(value, 0, value.length(), StandardCharsets.UTF_8, isPath);
+    return decodeComponent(value, 0, value.length(), StandardCharsets.UTF_8, true);
   }
 
   private static void decodeParams(HashValue root, String s, int from, Charset charset,
 
@@ -2999,16 +2999,33 @@ public void rawVsDecodedValues(ServerTestRunner runner) {
         assertEquals("a b/", rsp.body().string().trim());
       });
 
+      // put in encoded value, expect urldecode(value)
       client.post("/form", new FormBody.Builder()
-          .add("v", "a+b%2f")
+          .addEncoded("v", "a+b%2f")
           .build(), rsp -> {
         assertEquals("a b/", rsp.body().string());
       });
 
+      // put in "raw" value, expect it as it is
+      client.post("/form", new FormBody.Builder()
+          .add("v", "a+b%2f")
+          .build(), rsp -> {
+        assertEquals("a+b%2f", rsp.body().string());
+      });
+
+      // no coding is done, expect it as it is
       client.post("/multipart", new MultipartBody.Builder()
           .setType(MultipartBody.FORM)
           .addFormDataPart("v", "a+b%2f")
           .build(), rsp -> {
+        assertEquals("a+b%2f", rsp.body().string());
+      });
+
+      // no coding is done, expect it as it is
+      client.post("/multipart", new MultipartBody.Builder()
+          .setType(MultipartBody.FORM)
+          .addFormDataPart("v", "a b/")
+          .build(), rsp -> {
         assertEquals("a b/", rsp.body().string());
       });
     });
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,4 @@ public class FormdataNode extends HashValue implements Formdata {`
`12`	`12`	`public FormdataNode(Context ctx) {`
`13`	`13`	`super(ctx, null);`
`14`	`14`	`}`
`15`		`-`
`16`		`- @Override protected String decode(String value) {`
`17`		`- return UrlParser.decode(value, false);`
`18`		`- }`
`19`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,10 @@ public static QueryString queryString(Context ctx, String queryString) {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public static String decodePathSegment(String value) {`
`33`		`- return decode(value, true);`
`34`		`- }`
`35`		`-`
`36`		`- public static String decode(String value, boolean isPath) {`
`37`	`33`	`if (value == null \|\| value.length() == 0) {`
`38`	`34`	`return "";`
`39`	`35`	`}`
`40`		`- return decodeComponent(value, 0, value.length(), StandardCharsets.UTF_8, isPath);`
	`36`	`+ return decodeComponent(value, 0, value.length(), StandardCharsets.UTF_8, true);`
`41`	`37`	`}`
`42`	`38`
`43`	`39`	`private static void decodeParams(HashValue root, String s, int from, Charset charset,`