diff options
| -rw-r--r-- | docs/arguments.rst | 6 | ||||
| -rw-r--r-- | src/waitress/adjustments.py | 20 |
2 files changed, 8 insertions, 18 deletions
diff --git a/docs/arguments.rst b/docs/arguments.rst index f9b9310..4045f64 100644 --- a/docs/arguments.rst +++ b/docs/arguments.rst @@ -158,7 +158,11 @@ clear_untrusted_proxy_headers "X-Forwared-For", "X-Forwarded-By", "X-Forwarded-Host", "X-Forwarded-Port", "X-Forwarded-Proto") not explicitly allowed by ``trusted_proxy_headers``. - Default: ``False`` + Default: ``True`` + + .. versionchanged:: 2.1.1 + In this version default value is set to ``True`` and deprecation warning + doesn't show up anymore. .. versionadded:: 1.2.0 diff --git a/src/waitress/adjustments.py b/src/waitress/adjustments.py index 466b5c4..85689d4 100644 --- a/src/waitress/adjustments.py +++ b/src/waitress/adjustments.py @@ -95,10 +95,6 @@ class _int_marker(int): pass -class _bool_marker: - pass - - class Adjustments: """This class contains tunable parameters.""" @@ -179,10 +175,9 @@ class Adjustments: # sense to set when you have a trusted_proxy, and you expect the upstream # proxy server to filter invalid headers log_untrusted_proxy_headers = False - - # Should waitress clear any proxy headers that are not deemed trusted from - # the environ? Change to True by default in 2.x - clear_untrusted_proxy_headers = _bool_marker + + # Changed this parameter to True by default in 2.x + clear_untrusted_proxy_headers = True # default ``wsgi.url_scheme`` value url_scheme = "http" @@ -445,15 +440,6 @@ class Adjustments: ) self.trusted_proxy_headers = {"x-forwarded-proto"} - if self.clear_untrusted_proxy_headers is _bool_marker: - warnings.warn( - "In future versions of Waitress clear_untrusted_proxy_headers will be " - "set to True by default. You may opt-out by setting this value to " - "False, or opt-in explicitly by setting this to True.", - DeprecationWarning, - ) - self.clear_untrusted_proxy_headers = False - self.listen = wanted_sockets self.check_sockets(self.sockets) |