diff options
Diffstat (limited to 'django/middleware')
| -rw-r--r-- | django/middleware/csrf.py | 2 | ||||
| -rw-r--r-- | django/middleware/http.py | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/django/middleware/csrf.py b/django/middleware/csrf.py index b88dd55a3d..483510a1ae 100644 --- a/django/middleware/csrf.py +++ b/django/middleware/csrf.py @@ -274,7 +274,7 @@ class CsrfResponseMiddleware(object): import warnings warnings.warn( "CsrfResponseMiddleware and CsrfMiddleware are deprecated; use CsrfViewMiddleware and the template tag instead (see CSRF documentation).", - PendingDeprecationWarning + DeprecationWarning ) def process_response(self, request, response): diff --git a/django/middleware/http.py b/django/middleware/http.py index 75af664447..13c1b89c41 100644 --- a/django/middleware/http.py +++ b/django/middleware/http.py @@ -30,22 +30,3 @@ class ConditionalGetMiddleware(object): response.status_code = 304 return response - -class SetRemoteAddrFromForwardedFor(object): - """ - This middleware has been removed; see the Django 1.1 release notes for - details. - - It previously set REMOTE_ADDR based on HTTP_X_FORWARDED_FOR. However, after - investiagtion, it turns out this is impossible to do in a general manner: - different proxies treat the X-Forwarded-For header differently. Thus, a - built-in middleware can lead to application-level security problems, and so - this was removed in Django 1.1 - - """ - def __init__(self): - import warnings - warnings.warn("SetRemoteAddrFromForwardedFor has been removed. " - "See the Django 1.1 release notes for details.", - category=DeprecationWarning) - raise MiddlewareNotUsed()
\ No newline at end of file |