dalli 5.2.6 → 5.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db76345a60e108cc8a1aa4f39adae0e657b200b4e3f17f7196702776c1ff8bc4
-  data.tar.gz: eb643908bb2aa3654f2d7c82bcce21fa82159931e162cdf17bd79d9fe40b2ed0
+  metadata.gz: 7f2cea6074db3fcade9ffdc5277b26cddb9752ee9a4229536e2a883755d4137e
+  data.tar.gz: 0f4294f047e670e18a2c97c0c7187e84449096a5e230faf7956547e634c996e9
 SHA512:
-  metadata.gz: e5d227f5b4e7fda6e35907f0d94b74fcd528d0c203ce6a7c5b01ab33e2908fe78147c70df8661eedbc2b82f1024b4c89bb890fc0418745150c379805f87afea2
-  data.tar.gz: dbb2e3d7bb7b1c852a8c0d8b359f1621d0aa0f3ef32dbe1ca449e384325a929e0db6ba893357195e284c84162ce3ae4a1ce39e9f86b5b1bfde149a3725ae3a45
+  metadata.gz: af2703898196c9ea24497f5777061d90b6797acb39faec3fc82b6206d2beb02668420d318bb519728b1f72383e66c05af465592ab0726e3703f5944b93a78c32
+  data.tar.gz: a59742b1c0c146cd2b36f0d36d55fc94c4491353d364a1c8a3f216452ba293b801d79fb7c34dc3ffa85bbe3aea0d72f82621f67dad3aada23579a5e50048e312

data/CHANGELOG.md

@@ -1,9 +1,14 @@
 Dalli Changelog
 =====================
 
-Unreleased
+5.2.7
 ==========
 
+Bug fixes:
+
+- `Rack::Session::Dalli`'s 401 for a session deleted mid-request called `Hash#slice` on the session options. A Rails session store puts an `ActionDispatch::Request::Session::Options` there, so the 401 raised `NoMethodError` instead of expiring the cookie (#1291, @seballot)
+- Since 5.2.0, on JRuby with TLS, Dalli could wait `socket_timeout` for part of a reply that had already arrived, because jruby-openssl can hold it where neither `IO.select` nor OpenSSL's `pending` reports it. A `get_multi` could take `socket_timeout` longer than it needed to. Dalli now reads on JRuby until the TLS socket would block (#1293)
+
 5.2.6
 ==========
 

data/lib/dalli/socket.rb

@@ -110,8 +110,18 @@ module Dalli
       # OpenSSL can hold decrypted bytes that IO.select won't report as readable.
       # With OpenSSL's default (no read-ahead) a short read has already used up
       # the current record, so this is normally 0; it guards read-ahead setups.
-      def buffered_data?
-        pending.positive?
+      #
+      # jruby-openssl can take the next record off the socket during a short
+      # read and hold it where neither pending nor IO.select sees it, so on
+      # JRuby a read continues until the socket would block.
+      if RUBY_ENGINE == 'jruby'
+        def buffered_data?
+          true
+        end
+      else
+        def buffered_data?
+          pending.positive?
+        end
       end
 
       unless method_defined?(:wait_readable)

data/lib/dalli/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Dalli
-  VERSION = '5.2.6'
+  VERSION = '5.2.7'
 
   MIN_SUPPORTED_MEMCACHED_VERSION = '1.6.27'
 end

data/lib/rack/session/dalli.rb

@@ -184,9 +184,12 @@ module Rack
         end
       end
 
+      # Rails stores an ActionDispatch::Request::Session::Options in the env, not a
+      # Hash. It implements [] (and to_hash) but not Hash#slice, so slicing it
+      # raised NoMethodError instead of returning this 401.
       def missing_session_response(env)
         options = env[Rack::RACK_SESSION_OPTIONS] || @default_options
-        cookie = Rack::Utils.delete_set_cookie_header(key, options.slice(:path, :domain))
+        cookie = Rack::Utils.delete_set_cookie_header(key, { path: options[:path], domain: options[:domain] })
         [401, { 'content-type' => 'text/plain', 'set-cookie' => cookie }, ['Wrong session ID']]
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalli
 version: !ruby/object:Gem::Version
-  version: 5.2.6
+  version: 5.2.7
 platform: ruby
 authors:
 - Peter M. Goldstein