From 0ebfeddf65adb473fda2adfd1705534b6308cd2b Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Mon, 17 Jun 2019 13:22:04 -0700
Subject: [PATCH] Bump up our minimum eventlet version

We need 0.25.0 for py3 support, and increasing it for both is simplest.

Also drag forward dnspython, as newer eventlet requires a newer
dnspython. Note that we still don't explicitly list it as a dependency
for py3; rather, it's been getting installed as a requirement for
eventlet.

Change-Id: If933b713bdd1dfc348959771d60c0756a9a94477
---
 lower-constraints.txt       |  6 +++---
 requirements.txt            |  6 +++---
 swift/obj/ssync_receiver.py | 12 +-----------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index f8d3049444..24e0e1b5b6 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -14,11 +14,11 @@ cmd2==0.8.1
 coverage==3.6
 cryptography==2.0.2
 debtcollector==1.19.0
-dnspython==1.14.0
+dnspython==1.15.0
 docutils==0.11
 dulwich==0.19.0
 enum-compat==0.0.2
-eventlet==0.17.4
+eventlet==0.25.0
 extras==1.0.0
 fixtures==3.0.0
 flake8==2.5.5
@@ -76,7 +76,7 @@ reno==1.8.0
 requests==2.14.2
 requests-mock==1.2.0
 rfc3986==1.1.0
-six==1.9.0
+six==1.10.0
 smmap2==2.0.3
 snowballstemmer==1.2.1
 Sphinx==1.6.2
diff --git a/requirements.txt b/requirements.txt
index 609e540e63..04f2af2c1c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,14 +2,14 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-dnspython>=1.14.0;python_version=='2.7' # http://www.dnspython.org/LICENSE
-eventlet>=0.17.4,!=0.23.0               # MIT
+dnspython>=1.15.0;python_version=='2.7' # http://www.dnspython.org/LICENSE
+eventlet>=0.25.0                        # MIT
 greenlet>=0.3.1
 netifaces>=0.8,!=0.10.0,!=0.10.1
 PasteDeploy>=1.3.3
 lxml>=3.4.1
 requests>=2.14.2                        # Apache-2.0
-six>=1.9.0
+six>=1.10.0
 xattr>=0.4;sys_platform!='win32'        # MIT
 PyECLib>=1.3.1                          # BSD
 cryptography>=2.0.2                     # BSD/Apache-2.0
diff --git a/swift/obj/ssync_receiver.py b/swift/obj/ssync_receiver.py
index 3e39b8abbd..ad6bfb7858 100644
--- a/swift/obj/ssync_receiver.py
+++ b/swift/obj/ssync_receiver.py
@@ -130,17 +130,7 @@ class Receiver(object):
         # raised during processing because otherwise the sender could send for
         # quite some time before realizing it was all in vain.
         self.disconnect = True
-        try:
-            self.initialize_request()
-        except swob.HTTPException:
-            # Old (pre-0.18.0) eventlet would try to drain the request body
-            # in a way that's prone to blowing up when the client has
-            # disconnected. Trick it into skipping that so we don't trip
-            #   ValueError: invalid literal for int() with base 16
-            # in tests. Note we disconnect shortly after receiving a non-200
-            # response in the sender code, so this is not *so* crazy to do.
-            request.environ['wsgi.input'].chunked_input = False
-            raise
+        self.initialize_request()
 
     def __call__(self):
         """