From 6e9e41d9b1c65f09eb7ee6a2b72dad2bbe6e5fa6 Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Fri, 4 Sep 2020 11:40:25 -0700 Subject: [PATCH] Remove some useless swob.Request attr setting None of it was getting passed through to the WSGI env, so it had no effect on anything. Change-Id: Id0b9ea0b0d1cd03bb75233953abadbb17fadc426 --- swift/common/middleware/tempauth.py | 2 -- swift/proxy/controllers/obj.py | 4 ---- 2 files changed, 6 deletions(-) diff --git a/swift/common/middleware/tempauth.py b/swift/common/middleware/tempauth.py index 8e246a838d..4083a3d945 100644 --- a/swift/common/middleware/tempauth.py +++ b/swift/common/middleware/tempauth.py @@ -666,8 +666,6 @@ class TempAuth(object): req = Request(env) if self.auth_prefix: req.path_info_pop() - req.bytes_transferred = '-' - req.client_disconnect = False if 'x-storage-token' in req.headers and \ 'x-auth-token' not in req.headers: req.headers['x-auth-token'] = req.headers['x-storage-token'] diff --git a/swift/proxy/controllers/obj.py b/swift/proxy/controllers/obj.py index ceab334463..b3f392f784 100644 --- a/swift/proxy/controllers/obj.py +++ b/swift/proxy/controllers/obj.py @@ -927,7 +927,6 @@ class ReplicatedObjectController(BaseObjectController): ml = req.message_length() if ml and bytes_transferred < ml: - req.client_disconnect = True self.app.logger.warning( _('Client disconnected without sending enough data')) self.app.logger.increment('client_disconnects') @@ -950,7 +949,6 @@ class ReplicatedObjectController(BaseObjectController): except HTTPException: raise except ChunkReadError: - req.client_disconnect = True self.app.logger.warning( _('Client disconnected without sending last chunk')) self.app.logger.increment('client_disconnects') @@ -2655,7 +2653,6 @@ class ECObjectController(BaseObjectController): ml = req.message_length() if ml and bytes_transferred < ml: - req.client_disconnect = True self.app.logger.warning( _('Client disconnected without sending enough data')) self.app.logger.increment('client_disconnects') @@ -2731,7 +2728,6 @@ class ECObjectController(BaseObjectController): self.app.logger.increment('client_timeouts') raise HTTPRequestTimeout(request=req) except ChunkReadError: - req.client_disconnect = True self.app.logger.warning( _('Client disconnected without sending last chunk')) self.app.logger.increment('client_disconnects')