2
0
Эх сурвалжийг харах

Fixed #20766 -- Deprecated FastCGI support.

Tim Graham 11 жил өмнө
parent
commit
bd0dcc6c89

+ 7 - 1
django/core/management/commands/runfcgi.py

@@ -1,3 +1,5 @@
+import warnings
+
 from django.core.management.base import BaseCommand
 
 class Command(BaseCommand):
@@ -5,6 +7,10 @@ class Command(BaseCommand):
     args = '[various KEY=val options, use `runfcgi help` for help]'
 
     def handle(self, *args, **options):
+        warnings.warn(
+            "FastCGI support has been deprecated and will be removed in Django 1.9.",
+            PendingDeprecationWarning)
+
         from django.conf import settings
         from django.utils import translation
         # Activate the current language, because it won't get activated later.
@@ -14,7 +20,7 @@ class Command(BaseCommand):
             pass
         from django.core.servers.fastcgi import runfastcgi
         runfastcgi(args)
-        
+
     def usage(self, subcommand):
         from django.core.servers.fastcgi import FASTCGI_HELP
         return FASTCGI_HELP

+ 3 - 0
docs/howto/deployment/fastcgi.txt

@@ -2,6 +2,9 @@
 How to use Django with FastCGI, SCGI, or AJP
 ============================================
 
+.. deprecated:: 1.7
+    FastCGI support is deprecated and will be removed in Django 1.9.
+
 .. highlight:: bash
 
 Although :doc:`WSGI</howto/deployment/wsgi/index>` is the preferred deployment

+ 7 - 1
docs/howto/deployment/index.txt

@@ -10,9 +10,15 @@ ways to easily deploy Django:
    :maxdepth: 1
 
    wsgi/index
-   fastcgi
    checklist
 
+FastCGI support is deprecated and will be removed in Django 1.9.
+
+.. toctree::
+   :maxdepth: 1
+
+   fastcgi
+
 If you're new to deploying Django and/or Python, we'd recommend you try
 :doc:`mod_wsgi </howto/deployment/wsgi/modwsgi>` first. In most cases it'll be
 the easiest, fastest, and most stable deployment choice.

+ 1 - 1
docs/index.txt

@@ -190,7 +190,7 @@ testing of Django applications:
 * **Deployment:**
   :doc:`Overview <howto/deployment/index>` |
   :doc:`WSGI servers <howto/deployment/wsgi/index>` |
-  :doc:`FastCGI/SCGI/AJP <howto/deployment/fastcgi>` |
+  :doc:`FastCGI/SCGI/AJP <howto/deployment/fastcgi>` (deprecated) |
   :doc:`Deploying static files <howto/static-files/deployment>` |
   :doc:`Tracking code errors by email <howto/error-reporting>`
 

+ 3 - 0
docs/internals/deprecation.txt

@@ -418,6 +418,9 @@ these changes.
   :ref:`initial SQL data<initial-sql>` in ``myapp/models/sql/``. Move your
   custom SQL files to ``myapp/sql/``.
 
+* FastCGI support via the ``runfcgi`` management command will be
+  removed. Please deploy your project using WSGI.
+
 2.0
 ---
 

+ 3 - 0
docs/ref/django-admin.txt

@@ -577,6 +577,9 @@ runfcgi [options]
 
 .. django-admin:: runfcgi
 
+.. deprecated:: 1.7
+    FastCGI support is deprecated and will be removed in Django 1.9.
+
 Starts a set of FastCGI processes suitable for use with any Web server that
 supports the FastCGI protocol. See the :doc:`FastCGI deployment documentation
 </howto/deployment/fastcgi>` for details. Requires the Python FastCGI module from

+ 4 - 5
docs/topics/install.txt

@@ -59,11 +59,10 @@ installed.
 
 If you can't use mod_wsgi for some reason, fear not: Django supports many other
 deployment options. One is :doc:`uWSGI </howto/deployment/wsgi/uwsgi>`; it works
-very well with `nginx`_. Another is :doc:`FastCGI </howto/deployment/fastcgi>`,
-perfect for using Django with servers other than Apache. Additionally, Django
-follows the WSGI spec (:pep:`3333`), which allows it to run on a variety of
-server platforms. See the `server-arrangements wiki page`_ for specific
-installation instructions for each platform.
+very well with `nginx`_. Additionally, Django follows the WSGI spec
+(:pep:`3333`), which allows it to run on a variety of server platforms. See the
+`server-arrangements wiki page`_ for specific installation instructions for
+each platform.
 
 .. _Apache: http://httpd.apache.org/
 .. _nginx: http://nginx.org/