diff options
| author | Armin Ronacher <armin.ronacher@active-4.com> | 2018-02-19 21:35:07 +0100 |
|---|---|---|
| committer | Armin Ronacher <armin.ronacher@active-4.com> | 2018-02-19 21:35:07 +0100 |
| commit | ef8778d9b848de504baac6a627118aefd23ee7f7 (patch) | |
| tree | dd5beca7a39fdfee150829b47ce7cea46130ded3 | |
| parent | 97c91440410b93d3712651262eff9a86af391b57 (diff) | |
| download | werkzeug-bugfix/412.tar.gz | |
Always send bodies for 412 responsesbugfix/412
| -rw-r--r-- | tests/test_wrappers.py | 3 | ||||
| -rw-r--r-- | werkzeug/wrappers.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/test_wrappers.py b/tests/test_wrappers.py index af43d2f2..750e3d81 100644 --- a/tests/test_wrappers.py +++ b/tests/test_wrappers.py @@ -597,7 +597,8 @@ def test_etag_response_412(): # headers left and the status code would have to be 412 resp = wrappers.Response.from_app(response, env) assert resp.status_code == 412 - assert 'content-length' not in resp.headers + # Make sure there is a body still + assert resp.data != b'' # make sure date is not overriden response = wrappers.Response('Hello World') diff --git a/werkzeug/wrappers.py b/werkzeug/wrappers.py index 92dfa5da..b12ff7af 100644 --- a/werkzeug/wrappers.py +++ b/werkzeug/wrappers.py @@ -1247,7 +1247,7 @@ class BaseResponse(object): isinstance(content_location, text_type): headers['Content-Location'] = iri_to_uri(content_location) - if status in (304, 412): + if status == 304: remove_entity_headers(headers) # if we can determine the content length automatically, we @@ -1287,7 +1287,7 @@ class BaseResponse(object): """ status = self.status_code if environ['REQUEST_METHOD'] == 'HEAD' or \ - 100 <= status < 200 or status in (204, 304, 412): + 100 <= status < 200 or status in (204, 304): iterable = () elif self.direct_passthrough: if __debug__: |