Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #3047 -- Updated fastcgi documentation to mention SCGI and AJP …

…support.

Thanks Barry Pederson and Simon Greenhill.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 72dfcab0d43bd26166605d26dd89d33d6f033676 1 parent 96bf5e8
Malcolm Tredinnick authored April 01, 2007
1  AUTHORS
@@ -156,6 +156,7 @@ answer newbie questions, and generally made Django that much better:
156 156
     oggie rob <oz.robharvey@gmail.com>
157 157
     Jay Parlar <parlar@gmail.com>
158 158
     pavithran s <pavithran.s@gmail.com>
  159
+    Barry Pederson <bp@barryp.org>
159 160
     pgross@thoughtworks.com
160 161
     phaedo <http://phaedo.cx/>
161 162
     phil@produxion.net
7  docs/faq.txt
@@ -328,8 +328,9 @@ Do I have to use mod_python?
328 328
 
329 329
 Although we recommend mod_python for production use, you don't have to use it,
330 330
 thanks to the fact that Django uses an arrangement called WSGI_. Django can
331  
-talk to any WSGI-enabled server. The most common non-mod_python deployment
332  
-setup is FastCGI. See `How to use Django with FastCGI`_ for full information.
  331
+talk to any WSGI-enabled server. Other common non-mod_python deployment
  332
+setups are FastCGI, SCGI, or AJP. See `How to use Django with FastCGI, SCGI or
  333
+AJP`_ for full information.
333 334
 
334 335
 Also, see the `server arrangements wiki page`_ for other deployment strategies.
335 336
 
@@ -337,7 +338,7 @@ If you just want to play around and develop things on your local computer, use
337 338
 the development Web server that comes with Django. Things should Just Work.
338 339
 
339 340
 .. _WSGI: http://www.python.org/peps/pep-0333.html
340  
-.. _How to use Django with FastCGI: ../fastcgi/
  341
+.. _How to use Django with FastCGI, SCGI or AJP: ../fastcgi/
341 342
 .. _server arrangements wiki page: http://code.djangoproject.com/wiki/ServerArrangements
342 343
 
343 344
 How do I install mod_python on Windows?
34  docs/fastcgi.txt
... ...
@@ -1,11 +1,16 @@
1  
-==============================
2  
-How to use Django with FastCGI
3  
-==============================
  1
+===========================================
  2
+How to use Django with FastCGI, SCGI or AJP
  3
+===========================================
4 4
 
5 5
 Although the `current preferred setup`_ for running Django is Apache_ with
6  
-`mod_python`_, many people use shared hosting, on which FastCGI is the only
7  
-viable option. In some setups, FastCGI also allows better security -- and,
8  
-possibly, better performance -- than mod_python.
  6
+`mod_python`_, many people use shared hosting, on which protocols such as
  7
+FastCGI, SCGI, or AJP are the only viable options. In some setups, these protocols
  8
+also allow better security -- and, possibly, better performance -- than mod_python.
  9
+
  10
+.. admonition:: Note
  11
+
  12
+    This document primarily talks about FastCGI, although other flup-supported
  13
+    protocols such as SCGI and AJP are supported. 
9 14
 
10 15
 Essentially, FastCGI is an efficient way of letting an external application
11 16
 serve pages to a Web server. The Web server delegates the incoming Web requests
@@ -74,10 +79,23 @@ your ``manage.py`` is), and then run ``manage.py`` with the ``runfcgi`` option::
74 79
 If you specify ``help`` as the only option after ``runfcgi``, it'll display a
75 80
 list of all the available options.
76 81
 
77  
-You'll need to specify either a ``socket`` or both ``host`` and ``port``. Then,
78  
-when you set up your Web server, you'll just need to point it at the host/port
  82
+You'll need to specify either a ``socket``, ``protocol`` or both ``host`` and ``port``.
  83
+Then, when you set up your Web server, you'll just need to point it at the host/port
79 84
 or socket you specified when starting the FastCGI server.
80 85
 
  86
+Protocols
  87
+---------
  88
+
  89
+Django supports all the protocols that flup_ does, namely fastcgi_, `SCGI`_, and `AJP1.3`_. 
  90
+Your preferred protocol can be selected by using the `protocol=`<protocol_name> option with
  91
+`./manage.py runfcgi` where <protocol-name> may currently be one of: `fcgi` (the default), 
  92
+`scgi`, or `ajp`. 
  93
+
  94
+.. _flup: http://www.saddi.com/software/flup/
  95
+.. _fastcgi: http://www.fastcgi.com/
  96
+.. _SCGI: http://python.ca/scgi/protocol.txt
  97
+.. _AJP1.3: http://tomcat.apache.org/connectors-doc/ajp/ajpv13a.html
  98
+
81 99
 Examples
82 100
 --------
83 101
 
5  docs/modpython.txt
@@ -13,14 +13,15 @@ other server arrangements.
13 13
 Django requires Apache 2.x and mod_python 3.x, and you should use Apache's
14 14
 `prefork MPM`_, as opposed to the `worker MPM`_.
15 15
 
16  
-You may also be interested in `How to use Django with FastCGI`_.
  16
+You may also be interested in `How to use Django with FastCGI, SCGI or AJP`_
  17
+(which also covers SCGI and AJP).
17 18
 
18 19
 .. _Apache: http://httpd.apache.org/
19 20
 .. _mod_python: http://www.modpython.org/
20 21
 .. _mod_perl: http://perl.apache.org/
21 22
 .. _prefork MPM: http://httpd.apache.org/docs/2.2/mod/prefork.html
22 23
 .. _worker MPM: http://httpd.apache.org/docs/2.2/mod/worker.html
23  
-.. _How to use Django with FastCGI: ../fastcgi/
  24
+.. _How to use Django with FastCGI, SCGI or AJP: ../fastcgi/
24 25
 
25 26
 Basic configuration
26 27
 ===================

0 notes on commit 72dfcab

Please sign in to comment.
Something went wrong with that request. Please try again.