fixed one-byte payload bug in Mojo::Transaction::WebSocket

mojolicious · Nov 29, 2011 · 7c20730 · 7c20730
1 parent e8440cf
commit 7c20730
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -1,8 +1,9 @@
 This file documents the revision history for Perl extension Mojolicious.
 
-2.35    2011-11-29 00:00:00
+2.35    2011-11-30 00:00:00
         - Added EXPERIMENTAL etag method to Mojo::Headers.
         - Improved documentation.
+        - Fixed one-byte payload bug in Mojo::Transaction::WebSocket. (tinx)
 
 2.34    2011-11-28 00:00:00
         - Added "websocket.pl" to example scripts.

diff --git a/lib/Mojo/Transaction/WebSocket.pm b/lib/Mojo/Transaction/WebSocket.pm
@@ -182,7 +182,7 @@ sub parse_frame {
 
   # Check if whole packet has arrived
   my $masked = vec($head, 1, 8) & 0b10000000;
-  return if length $clone < ($len + $hlen + $masked ? 4 : 0);
+  return if length $clone < ($len + $hlen + ($masked ? 4 : 0));
   substr $clone, 0, $hlen, '';
 
   # Payload

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -733,6 +733,8 @@ Anatoly Sharifulin
 
 Andre Vieth
 
+Andreas Jaekel
+
 Andrew Fresh
 
 Andreas Koenig

diff --git a/t/mojo/websocket_frames.t b/t/mojo/websocket_frames.t
@@ -3,7 +3,7 @@ use Mojo::Base -strict;
 
 # "Being eaten by crocodile is just like going to sleep...
 #  in a giant blender."
-use Test::More tests => 17;
+use Test::More tests => 25;
 
 use_ok 'Mojo::Transaction::WebSocket';
 
@@ -44,3 +44,21 @@ is $frame->[1], 2,            'binary frame';
 is $frame->[2], 'just works', 'right payload';
 isnt Mojo::Transaction::WebSocket->new->build_frame(1, 2, 'just works'),
   $bytes, 'frames are not equal';
+
+# One-character text frame roundtrip
+$ws    = Mojo::Transaction::WebSocket->new;
+$bytes = $ws->build_frame(1, 1, 'a');
+$frame = $ws->parse_frame(\($dummy = $bytes));
+is $frame->[0], 1,   'fin flag is set';
+is $frame->[1], 1,   'text frame';
+is $frame->[2], 'a', 'right payload';
+is $ws->build_frame(1, 1, 'a'), $bytes, 'frames are equal';
+
+# One-byte binary frame roundtrip
+$ws    = Mojo::Transaction::WebSocket->new;
+$bytes = $ws->build_frame(1, 2, 'a');
+$frame = $ws->parse_frame(\($dummy = $bytes));
+is $frame->[0], 1,   'fin flag is set';
+is $frame->[1], 2,   'binary frame';
+is $frame->[2], 'a', 'right payload';
+is $bytes = $ws->build_frame(1, 2, 'a'), $bytes, 'frames are equal';