fixed content test

mojolicious · Jan 16, 2013 · 7cc950a · 7cc950a
1 parent 2acdad7
commit 7cc950a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Changes b/Changes
@@ -3,6 +3,7 @@
   - Added modules Mojo::Server::Prefork and Mojolicious::Command::prefork.
   - Updated jQuery to version 1.9.
   - Improved documentation.
+  - Improved tests.
   - Fixed small memory leak in Hypnotoad that only shows when Perl is compiled
     with -DPERL_USE_SAFE_PUTENV. (lewoberst)
 

diff --git a/lib/Mojo/Content.pm b/lib/Mojo/Content.pm
@@ -140,8 +140,8 @@ sub parse {
     my $len = $headers->content_length || 0;
     $self->{size} ||= 0;
     if ((my $need = $len - $self->{size}) > 0) {
-      $need = length($self->{buffer}) if $need > length($self->{buffer});
-      my $chunk = substr $self->{buffer}, 0, $need, '';
+      my $len = length $self->{buffer};
+      my $chunk = substr $self->{buffer}, 0, $need > $len ? $len : $need, '';
       $self->_uncompress($chunk);
       $self->{size} += length $chunk;
     }

diff --git a/t/mojo/content.t b/t/mojo/content.t
@@ -77,12 +77,12 @@ ok !$content->charset, 'no charset';
 'a' =~ /(.)/;
 ok !$content->boundary, 'no boundary';
 
-# Upload > 2G on 32-bit Perl
+# Partial upload with 64bit content length
 $content = Mojo::Content::Single->new;
-$content->parse("Content-Length: 2200000000\r\n\r\nHello World!");
-is $content->asset->size, 12, 'right upload size';
+$content->parse("Content-Length: 2222222222\x0d\x0a\x0d\x0aHello World!");
+is $content->asset->size, 12, 'right size';
 $content = Mojo::Content::Single->new;
-$content->parse("Content-Length: 4400000000\r\n\r\nHello World!");
-is $content->asset->size, 12, 'right upload size';
+$content->parse("Content-Length: 4444444444\x0d\x0a\x0d\x0aHello World!");
+is $content->asset->size, 12, 'right size';
 
 done_testing();