test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #10714 - made mod_wsgi recommendation consistent across deployment documentation 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Simon Willison 2009-04-07 00:01:49 +00:00
parent 7f7606070b
commit 37c21ef05d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/howto/deployment/fastcgi.txt
View File

@ -7,10 +7,9 @@ How to use Django with FastCGI, SCGI, or AJP
.. highlight:: bash .. highlight:: bash
Although the current preferred setup for running Django is :ref:`Apache with Although the current preferred setup for running Django is :ref:`Apache with
mod_python <howto-deployment-modpython>`, many people use shared hosting, on mod_wsgi <howto-deployment-modwsgi>`, many people use shared hosting, on
which protocols such as FastCGI, SCGI or AJP are the only viable options. In which protocols such as FastCGI, SCGI or AJP are the only viable options. In
some setups, these protocols also allow better security -- and, possibly, better some setups, these protocols may provide better performance than mod_wsgi_.
performance -- than mod_python_.
.. admonition:: Note .. admonition:: Note
@ -28,8 +27,9 @@ served with no startup time. Unlike mod_python_ (or `mod_perl`_), a FastCGI
process doesn't run inside the Web server process, but in a separate, process doesn't run inside the Web server process, but in a separate,
persistent process. persistent process.
.. _mod_python: http://www.modpython.org/ .. _mod_wsgi: http://code.google.com/p/modwsgi/
.. _mod_perl: http://perl.apache.org/ .. _mod_perl: http://perl.apache.org/
.. _mod_python: http://www.modpython.org/
.. admonition:: Why run code in a separate process? .. admonition:: Why run code in a separate process?

5
docs/howto/deployment/modpython.txt
View File

@ -6,8 +6,9 @@ How to use Django with Apache and mod_python
.. highlight:: apache .. highlight:: apache
Apache_ with `mod_python`_ currently is the preferred setup for using Django The `mod_python`_ module for Apache_ can be used to deploy Django to a
on a production server. production server, although it has been mostly superseded by the simpler
:ref:`mod_wsgi deployment option <howto-deployment-modwsgi>`.
mod_python is similar to (and inspired by) `mod_perl`_ : It embeds Python within mod_python is similar to (and inspired by) `mod_perl`_ : It embeds Python within
Apache and loads Python code into memory when the server starts. Code stays in Apache and loads Python code into memory when the server starts. Code stays in