websocket-driver 0.5.3-java → 0.5.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 109c1f59f22a771cae5e2f1cdd979b35c502ea15
-  data.tar.gz: 53e2427e3b644794392c476c1e7be23255c3ca4b
+  metadata.gz: 4c6f967537a9e90a5e34627cc7b9738443976081
+  data.tar.gz: 7d8b0e815c6bc9fe96d63e397b0af3600df3d3ed
 SHA512:
-  metadata.gz: 8b7798d7dfb4d22189d1301e9fa2e7536fb2e7e06a00b0e19065f766a925029b077b85f1f53f35024e0bce2daa670ac7ab97b4b0389055585ba6e84bc01cd1b5
-  data.tar.gz: 156bce5b21675bfc563338ac3054d8719260ab5a7662fa9e1dfaa1710d5bae479bbf62a97432ff8fe1e122bc4ff6ef3de186578af424a9355f30916adae4edba
+  metadata.gz: 617369b8f735060d83e95b573dd17a7ae795675c1f3b056c20416547d884f7d17de56fcde9de9c3daea23d5db1d024dc12d269ff4fa20c2b0aa786d91f829a83
+  data.tar.gz: 39f201f433cb3814f3833faef99af9678dc2887c87550343e317e087fc76fb258af32dc9e84dfd07499bbfcb362344b803f48f0d4fef5f6e6a2c01ca12d5617a

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.5.4 / 2015-03-29
+
+* Don't emit extra close frames if we receive a close frame after we already
+  sent one
+* Fail the connection when the driver receives an invalid
+  `Sec-WebSocket-Extensions` header
+
 ### 0.5.3 / 2015-02-22
 
 * Don't treat incoming data as WebSocket frames if a client driver is closed
@@ -21,7 +28,8 @@
 
 ### 0.3.5 / 2014-10-04
 
-* Fix bug where the `Server` driver doesn't pass `ping` callbacks to its delegate
+* Fix bug where the `Server` driver doesn't pass `ping` callbacks to its
+  delegate
 * Fix an arity error when calling `fail_request`
 * Allow `close` to be called before `start` to close the driver
 
@@ -29,7 +37,8 @@
 
 * Don't hold references to frame buffers after a message has been emitted
 * Make sure that `protocol` and `version` are exposed properly by the TCP driver
-* Correct HTTP header parsing based on RFC 7230; header names cannot contain backslashes
+* Correct HTTP header parsing based on RFC 7230; header names cannot contain
+  backslashes
 
 ### 0.3.3 / 2014-04-24
 
@@ -39,7 +48,8 @@
 
 ### 0.3.2 / 2013-12-29
 
-* Expand `max_length` to cover sequences of continuation frames and `draft-{75,76}`
+* Expand `max_length` to cover sequences of continuation frames and
+  `draft-{75,76}`
 * Decrease default maximum frame buffer size to 64MB
 * Stop parsing when the protocol enters a failure mode, to save CPU cycles
 

data/README.md

@@ -311,7 +311,7 @@ the headers are serialized and sent.
 
 Initiates the protocol by sending the handshake - either the response for a
 server-side driver or the request for a client-side one. This should be the
-first method you invoke.  Returns `true` iff a handshake was sent.
+first method you invoke.  Returns `true` if and only if a handshake was sent.
 
 #### `driver.parse(string)`
 

data/lib/websocket/driver.rb

@@ -89,7 +89,9 @@ module WebSocket
 
     def start
       return false unless @ready_state == 0
-      @socket.write(Driver.encode(handshake_response, :binary))
+      response = handshake_response
+      return false unless response
+      @socket.write(Driver.encode(response, :binary))
       open unless @stage == -1
       true
     end

data/lib/websocket/driver/hybi.rb

@@ -237,7 +237,13 @@ module WebSocket
       end
 
       def handshake_response
-        extensions = @extensions.generate_response(@socket.env['HTTP_SEC_WEBSOCKET_EXTENSIONS'])
+        begin
+          extensions = @extensions.generate_response(@socket.env['HTTP_SEC_WEBSOCKET_EXTENSIONS'])
+        rescue => e
+          fail(:protocol_error, e.message)
+          return nil
+        end
+
         @headers['Sec-WebSocket-Extensions'] = extensions if extensions
 
         start   = 'HTTP/1.1 101 Switching Protocols'
@@ -246,7 +252,7 @@ module WebSocket
       end
 
       def shutdown(code, reason)
-        frame(reason, :close, code)
+        frame(reason, :close, code) if @ready_state < 2
         @frame = @message = nil
         @ready_state = 3
         @stage = 5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-driver
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: java
 authors:
 - James Coglan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-extensions
@@ -87,30 +87,30 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- README.md
 - CHANGELOG.md
-- ext/websocket-driver/websocket_mask.c
+- README.md
+- examples/tcp_server.rb
 - ext/websocket-driver/WebsocketMaskService.java
 - ext/websocket-driver/extconf.rb
-- examples/tcp_server.rb
+- ext/websocket-driver/websocket_mask.c
 - lib/websocket/driver.rb
-- lib/websocket/http.rb
-- lib/websocket/websocket_mask.rb
 - lib/websocket/driver/client.rb
 - lib/websocket/driver/draft75.rb
 - lib/websocket/driver/draft76.rb
 - lib/websocket/driver/event_emitter.rb
 - lib/websocket/driver/headers.rb
 - lib/websocket/driver/hybi.rb
-- lib/websocket/driver/proxy.rb
-- lib/websocket/driver/server.rb
-- lib/websocket/driver/utf8_match.rb
 - lib/websocket/driver/hybi/frame.rb
 - lib/websocket/driver/hybi/message.rb
 - lib/websocket/driver/hybi/stream_reader.rb
+- lib/websocket/driver/proxy.rb
+- lib/websocket/driver/server.rb
+- lib/websocket/driver/utf8_match.rb
+- lib/websocket/http.rb
 - lib/websocket/http/headers.rb
 - lib/websocket/http/request.rb
 - lib/websocket/http/response.rb
+- lib/websocket/websocket_mask.rb
 - lib/websocket_mask.jar
 homepage: http://github.com/faye/websocket-driver-ruby
 licenses:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: WebSocket protocol handler with pluggable I/O