Fixed bug in last commit, updated tests to catch

igrigorik · Mar 4, 2013 · e0217fd · e0217fd
1 parent aef8e06
commit e0217fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/em-websocket/masking04.rb b/lib/em-websocket/masking04.rb
@@ -20,7 +20,7 @@ def slice_mask
       end
 
       def getbyte(index)
-        if defined? @masking_key
+        if defined?(@masking_key) && @masking_key
           masked_char = super
           masked_char ? masked_char ^ @masking_key.getbyte(index % 4) : nil
         else

diff --git a/spec/unit/masking_spec.rb b/spec/unit/masking_spec.rb
@@ -23,5 +23,7 @@
     t.getbyte(4).should == 0x03
     t.read_mask
     t.getbyte(4).should == 0x01
+    t.unset_mask
+    t.getbyte(4).should == 0x03
   end
 end