these checks do not actually serve a purpose

mojolicious · Jan 11, 2016 · c697b50 · c697b50
1 parent 6e729ea
commit c697b50
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/lib/Mojo/Transaction/HTTP.pm b/lib/Mojo/Transaction/HTTP.pm
@@ -90,7 +90,7 @@ sub _body {
   if (defined $buffer) { delete $self->{delay} }
 
   # Delayed
-  elsif (delete $self->{delay}) { $self->{state} = 'paused' }
+  elsif (delete $self->{delay}) { $self->{state} = 'read' }
   else                          { $self->{delay} = 1 }
 
   # Finished

diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -252,8 +252,7 @@ sub _read {
   # Process incoming data
   warn term_escape "-- Client <<< Server (@{[_url($tx)]})\n$chunk\n" if DEBUG;
   $tx->client_read($chunk);
-  if    ($tx->is_finished) { $self->_finish($id) }
-  elsif ($tx->is_writing)  { $self->_write($id) }
+  $self->_finish($id) if $tx->is_finished;
 }
 
 sub _redirect {
@@ -317,8 +316,7 @@ sub _write {
 
   # Get and write chunk
   my $c = $self->{connections}{$id};
-  return unless my $tx = $c->{tx};
-  return if !$tx->is_writing || $c->{writing}++;
+  return if $c->{writing}++ || !(my $tx = $c->{tx});
   my $chunk = $tx->client_write;
   delete $c->{writing};
   warn term_escape "-- Client >>> Server (@{[_url($tx)]})\n$chunk\n" if DEBUG;