fixed memory leak in Mojo::Message::Request

mojolicious · Nov 20, 2012 · 6c84566 · 6c84566
1 parent 208dd89
commit 6c84566
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,7 @@
 
 3.59  2012-11-20
   - Improved tests.
+  - Fixed memory leak in Mojo::Message::Request.
   - Fixed keep alive bug in Mojo::Server::Daemon.
 
 3.58  2012-11-19

diff --git a/lib/Mojo/Message.pm b/lib/Mojo/Message.pm
@@ -229,9 +229,7 @@ sub parse {
     if $self->content->is_limit_exceeded;
 
   # Progress
-  $self->emit('progress');
-
-  return $self->content->is_finished ? $self->finish : $self;
+  return $self->emit('progress')->content->is_finished ? $self->finish : $self;
 }
 
 sub start_line_size { length shift->build_start_line }

diff --git a/lib/Mojo/Message/Request.pm b/lib/Mojo/Message/Request.pm
@@ -159,11 +159,11 @@ sub parse {
 
   # CGI like environment
   $self->env($env)->_parse_env($env) if $env;
-  $self->content($self->content->parse_body(@args))
-    if ($self->{state} // '') eq 'cgi';
+  my $cgi = ($self->{state} // '') eq 'cgi';
+  $self->content($self->content->parse_body(@args)) if $cgi;
 
-  # Pass through
-  $self->SUPER::parse(@args);
+  # Pass through for normal requests
+  $self->SUPER::parse($cgi ? undef : @args);
 
   # Check if we can fix things that require all headers
   return $self unless $self->is_finished;