瀏覽代碼

Updated all refs to default middleware in docs.

(adding CSRF, removing XView which is no longer a default)



git-svn-id: http://code.djangoproject.com/svn/django/trunk@10095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Luke Plant 16 年之前
父節點
當前提交
4e7a4eda3d
共有 2 個文件被更改,包括 6 次插入4 次删除
  1. 4 3
      docs/ref/settings.txt
  2. 2 1
      docs/topics/http/middleware.txt

+ 4 - 3
docs/ref/settings.txt

@@ -760,10 +760,11 @@ MIDDLEWARE_CLASSES
 
 Default::
 
-    ("django.contrib.sessions.middleware.SessionMiddleware",
+    ("django.contrib.csrf.middleware.CsrfViewMiddleware",
+     "django.contrib.csrf.middleware.CsrfResponseMiddleware",
+     "django.contrib.sessions.middleware.SessionMiddleware",
      "django.contrib.auth.middleware.AuthenticationMiddleware",
-     "django.middleware.common.CommonMiddleware",
-     "django.middleware.doc.XViewMiddleware")
+     "django.middleware.common.CommonMiddleware")
 
 A tuple of middleware classes to use. See :ref:`topics-http-middleware`.
 

+ 2 - 1
docs/topics/http/middleware.txt

@@ -28,9 +28,10 @@ created by :djadmin:`django-admin.py startproject <startproject>`::
 
     MIDDLEWARE_CLASSES = (
         'django.middleware.common.CommonMiddleware',
+        'django.contrib.csrf.middleware.CsrfViewMiddleware',
+        'django.contrib.csrf.middleware.CsrfResponseMiddleware',
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.contrib.auth.middleware.AuthenticationMiddleware',
-        'django.middleware.doc.XViewMiddleware',
     )
 
 During the request phases (:meth:`process_request` and :meth:`process_view`