websocket-driver 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 279ea094c3b56d83654b92d0d2edc2f919a276b8
-  data.tar.gz: f9cc7d12ec60e7e495f434318e5bf6332ac42ce3
+  metadata.gz: 653c1d2f3e93b56720caa2628bb9164d9870a3cf
+  data.tar.gz: 3fe00f429a75159cc5c5b6f5104a1a5a8e792e89
 SHA512:
-  metadata.gz: 89b8be4c679cdc295e4863706fe340a542e63297195aa853798667852693f2c9917281de3128c935e213a7395696c082cd799d8d76cc6ef8dcce4fdd4f563635
-  data.tar.gz: be0b80ff9a6c35686fb1157ccb757f8770579c5655ada3f250b701e84f92fa4942510ed073b2c117acf6c07c2b839127fd20b12e5622c403905c50ba8d60649d
+  metadata.gz: 7692a1e01a589de14fc6be0992333f2664b8500bbd23ef0c5e182eb17201ba3f0f1ea0d877e3f7907c4e1bac300ca705c0fd363c02a40948478ad2b15f91e065
+  data.tar.gz: 1d994b02ccd3ad8b4a560863f272a24daba29cee2a89f02e7e5d48591ba0a17aaf80000fa223cf948e556951502b5ff4f607cca50d55e594314eb6363d505c43

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: ruby
 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