finish transactions a little more consistently

mojolicious · Jan 9, 2016 · ca8316a · ca8316a
1 parent c319e7d
commit ca8316a
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -119,23 +119,21 @@ sub _finish {
   return $self->_remove($id) if $tx->is_websocket;
 
   # Finish transaction
-  $tx->server_close;
+  delete($c->{tx})->server_close;
 
   # Upgrade connection to WebSocket
-  if (my $ws = $c->{tx} = $tx->next) {
+  if (my $ws = $tx->next) {
 
     # Successful upgrade
     if ($ws->handshake($tx->next(undef))->res->code == 101) {
+      $c->{tx} = $ws;
       weaken $self;
       $ws->on(resume => sub { $self->_write($id) });
       $ws->server_open;
     }
 
     # Failed upgrade
-    else {
-      delete $c->{tx};
-      $ws->server_close;
-    }
+    else { $ws->server_close }
   }
 
   # Close connection if necessary