consistently escape before encoding

mojolicious · Jul 3, 2014 · 00e27e9 · 00e27e9
1 parent 8af37f1
commit 00e27e9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/Mojo/UserAgent/Transactor.pm b/lib/Mojo/UserAgent/Transactor.pm
@@ -230,7 +230,8 @@ sub _multipart {
       }
 
       # Content-Disposition
-      $name = url_escape $charset ? encode($charset, $name) : $name, '"';
+      $name = url_escape $name, '"';
+      $name = encode $charset, $name if $charset;
       my $disposition = qq{form-data; name="$name"};
       $disposition .= qq{; filename="$filename"} if defined $filename;
       $headers->content_disposition($disposition);