summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2021-12-27 01:48:47 -0700
committerBert JW Regeer <bertjw@regeer.org>2022-01-16 21:58:14 -0700
commit17ae760ad7359725b572439747c0efcc5cb0abc0 (patch)
treeb00ff921b45f763b2ac159a82a08a3a4ede0975d
parentf41e59826c81d7da5309e4b3694d5ac7a8bbd626 (diff)
downloadwaitress-17ae760ad7359725b572439747c0efcc5cb0abc0.tar.gz
Close old buffer when overflowing in OverflowableBuffer
When switching from a BytesIO to a file backed buffer, we were not closing the old buffer after we had copied its contents. With this change when we switch from a small buffer to a larger buffer or vice-versa we will now attempt to close the old buffer.
-rw-r--r--src/waitress/buffers.py16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/waitress/buffers.py b/src/waitress/buffers.py
index 0086fe8..386eb40 100644
--- a/src/waitress/buffers.py
+++ b/src/waitress/buffers.py
@@ -234,11 +234,23 @@ class OverflowableBuffer:
return buf
def _set_small_buffer(self):
- self.buf = BytesIOBasedBuffer(self.buf)
+ oldbuf = self.buf
+ self.buf = BytesIOBasedBuffer(oldbuf)
+
+ # Attempt to close the old buffer
+ if hasattr(oldbuf, "close"):
+ oldbuf.close()
+
self.overflowed = False
def _set_large_buffer(self):
- self.buf = TempfileBasedBuffer(self.buf)
+ oldbuf = self.buf
+ self.buf = TempfileBasedBuffer(oldbuf)
+
+ # Attempt to close the old buffer
+ if hasattr(oldbuf, "close"):
+ oldbuf.close()
+
self.overflowed = True
def append(self, s):