From 1bcddae8580390dab70139d7f5d004aa61ff92ec Mon Sep 17 00:00:00 2001
From: Will Jordan <will@code.org>
Date: Thu, 20 Feb 2020 13:46:27 -0800
Subject: [PATCH] Rescue IO::WaitReadable instead of EAGAIN for blocking read
 On Windows, `read_nonblock` raises `Errno::EWOULDBLOCK` if a blocking read
 would occur, which is a different value from `Errno::EAGAIN`. Both of these
 errors are extended by `IO::WaitReadable` which is Ruby's recommended
 exception class for retrying `read_nonblock`.

---
 lib/puma/client.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/puma/client.rb b/lib/puma/client.rb
index 8a37736aaf..7b013732ab 100644
--- a/lib/puma/client.rb
+++ b/lib/puma/client.rb
@@ -153,7 +153,7 @@ def try_to_finish
 
       begin
         data = @io.read_nonblock(CHUNK_SIZE)
-      rescue Errno::EAGAIN
+      rescue IO::WaitReadable
         return false
       rescue SystemCallError, IOError, EOFError
         raise ConnectionError, "Connection error detected during read"
@@ -349,7 +349,7 @@ def read_body
 
       begin
         chunk = @io.read_nonblock(want)
-      rescue Errno::EAGAIN
+      rescue IO::WaitReadable
         return false
       rescue SystemCallError, IOError
         raise ConnectionError, "Connection error detected during read"