diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2015-01-01 18:49:04 -0600 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2015-01-01 19:00:40 -0600 |
| commit | 7c8e3e1061c2b51be59f034e0cd5b914a4ad6f47 (patch) | |
| tree | 9aca528ffd21c6f08c6a2d5e47495ee432cc67de /oslo | |
| parent | b25e8c56487fbbb3711aee904f024f5155523571 (diff) | |
| download | oslo-middleware-7c8e3e1061c2b51be59f034e0cd5b914a4ad6f47.tar.gz | |
Don't use default value in LimitingReader
We can't simply pass the None default on to the read operation as this
default is handled differently between different wsgi implementations.
Change-Id: I337e797b8dee3dfcf9299fe361cf197a176c8fe2
Closes-Bug: #1213106
Co-Authored-By: Jamie Lennox <jamielennox@redhat.com>
Diffstat (limited to 'oslo')
| -rw-r--r-- | oslo/middleware/sizelimit.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/oslo/middleware/sizelimit.py b/oslo/middleware/sizelimit.py index 3caa8b1..f42c9e6 100644 --- a/oslo/middleware/sizelimit.py +++ b/oslo/middleware/sizelimit.py @@ -66,7 +66,12 @@ class LimitingReader(object): yield chunk def read(self, i=None): - result = self.data.read(i) + # NOTE(jamielennox): We can't simply provide the default to the read() + # call as the expected default differs between mod_wsgi and eventlet + if i is None: + result = self.data.read() + else: + result = self.data.read(i) self.bytes_read += len(result) if self.bytes_read > self.limit: msg = _("Request is too large.") |