Skip to content

Commit bafe5bd

Browse files
Remove documentation related to older Apache versions.
1 parent 94bcc19 commit bafe5bd

16 files changed

Lines changed: 59 additions & 238 deletions

docs/configuration-directives/WSGIAcceptMutex.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ will be used. If set the method types are the same as for the Apache
1616
`AcceptMutex`_ directive.
1717

1818
Note that the ``WSGIAcceptMutex`` directive and corresponding features are
19-
not available on Windows or when running Apache 1.3.
19+
not available on Windows.
2020

2121
.. _AcceptMutex: http://httpd.apache.org/docs/2.4/mod/mpm_common.html#acceptmutex

docs/configuration-directives/WSGIAuthUserScript.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ about the handshaking related to HTTP Basic and Digest authentication and
1515
you only wish to deal with supplying the user credentials for authenticating
1616
the user.
1717

18-
If using at least Apache 2.2, other Apache modules implementing custom
19-
authentication mechanisms can also make use of the authentication provider
20-
if they are using the corresponding Apache C API for accessing them.
18+
Other Apache modules implementing custom authentication mechanisms can also
19+
make use of the authentication provider if they are using the corresponding
20+
Apache C API for accessing them.
2121

2222
More detailed information on using the WSGIAuthUserScript directive can be
2323
found in :doc:`../user-guides/access-control-mechanisms`.

docs/configuration-directives/WSGIProcessGroup.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ different virtual host. Which daemon process groups can be selected may be
5959
further restricted if the WSGIRestrictProcess directive has been used.
6060

6161
Note that the WSGIProcessGroup directive and corresponding features are not
62-
available on Windows or when running Apache 1.3.
62+
available on Windows.
6363

64-
.. _SetEnv: http://httpd.apache.org/docs/2.2/mod/mod_env.html#setenv
65-
.. _RewriteRule: http://httpd.apache.org/docs/2.2/mod/mod_rewrite.html#rewriterule
64+
.. _SetEnv: http://httpd.apache.org/docs/2.4/mod/mod_env.html#setenv
65+
.. _RewriteRule: http://httpd.apache.org/docs/2.4/mod/mod_rewrite.html#rewriterule

docs/configuration-directives/WSGIRestrictProcess.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ WSGI applications to different daemon process groups using the
5959
</Files>
6060

6161
Note that the WSGIDaemonProcess directive and corresponding features are
62-
not available on Windows or when running Apache 1.3.
62+
not available on Windows.
6363

64-
.. _SetEnv: http://httpd.apache.org/docs/2.2/mod/mod_env.html#setenv
64+
.. _SetEnv: http://httpd.apache.org/docs/2.4/mod/mod_env.html#setenv

docs/configuration-directives/WSGISocketPrefix.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ one that is only writable by 'root' user, or if not starting Apache as
4040
'root', the user that Apache is started as.
4141

4242
Note that the WSGISocketPrefix directive and corresponding features are not
43-
available on Windows or when running Apache 1.3.
43+
available on Windows.

docs/requirements.rst

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,15 @@
22
Requirements
33
============
44

5-
The mod_wsgi package can be compiled for and used with most recent patch
6-
revisions of Apache 2.0, 2.2 or 2.4 on UNIX like systems, such as Linux and
7-
MacOS X, as well as Windows.
8-
9-
It is highly recommended that you use Apache 2.4. Older versions of Apache
10-
have architectural design problems and sub optimal configuration defaults,
11-
that can result in excessive memory usage in certain circumstances. More
12-
recent mod_wsgi versions attempt to protect against these problems in
13-
Apache 2.0 and 2.2, however it is still better to use Apache 2.4.
5+
The mod_wsgi package can be compiled for and used with Apache 2.4 on UNIX
6+
like systems, such as Linux and MacOS X, as well as Windows.
147

158
Any of the single threaded 'prefork' or multithreaded 'worker' and 'event'
169
Apache MPMs can be used when running on UNIX like systems.
1710

18-
Both Python 2 and 3 are supported. The minimum recommended versions of each
19-
being Python 2.6 and 3.3 respectively. The Python installation must have
20-
been installed in a way that shared libraries for Python are provided such
21-
that embedding of Python in another application is possible.
11+
Python 3.10 or later is required. The Python installation must have been
12+
installed in a way that shared libraries for Python are provided such that
13+
embedding of Python in another application is possible.
2214

2315
The mod_wsgi package should be able to host any Python web application
2416
which complies with the WSGI_ specification (PEP 3333). The

docs/user-guides/access-control-mechanisms.rst

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ shaking with the client to indicate whether the client is permitted access.
4141
Apache Authentication Provider
4242
------------------------------
4343

44-
When Apache 2.2 was released, it introduced the concept of authentication
45-
providers. That is, Apache implements the hand shaking with the client for
46-
authentication mechanisms such as Basic and Digest. All that the user
47-
server side code needs to provide is a means of authenticating the actual
48-
credentials of the user trying to gain access to the site.
44+
Apache implements the concept of authentication providers. That is, Apache
45+
implements the hand shaking with the client for authentication mechanisms
46+
such as Basic and Digest. All that the user server side code needs to
47+
provide is a means of authenticating the actual credentials of the user
48+
trying to gain access to the site.
4949

