From 4e80500df62db0e50bda8e5d06d70b7d4c8979b7 Mon Sep 17 00:00:00 2001 From: Dingding Ye Date: Fri, 13 Jan 2012 01:06:32 +0800 Subject: [PATCH] Force MaskedString#getbytes using encoding ASCII-8BIT, or else it will use the default encoding which may cause problem --- em-websocket.gemspec | 4 ++-- lib/em-websocket/masking04.rb | 2 +- lib/em-websocket/version.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/em-websocket.gemspec b/em-websocket.gemspec index 35ce356..8005669 100644 --- a/em-websocket.gemspec +++ b/em-websocket.gemspec @@ -21,9 +21,9 @@ Gem::Specification.new do |s| s.add_dependency("eventmachine", ">= 0.12.9") s.add_dependency("addressable", '>= 2.1.1') - s.add_development_dependency('em-spec', '~> 0.2.5') + s.add_development_dependency('em-spec', '~> 0.2.6') s.add_development_dependency("eventmachine", "~> 0.12.10") s.add_development_dependency('em-http-request', '~> 0.2.6') - s.add_development_dependency('rspec', "~> 2.6.0") + s.add_development_dependency('rspec', "~> 2.8.0") s.add_development_dependency('rake') end diff --git a/lib/em-websocket/masking04.rb b/lib/em-websocket/masking04.rb index b75f59a..a6e9b57 100644 --- a/lib/em-websocket/masking04.rb +++ b/lib/em-websocket/masking04.rb @@ -29,7 +29,7 @@ def getbyte(index) end def getbytes(start_index, count) - data = '' + data = ''.force_encoding('ASCII-8BIT') count.times do |i| data << getbyte(start_index + i) end diff --git a/lib/em-websocket/version.rb b/lib/em-websocket/version.rb index ecb152b..70d3c93 100644 --- a/lib/em-websocket/version.rb +++ b/lib/em-websocket/version.rb @@ -1,5 +1,5 @@ module EventMachine module Websocket - VERSION = "0.3.6" + VERSION = "0.3.7" end end