Index: os/win32/BaseAddr.ref
===================================================================
--- os/win32/BaseAddr.ref (.../tags/2.2.0) (wersja 358411)
+++ os/win32/BaseAddr.ref (.../branches/2.2.x) (wersja 358411)
@@ -71,3 +71,5 @@
mod_bucketeer.so 0x6FA60000 0x00010000
mod_dumpio.so 0x6FA50000 0x00010000
mod_echo.so 0x6FA40000 0x00010000
+mod_authn_dbd.so 0x6FA30000 0x00010000
+mod_dbd.so 0x6FA20000 0x00010000
Index: InstallBin.dsp
===================================================================
--- InstallBin.dsp (.../tags/2.2.0) (wersja 358411)
+++ InstallBin.dsp (.../branches/2.2.x) (wersja 358411)
@@ -33,15 +33,15 @@
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Cmd_Line "NMAKE /f InstallBin.mak"
# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "\Apache21\bin\httpd.exe"
+# PROP BASE Target_File "\Apache2\bin\httpd.exe"
# PROP BASE Bsc_Name "InstallBin.bsc"
# PROP BASE Target_Dir ""
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache21" SHORT=R LONG=Release _install"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" SHORT=R LONG=Release _install"
# PROP Rebuild_Opt ""
-# PROP Target_File "\Apache21\bin\httpd.exe"
+# PROP Target_File "\Apache2\bin\httpd.exe"
# PROP Bsc_Name "Browse\httpd.bsc"
# PROP Target_Dir ""
@@ -52,15 +52,15 @@
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Cmd_Line "NMAKE /f InstallBin.mak"
# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "\Apache21\bin\httpd.exe"
+# PROP BASE Target_File "\Apache2\bin\httpd.exe"
# PROP BASE Bsc_Name "InstallBin.bsc"
# PROP BASE Target_Dir ""
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache21" SHORT=D LONG=Debug _install"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" SHORT=D LONG=Debug _install"
# PROP Rebuild_Opt ""
-# PROP Target_File "\Apache21\bin\httpd.exe"
+# PROP Target_File "\Apache2\bin\httpd.exe"
# PROP Bsc_Name ""
# PROP Target_Dir ""
Index: docs/conf/httpd-win.conf
===================================================================
--- docs/conf/httpd-win.conf (.../tags/2.2.0) (wersja 358411)
+++ docs/conf/httpd-win.conf (.../branches/2.2.x) (wersja 358411)
@@ -161,6 +161,7 @@
AllowOverride None
Order deny,allow
Deny from all
+ Satisfy all
#
@@ -391,12 +392,6 @@
#
#AddHandler cgi-script .cgi
- # For files that include their own HTTP headers:
- #AddHandler send-as-is asis
-
- # For server-parsed imagemap files:
- #AddHandler imap-file map
-
# For type maps (negotiated resources):
#AddHandler type-map var
Index: docs/conf/extra/httpd-mpm.conf.in
===================================================================
--- docs/conf/extra/httpd-mpm.conf.in (.../tags/2.2.0) (wersja 358411)
+++ docs/conf/extra/httpd-mpm.conf.in (.../branches/2.2.x) (wersja 358411)
@@ -57,14 +57,6 @@
MaxRequestsPerChild 0
-# WinNT MPM
-# ThreadsPerChild: constant number of worker threads in the server process
-# MaxRequestsPerChild: maximum number of requests a server process serves
-
Available Languages: de | en | Index: docs/manual/invoking.html.ko.euc-kr =================================================================== --- docs/manual/invoking.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) +++ docs/manual/invoking.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) @@ -16,7 +16,7 @@
: de | en | Index: docs/manual/developer/documenting.html.en =================================================================== --- docs/manual/developer/documenting.html.en (.../tags/2.2.0) (wersja 358411) +++ docs/manual/developer/documenting.html.en (.../branches/2.2.x) (wersja 358411) @@ -16,7 +16,7 @@
Available Languages: en
Available Languages: en
Available Languages: en
Available Languages: en
Available Languages: en
Available Languages: en
Available Languages: en
Available Languages: en
Apache HTTP Server Version 2.2
+Available Languages: en
+Access control refers to any means of controlling access to any + resource. This is separate from authentication and authorization.
+Access control can be done by several different modules. The most
+important of these is mod_authz_host
. Other modules
+discussed in this document include mod_setenvif
and
+mod_rewrite
.
+ If you wish to restrict access to portions of your site based on the
+ host address of your visitors, this is most easily done using
+ mod_authz_host
.
+
The Allow
and
+ Deny
directives let
+ you allow and deny access based on the host name, or host
+ address, of the machine requesting a document. The
+ Order
directive goes
+ hand-in-hand with these two, and tells Apache in which order to
+ apply the filters.
The usage of these directives is:
+ +
+ Allow from address
+
where address is an IP address (or a partial IP + address) or a fully qualified domain name (or a partial domain + name); you may provide multiple addresses or domain names, if + desired.
+ +For example, if you have someone spamming your message + board, and you want to keep them out, you could do the + following:
+ +
+ Deny from 205.252.46.165
+
Visitors coming from that address will not be able to see + the content covered by this directive. If, instead, you have a + machine name, rather than an IP address, you can use that.
+ +
+ Deny from host.example.com
+
And, if you'd like to block access from an entire domain, + you can specify just part of an address or domain name:
+ +
+ Deny from 192.101.205
+ Deny from cyberthugs.com moreidiots.com
+ Deny from ke
+
Using Order
will let you
+ be sure that you are actually restricting things to the group that you want
+ to let in, by combining a Deny
and an Allow
directive:
+ Order deny,allow
+ Deny from all
+ Allow from dev.example.com
+
Listing just the Allow
+ directive would not do what you want, because it will let folks from that
+ host in, in addition to letting everyone in. What you want is to let
+ only those folks in.
+ mod_authz_host
, in conjunction with
+ mod_setenvif
, can be used to restrict access to
+ your website based on the value of arbitrary environment variables.
+ This is done with the Allow from env=
and Deny
+ from env=
syntax.
+
+ SetEnvIf User-Agent BadBot GoAway=1
+ Order allow,deny
+ Allow from all
+ Deny from env=GoAway
+
Access control by User-Agent
is an unreliable technique,
+ since the User-Agent
header can be set to anything at all,
+ at the whim of the end user.
+ In the above example, the environment variable GoAway
+ is set to 1
if the User-Agent
matches the
+ string BadBot
. Then we deny access for any request when
+ this variable is set. This blocks that particular user agent from
+ the site.
+
An environment variable test can be negated using the =!
+ syntax:
+ Allow from env=!GoAway +
The [F]
RewriteRule
flag causes a 403 Forbidden
+response to be sent. Using this, you can deny access to a resource based
+on arbitrary criteria.
For example, if you wish to block access to a resource between 8pm
+and 6am, you can do this using mod_rewrite
.
+RewriteEngine On
+RewriteCond %{TIME_HOUR} > 20 [OR]
+RewriteCond %{TIME_HOUR} < 07
+RewriteRule ^/fridge - [F]
+
This will return a 403 Forbidden response for any request after 8pm +or before 7am. This technique can be used for any criteria that you wish +to check. You can also redirect, or otherwise rewrite these requests, if +that approach is preferred.
+ +You should also read the documentation for
+ mod_auth_basic
and mod_authz_host
which
+ contain some more information about how this all works.
+ mod_authn_alias
can also help in simplifying certain
+ authentication configurations.
See the Authentication and Authorization + howto.
+Available Languages: en
+