Fixed a couple of 1.8.7 bugs - closes #85

igrigorik · Jul 12, 2012 · 093d5fe · 093d5fe
1 parent 3896511
commit 093d5fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/em-websocket/connection.rb b/lib/em-websocket/connection.rb
@@ -161,7 +161,8 @@ def send(data)
 
         # Revert data back to the original encoding (which we assume is UTF-8)
         # Doing this to avoid duping the string - there may be a better way
-        data.force_encoding(UTF8)
+        data.force_encoding(UTF8) if ENCODING_SUPPORTED
+        return nil
       end
 
       # Send a ping to the client. The client must respond with a pong.

diff --git a/lib/em-websocket/masking04.rb b/lib/em-websocket/masking04.rb
@@ -29,7 +29,8 @@ def getbyte(index)
       end
 
       def getbytes(start_index, count)
-        data = ''.force_encoding('ASCII-8BIT')
+        data = ''
+        data.force_encoding('ASCII-8BIT') if data.respond_to?(:force_encoding)
         count.times do |i|
           data << getbyte(start_index + i)
         end