websocket-driver 0.6.1-java → 0.6.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81bc9d0a2ba7b91d6f4bac417ea9de075d12d507
-  data.tar.gz: bae681f507b1a96555ee445183e85db458c16d43
+  metadata.gz: c901112b6c0a993b2d8ef9aefb403a35f48ece9a
+  data.tar.gz: 4a2060e078501b09e32e25ce468572cc8510573d
 SHA512:
-  metadata.gz: a814393c27746b08531bbe082552f3ba28009448822983ba4c4c75b054b0794e4ba1d6a1e2b42caed6ef2750229e97bfd26ee6d3b6668def7d1ce6a684f51d63
-  data.tar.gz: 531b096bf58b8a9f16f2174447cf59aa4d01dd4c4b8883bf6d92051afdff8e2fbb469981229d5d07a0348aaad30d7dded377ca7a32424c59a95f6b8834fba33b
+  metadata.gz: ec00c1ae96b5c0e6ffdcb3511a142e53426bbdbee00c91ce1832b77259026bf029d62cbcdbf735e2b3b955bdaefc6b0ae4bf2144438bb004ba3322ac159216a1
+  data.tar.gz: b56f747f1de4c2876e6929a23fcea02621cb5e24679442f0623d7a0ae414da4dcc2b491ecc58c10dd955be88e77b3599649594534e144357a317c6fdea8f34da

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.6.2 / 2015-07-18
+
+* When the peer sends a close frame with no error code, emit 1000
+
 ### 0.6.1 / 2015-07-13
 
 * Fix how events are stored in `EventEmitter` to fix a backward-compatibility

data/lib/websocket/driver/hybi.rb

@@ -47,6 +47,7 @@ module WebSocket
       }
 
       ERROR_CODES        = ERRORS.values
+      DEFAULT_ERROR_CODE = 1000
       MIN_RESERVED_ERROR = 3000
       MAX_RESERVED_ERROR = 4999
 
@@ -354,7 +355,7 @@ module WebSocket
             @message << frame
 
           when OPCODES[:close] then
-            code   = (bytesize >= 2) ? 256 * bytes[0] + bytes[1] : nil
+            code   = (bytesize >= 2) ? payload.unpack(PACK_FORMATS[2]).first : nil
             reason = (bytesize > 2)  ? Driver.encode(bytes[2..-1] || [], :utf8) : nil
 
             unless (bytesize == 0) or
@@ -367,7 +368,7 @@ module WebSocket
               code = ERRORS[:protocol_error]
             end
 
-            shutdown(code, reason || '')
+            shutdown(code || DEFAULT_ERROR_CODE, reason || '')
 
           when OPCODES[:ping] then
             frame(payload, :pong)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-driver
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: java
 authors:
 - James Coglan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-extensions