no charset is an option too

mojolicious · Dec 17, 2015 · dfb031b · dfb031b
1 parent 129e317
commit dfb031b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Mojo/UserAgent/Transactor.pm b/lib/Mojo/UserAgent/Transactor.pm
@@ -151,7 +151,7 @@ sub websocket {
 
 sub _form {
   my ($self, $tx, $form, %options) = @_;
-  $options{charset} //= 'UTF-8';
+  $options{charset} = 'UTF-8' unless exists $options{charset};
 
   # Check for uploads and force multipart if necessary
   my $req       = $tx->req;

diff --git a/t/mojolicious/charset_lite_app.t b/t/mojolicious/charset_lite_app.t
@@ -56,13 +56,13 @@ $t->post_ok('/' => form => {foo => 'yatta'})->status_is(200)
   ->content_is('foo: yatta');
 
 # Send raw Shift_JIS octets (like browsers do)
-$t->post_ok('/' => form => {foo => $yatta_sjis} => charset => '')
+$t->post_ok('/' => form => {foo => $yatta_sjis} => charset => undef)
   ->status_is(200)->content_type_unlike(qr/application/)
   ->content_type_like(qr/Shift_JIS/)->content_like(qr/$yatta/);
 
 # Send raw Shift_JIS octets (like browsers do, multipart message)
 $t->post_ok('/' => {'Content-Type' => 'multipart/form-data'} => form =>
-    {foo => $yatta_sjis} => charset => '')->status_is(200)
+    {foo => $yatta_sjis} => charset => undef)->status_is(200)
   ->content_type_like(qr/Shift_JIS/)->content_like(qr/$yatta/);
 
 # Send as string