Skip to content
Browse files

Merge pull request #72 from sishen/master

MaskedString#getbytes may return the utf8 encoded string
  • Loading branch information...
2 parents ca98c11 + 4e80500 commit 8772645045b31b0d4ca4bedc711781b7140e07e6 @mloughran mloughran committed Jan 12, 2012
Showing with 4 additions and 4 deletions.
  1. +2 −2 em-websocket.gemspec
  2. +1 −1 lib/em-websocket/masking04.rb
  3. +1 −1 lib/em-websocket/version.rb
View
4 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
View
2 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
View
2 lib/em-websocket/version.rb
@@ -1,5 +1,5 @@
module EventMachine
module Websocket
- VERSION = "0.3.6"
+ VERSION = "0.3.7"
end
end

0 comments on commit 8772645

Please sign in to comment.
Something went wrong with that request. Please try again.