local is more elegant

mojolicious · Jan 28, 2016 · 2e52faf · 2e52faf
1 parent 1bfe20d
commit 2e52faf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,5 @@
 
-6.43  2016-01-27
+6.43  2016-01-28
   - Removed client_close and server_close methods from Mojo::Transaction.
   - Added closed method to Mojo::Transaction.
   - Added parse_message method to Mojo::Transaction::WebSocket.

diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -227,9 +227,9 @@ sub _write {
 
   # Protect from resume event recursion
   my $c = $self->{connections}{$id};
-  return if !(my $tx = $c->{tx}) || $c->{writing}++;
+  return if !(my $tx = $c->{tx}) || $c->{writing};
+  local $c->{writing} = 1;
   my $chunk = $tx->server_write;
-  delete $c->{writing};
   warn term_escape "-- Server >>> Client (@{[_url($tx)]})\n$chunk\n" if DEBUG;
   my $next = $tx->is_finished ? '_finish' : $chunk eq '' ? undef : '_write';
   return $self->ioloop->stream($id)->write($chunk) unless $next;

diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -317,9 +317,9 @@ sub _write {
 
   # Protect from resume event recursion
   my $c = $self->{connections}{$id};
-  return if !(my $tx = $c->{tx}) || $c->{writing}++;
+  return if !(my $tx = $c->{tx}) || $c->{writing};
+  local $c->{writing} = 1;
   my $chunk = $tx->client_write;
-  delete $c->{writing};
   warn term_escape "-- Client >>> Server (@{[_url($tx)]})\n$chunk\n" if DEBUG;
   return if $chunk eq '';
   weaken $self;