more boundary tests

mojolicious · Oct 31, 2012 · 9354ce2 · 9354ce2
1 parent 470c4dd
commit 9354ce2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/Mojo/Content.pm b/lib/Mojo/Content.pm
@@ -17,7 +17,7 @@ sub body_size { croak 'Method "body_size" not implemented by subclass' }
 
 sub boundary {
   my $type = shift->headers->content_type || '';
-  $type =~ m!multipart.*boundary="*([a-zA-Z0-9'(),.:?\-_+/]+)!i and return $1;
+  $type =~ m!multipart.*boundary="?([a-zA-Z0-9'(),.:?\-_+/]+)!i and return $1;
   return undef;
 }
 

diff --git a/t/mojo/content.t b/t/mojo/content.t
@@ -55,6 +55,13 @@ is $content->build_body,
   "6\x0d\x0aHello \x0d\x0a6\x0d\x0aWorld!\x0d\x0a0\x0d\x0a\x0d\x0a",
   'right content';
 
+# Multipart boundary detection
+$content = Mojo::Content::MultiPart->new;
+$content->headers->content_type(
+  'multipart/form-data; boundary="azAZ09\'(),.:?-_+/"');
+is $content->boundary, "azAZ09\'(),.:?-_+/", 'right boundary';
+is $content->boundary, $content->build_boundary, 'same boundary';
+
 # Tainted environment
 $content = Mojo::Content::MultiPart->new;
 'a' =~ /(.)/;