diff options
| author | Bert JW Regeer <xistence@0x58.com> | 2018-12-12 22:40:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-12 22:40:45 -0700 |
| commit | 01ae68065f46b7b04950255882f129d770a9645b (patch) | |
| tree | 45bee1722c52d46db32316ae2f82449d06052a59 | |
| parent | 8cfacc1914313d972ecdd133eda18b9b81aafd7f (diff) | |
| parent | e1a09524dc63f28064bc7da88a6ccfdf16878a63 (diff) | |
| download | waitress-01ae68065f46b7b04950255882f129d770a9645b.tar.gz | |
Merge pull request #224 from Estartu/master
added any as valid value for the trusted_proxy adjustable
| -rw-r--r-- | waitress/task.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/waitress/task.py b/waitress/task.py index 68aa69a..5a90b25 100644 --- a/waitress/task.py +++ b/waitress/task.py @@ -791,7 +791,7 @@ class WSGITask(Task): headers = dict(request.headers) untrusted_headers = PROXY_HEADERS - if remote_peer == server.adj.trusted_proxy: + if server.adj.trusted_proxy == '*' or remote_peer == server.adj.trusted_proxy: untrusted_headers = self.parse_proxy_headers( environ, headers, |