permessage_deflate 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 152e4441be7d3c79b3e8169d4268b2d7f5abdb09
-  data.tar.gz: af5b39863453e9a56cbc33cd1cb96a4e0956bf9b
+  metadata.gz: 0b7269ee5c2053e590df3ee23dee682643a94141
+  data.tar.gz: ce977b261ba5a4496a18a295ba786e522ff7c54d
 SHA512:
-  metadata.gz: 3a80afa2e48ab51d6f2d80f2132f4c52ff3c9c80dcf3a17b4911970266f728919b068e0df991b060af8aa5e4a940df65749908b0a13c7ece32f3b7503d79929e
-  data.tar.gz: 989ee3dfa1d4c62618cd816be874a69e4f7508dd5e8d23c4e64cfa67b6e312fcc0a4c99ed523825b82c623b486bea216672a79d169b2d4e2959a020e846a5981
+  metadata.gz: 5c5e3671daa908ef039e1d0ebc7adc7f216072b38f04f2f6668cd1b74acc5c81946233053002cbff5af045fc8454ab087a2bdc03d90e4dab9cf94bf5f57e1617
+  data.tar.gz: d4b4e6f843ed4eef06eb7c5b16a1c322689c9f61bd662fc581c1101824011113674c3c6248f89e9ec798bb6895cd64a401eb0408ada92c634d81903dfe5e1424

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.1.4 / 2017-09-10
+
+* Use `9` instead of `8` as the `windowBits` parameter to zlib, to deal with
+  restrictions introduced in zlib v1.2.9
+
 ### 0.1.3 / 2016-05-20
 
 * Amend all warnings issued when running with -W2

data/LICENSE.md

@@ -0,0 +1,21 @@
+# The MIT License
+
+Copyright (c) 2014-2017 James Coglan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the 'Software'), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/README.md

@@ -11,7 +11,7 @@ WebSocket protocol extension as a plugin for
 $ gem install permessage_deflate
 ```
 
-## Usage
+## Usage
 
 Add the plugin to your extensions:
 
@@ -65,26 +65,3 @@ can be used to set the local session's behaviour and control that of the peer:
   if requested by the peer
 * `:request_max_window_bits`: an integer from `8` to `15` inclusive to ask the
   other peer to use to set its maximum sliding window size, if supported
-
-## License
-
-(The MIT License)
-
-Copyright (c) 2014-2016 James Coglan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the 'Software'), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/permessage_deflate/server_session.rb

@@ -19,21 +19,21 @@ class PermessageDeflate
     def generate_response
       response = {}
 
-      # https://tools.ietf.org/html/draft-ietf-hybi-permessage-compression#section-8.1.1.1
+      # https://tools.ietf.org/html/rfc7692#section-7.1.1.1
 
       @own_context_takeover = !@accept_no_context_takeover &&
                               !@params['server_no_context_takeover']
 
       response['server_no_context_takeover'] = true unless @own_context_takeover
 
-      # https://tools.ietf.org/html/draft-ietf-hybi-permessage-compression#section-8.1.1.2
+      # https://tools.ietf.org/html/rfc7692#section-7.1.1.2
 
       @peer_context_takeover = !@request_no_context_takeover &&
                                !@params['client_no_context_takeover']
 
       response['client_no_context_takeover'] = true unless @peer_context_takeover
 
-      # https://tools.ietf.org/html/draft-ietf-hybi-permessage-compression#section-8.1.2.1
+      # https://tools.ietf.org/html/rfc7692#section-7.1.2.1
 
       @own_window_bits = [ @accept_max_window_bits || MAX_WINDOW_BITS,
                            @params['server_max_window_bits'] || MAX_WINDOW_BITS
@@ -45,7 +45,7 @@ class PermessageDeflate
         response['server_max_window_bits'] = @own_window_bits
       end
 
-      # https://tools.ietf.org/html/draft-ietf-hybi-permessage-compression#section-8.1.2.2
+      # https://tools.ietf.org/html/rfc7692#section-7.1.2.2
 
       if client_max = @params['client_max_window_bits']
         client_max = MAX_WINDOW_BITS if client_max == true

data/lib/permessage_deflate/session.rb

@@ -8,6 +8,7 @@ class PermessageDeflate
       'client_max_window_bits'
     ]
 
+    MIN_WINDOW_BITS   = 9
     MAX_WINDOW_BITS   = 15
     VALID_WINDOW_BITS = [8, 9, 10, 11, 12, 13, 14, 15]
 
@@ -83,14 +84,20 @@ class PermessageDeflate
 
     def get_inflate
       return @inflate if @inflate
-      inflate = Zlib::Inflate.new(-@peer_window_bits)
+
+      window_bits = [@peer_window_bits, MIN_WINDOW_BITS].max
+      inflate     = Zlib::Inflate.new(-window_bits)
+
       @inflate = inflate if @peer_context_takeover
       inflate
     end
 
     def get_deflate
       return @deflate if @deflate
-      deflate = Zlib::Deflate.new(@level, -@own_window_bits, @mem_level, @strategy)
+
+      window_bits = [@own_window_bits, MIN_WINDOW_BITS].max
+      deflate     = Zlib::Deflate.new(@level, -window_bits, @mem_level, @strategy)
+
       @deflate = deflate if @own_context_takeover
       deflate
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: permessage_deflate
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2017-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -32,6 +32,7 @@ extra_rdoc_files:
 - README.md
 files:
 - CHANGELOG.md
+- LICENSE.md
 - README.md
 - lib/permessage_deflate.rb
 - lib/permessage_deflate/client_session.rb
@@ -61,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Per-message DEFLATE compression extension for WebSocket connections