5050
This greatly simplified the implementation of client authentication as the
5151
hand shaking for a particular authentication mechanism was implemented only
@@ -58,7 +58,7 @@ directive to define a Python script file containing code which performs the
5858
authenticating of user credentials as outlined.
5959

6060
The required Apache configuration for defining the authentication provider
61-
for Basic authentication when using Apache 2.2 would be::
61+
for Basic authentication would be::
6262

6363
AuthType Basic
6464
AuthName "Top Secret"
@@ -81,8 +81,8 @@ that the password is correct. If the user does not exist at all, then the
8181
result should be 'None'. If the user does exist, the result should be
8282
'True' or 'False' depending on whether the password was valid.
8383

84-
If wishing to use Digest authentication, the configuration for Apache 2.2
85-
would instead be::
84+
If wishing to use Digest authentication, the configuration would instead
85+
be::
8686

8787
AuthType Digest
8888
AuthName "Top Secret"
@@ -136,13 +136,7 @@ provider can also be defined::
136136
WSGIScriptAlias / /usr/local/django/mysite/apache/django.wsgi
137137

138138
<Directory /usr/local/django/mysite/apache>
139-
<IfVersion < 2.4>
140-
Order allow,deny
141-
Allow from all
142-
</IfVersion>
143-
<IfVersion >= 2.4>
144-
Require all granted
145-
</IfVersion>
139+
Require all granted
146140

147141
WSGIApplicationGroup django
148142

@@ -189,21 +183,6 @@ Any configuration defined by !SetEnv directives is not passed in the
189183
configuration specified in such a way from a '.htaccess' file.
190184
Configuration should as a result be placed into the script file itself.
191185

192-
Although authentication providers were a new feature in Apache 2.2, the
193-
mod_wsgi module emulates the functionality so that the above can also be
194-
used with Apache 2.0. In using Apache 2.0, the required Apache configuration
195-
is however slightly different and needs to be::
196-
197-
AuthType Basic
198-
AuthName "Top Secret"
199-
WSGIAuthUserScript /usr/local/wsgi/scripts/auth.wsgi
200-
AuthAuthoritative Off
201-
Require valid-user
202-
203-
When using Apache 2.0 however, only support for Basic authentication
204-
mechanism is provided. It is not possible to use Digest authentication.
205-
When using Apache 1.3, this feature is not available at all.
206-
207186
The benefit of using the Apache authentication provider mechanism rather
208187
than the WSGI application doing it all itself, is that it can be used to
209188
control access to a number of WSGI applications at the same time as well as
@@ -252,9 +231,6 @@ Any configuration defined by !SetEnv directives is not passed in the
252231
configuration specified in such a way from a '.htaccess' file.
253232
Configuration should as a result be placed into the script file itself.
254233

255-
Configuration of group authorisation is the same whether Apache 2.0 or 2.2
256-
is used. The feature is not available when using Apache 1.3.
257-
258234
By default the group authorisation code is always executed in the context
259235
of the first interpreter created by Python, ie., '%{GLOBAL}', and always in
260236
the Apache child processes, never in a daemon process. The interpreter can

docs/user-guides/application-issues.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,8 +1119,7 @@ WSGIDaemonProcess directive::
11191119

11201120
WSGIDaemonProcess example stack-size=524288
11211121

1122-
If you are unable to upgrade to Apache 2.2 and/or mod_wsgi 2.0, the only
1123-
other option you have for affecting the amount of virtual memory set aside
1122+
Another option you have for affecting the amount of virtual memory set aside
11241123
for the stack of each thread is to override the process stack size. If you are
11251124
using a standard Apache distribution, this can be done by adding to the
11261125
'envvars' file for the Apache installation::

docs/user-guides/checking-your-installation.rst

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -277,13 +277,9 @@ directives are used.
277277

278278
If the AcceptMutex directive is defined in the Apache configuration file,
279279
then what ever mechanism is specified will be used instead for Apache child
280-
processes. Provided that Apache 2.2 or older is used, and WSGIAcceptMutex
281-
is not specified, then when AcceptMutex is used, that will also then be used
282-
by mod_wsgi daemon processes as well.
283-
284-
In the case of Apache 2.4 and later, AcceptMutex will no longer override the
285-
default for mod_wsgi daemon process groups, and instead WSGIAcceptMutex must
286-
be specified seperately if it needs to be overridden for both.
280+
processes. AcceptMutex will not override the default for mod_wsgi daemon
281+
process groups, and instead WSGIAcceptMutex must be specified separately if
282+
it needs to be overridden for both.
287283

288284
Either way, you should check the Apache configuration files as to whether
289285
either AcceptMutex or WSGIAcceptMutex directives are used as they will

0 commit comments

Comments
 (0)