Author: mtredinnick
Date: 2007-04-01 01:00:45 -0500 (Sun, 01 Apr 2007)
New Revision: 4897
Modified:
django/trunk/AUTHORS
django/trunk/docs/faq.txt
django/trunk/docs/fastcgi.txt
django/trunk/docs/modpython.txt
Log:
Fixed #3047 -- Updated fastcgi documentation to mention SCGI and AJP support.
Thanks Barry Pederson and Simon Greenhill.
Modified: django/trunk/AUTHORS
===================================================================
--- django/trunk/AUTHORS 2007-04-01 05:42:48 UTC (rev 4896)
+++ django/trunk/AUTHORS 2007-04-01 06:00:45 UTC (rev 4897)
@@ -156,6 +156,7 @@
oggie rob <[EMAIL PROTECTED]>
Jay Parlar <[EMAIL PROTECTED]>
pavithran s <[EMAIL PROTECTED]>
+ Barry Pederson <[EMAIL PROTECTED]>
[EMAIL PROTECTED]
phaedo <http://phaedo.cx/>
[EMAIL PROTECTED]
Modified: django/trunk/docs/faq.txt
===================================================================
--- django/trunk/docs/faq.txt 2007-04-01 05:42:48 UTC (rev 4896)
+++ django/trunk/docs/faq.txt 2007-04-01 06:00:45 UTC (rev 4897)
@@ -328,8 +328,9 @@
Although we recommend mod_python for production use, you don't have to use it,
thanks to the fact that Django uses an arrangement called WSGI_. Django can
-talk to any WSGI-enabled server. The most common non-mod_python deployment
-setup is FastCGI. See `How to use Django with FastCGI`_ for full information.
+talk to any WSGI-enabled server. Other common non-mod_python deployment
+setups are FastCGI, SCGI, or AJP. See `How to use Django with FastCGI, SCGI or
+AJP`_ for full information.
Also, see the `server arrangements wiki page`_ for other deployment strategies.
@@ -337,7 +338,7 @@
the development Web server that comes with Django. Things should Just Work.
.. _WSGI: http://www.python.org/peps/pep-0333.html
-.. _How to use Django with FastCGI: ../fastcgi/
+.. _How to use Django with FastCGI, SCGI or AJP: ../fastcgi/
.. _server arrangements wiki page:
http://code.djangoproject.com/wiki/ServerArrangements
How do I install mod_python on Windows?
Modified: django/trunk/docs/fastcgi.txt
===================================================================
--- django/trunk/docs/fastcgi.txt 2007-04-01 05:42:48 UTC (rev 4896)
+++ django/trunk/docs/fastcgi.txt 2007-04-01 06:00:45 UTC (rev 4897)
@@ -1,12 +1,17 @@
-==============================
-How to use Django with FastCGI
-==============================
+===========================================
+How to use Django with FastCGI, SCGI or AJP
+===========================================
Although the `current preferred setup`_ for running Django is Apache_ with
-`mod_python`_, many people use shared hosting, on which FastCGI is the only
-viable option. In some setups, FastCGI also allows better security -- and,
-possibly, better performance -- than mod_python.
+`mod_python`_, many people use shared hosting, on 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 performance -- than
mod_python.
+.. admonition:: Note
+
+ This document primarily talks about FastCGI, although other flup-supported
+ protocols such as SCGI and AJP are supported.
+
Essentially, FastCGI is an efficient way of letting an external application
serve pages to a Web server. The Web server delegates the incoming Web requests
(via a socket) to FastCGI, which executes the code and passes the response back
@@ -74,10 +79,23 @@
If you specify ``help`` as the only option after ``runfcgi``, it'll display a
list of all the available options.
-You'll need to specify either a ``socket`` or both ``host`` and ``port``. Then,
-when you set up your Web server, you'll just need to point it at the host/port
+You'll need to specify either a ``socket``, ``protocol`` or both ``host`` and
``port``.
+Then, when you set up your Web server, you'll just need to point it at the
host/port
or socket you specified when starting the FastCGI server.
+Protocols
+---------
+
+Django supports all the protocols that flup_ does, namely fastcgi_, `SCGI`_,
and `AJP1.3`_.
+Your preferred protocol can be selected by using the
`protocol=`<protocol_name> option with
+`./manage.py runfcgi` where <protocol-name> may currently be one of: `fcgi`
(the default),
+`scgi`, or `ajp`.
+
+.. _flup: http://www.saddi.com/software/flup/
+.. _fastcgi: http://www.fastcgi.com/
+.. _SCGI: http://python.ca/scgi/protocol.txt
+.. _AJP1.3: http://tomcat.apache.org/connectors-doc/ajp/ajpv13a.html
+
Examples
--------
Modified: django/trunk/docs/modpython.txt
===================================================================
--- django/trunk/docs/modpython.txt 2007-04-01 05:42:48 UTC (rev 4896)
+++ django/trunk/docs/modpython.txt 2007-04-01 06:00:45 UTC (rev 4897)
@@ -13,14 +13,15 @@
Django requires Apache 2.x and mod_python 3.x, and you should use Apache's
`prefork MPM`_, as opposed to the `worker MPM`_.
-You may also be interested in `How to use Django with FastCGI`_.
+You may also be interested in `How to use Django with FastCGI, SCGI or AJP`_
+(which also covers SCGI and AJP).
.. _Apache: http://httpd.apache.org/
.. _mod_python: http://www.modpython.org/
.. _mod_perl: http://perl.apache.org/
.. _prefork MPM: http://httpd.apache.org/docs/2.2/mod/prefork.html
.. _worker MPM: http://httpd.apache.org/docs/2.2/mod/worker.html
-.. _How to use Django with FastCGI: ../fastcgi/
+.. _How to use Django with FastCGI, SCGI or AJP: ../fastcgi/
Basic configuration
===================
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
