fix state transition bugs in Mojo::Transaction::HTTP

mojolicious · Sep 22, 2016 · e135670 · e135670
1 parent f6a27f6
commit e135670
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,7 @@
 
-7.08  2016-09-21
+7.08  2016-09-22
+  - Improved accuracy of finished_ok test in Test::Mojo.
+  - Fixed state transition bugs in Mojo::Transaction::HTTP.
 
 7.07  2016-09-20
   - Fixed bug in Mojo::UserAgent::Transactor where 303 redirects would not be

diff --git a/lib/Mojo/Transaction/HTTP.pm b/lib/Mojo/Transaction/HTTP.pm
@@ -96,7 +96,7 @@ sub _headers {
     @$self{qw(http_state offset)} = ('body', 0);
 
     # Response without body
-    if ($head && $self->is_empty) { $self->completed }
+    if ($head && $self->is_empty) { $self->completed->{http_state} = 'empty' }
 
     # Body
     else { $self->{write} = $msg->content->is_dynamic ? 1 : $msg->body_size }

diff --git a/lib/Test/Mojo.pm b/lib/Test/Mojo.pm
@@ -113,7 +113,7 @@ sub finished_ok {
   my ($self, $code) = @_;
   Mojo::IOLoop->one_tick while !$self->{finished};
   Test::More::diag "WebSocket closed with status $self->{finished}[0]"
-    unless my $ok = grep { $self->{finished}[0] == $_ } $code, 1006;
+    unless my $ok = $self->{finished}[0] == $code;
   return $self->_test('ok', $ok, "WebSocket closed with status $code");
 }
 

diff --git a/t/mojo/websocket.t b/t/mojo/websocket.t
@@ -57,6 +57,11 @@ websocket '/early_start' => sub {
   );
 };
 
+websocket '/early_finish' => sub {
+  my $c = shift;
+  Mojo::IOLoop->next_tick(sub { $c->rendered(101)->finish(4000, 'kaboom') });
+};
+
 websocket '/denied' => sub {
   my $c = shift;
   $c->tx->handshake->on(finish => sub { $c->stash->{handshake}++ });
@@ -187,6 +192,18 @@ is $status,      1000, 'right status';
 is $msg,         'I ♥ Mojolicious!', 'right message';
 is $result,      'test0test2test1', 'right result';
 
+# WebSocket connection gets closed very fast
+$status = undef;
+$ua->websocket(
+  '/early_finish' => sub {
+    my ($ua, $tx) = @_;
+    $tx->on(finish => sub { $status = [@_[1, 2]]; Mojo::IOLoop->stop });
+  }
+);
+Mojo::IOLoop->start;
+is $status->[0], 4000,     'right status';
+is $status->[1], 'kaboom', 'right message';
+
 # Connection denied
 ($stash, $code, $ws) = ();
 app->plugins->once(before_dispatch => sub { $stash = shift->stash });

diff --git a/t/mojolicious/websocket_lite_app.t b/t/mojolicious/websocket_lite_app.t
@@ -25,6 +25,7 @@ get '/echo' => {text => 'plain echo!'};
 websocket '/no_compression' => sub {
   my $c = shift;
   $c->on(binary => sub { shift->send({binary => shift}) });
+  $c->render(text => 'this should be ignored', status => 101);
 };
 
 websocket '/protocols' => sub {