and more parse_header bugs

mojolicious · Jun 1, 2013 · df3d5e0 · df3d5e0
1 parent 36e95c6
commit df3d5e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/Mojo/Util.pm b/lib/Mojo/Util.pm
@@ -133,7 +133,7 @@ sub parse_header {
   my $str = shift;
 
   my (@tree, @token);
-  while ($str =~ s/^\s*([^=;, ]+)\s*//) {
+  while ($str =~ s/^[,;\s]*([^=;, ]+)\s*//) {
     push @token, $1, undef;
     $token[-1] = unquote($1)
       if $str =~ s/^=\s*("(?:\\\\|\\"|[^"])*"|[^;, ]*)\s*//;

diff --git a/t/mojo/util.t b/t/mojo/util.t
@@ -60,6 +60,10 @@ is get_line(\$buffer), undef, 'no line';
 
 # parse_header
 is_deeply parse_header(''), [], 'right result';
+is_deeply parse_header(',,foo,, ,bar'), [['foo', undef], ['bar', undef]],
+  'right result';
+is_deeply parse_header(';;foo; ; ;bar'), [['foo', undef, 'bar', undef]],
+  'right result';
 is_deeply parse_header('foo=;bar=""'), [['foo', '', 'bar', '']],
   'right result';
 is_deeply parse_header('foo=bar baz=yada'), [['foo', 'bar', 'baz', 'yada']],
@@ -69,7 +73,7 @@ is_deeply parse_header('foo,bar,baz'),
 is_deeply parse_header('f "o" o , ba  r'),
   [['f', undef, '"o"', undef, 'o', undef], ['ba', undef, 'r', undef]],
   'right result';
-is_deeply parse_header('foo="b a\" r\"\\\\"'), [['foo', 'b a" r"\\']],
+is_deeply parse_header('foo="b,; a\" r\"\\\\"'), [['foo', 'b,; a" r"\\']],
   'right result';
 is_deeply parse_header('foo = "b a\" r\"\\\\"'), [['foo', 'b a" r"\\']],
   'right result';