From: Elan Ruusamäe Date: Sat, 24 Dec 2005 23:25:14 +0000 (+0000) Subject: - rediff without missing files X-Git-Tag: auto/ac/apache-2_2_0-7~4 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=54f125cee6affa83ce026f017d9f0604141b17d6;p=packages%2Fapache.git - rediff without missing files Changed files: apache-branch.patch -> 1.2 --- diff --git a/apache-branch.patch b/apache-branch.patch index 27ec444..a671bf6 100644 --- a/apache-branch.patch +++ b/apache-branch.patch @@ -1,17 +1,165 @@ -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) +diff -ur httpd-2.2.0/Apache.dsw httpd-2.2.0-branch/Apache.dsw +--- httpd-2.2.0/Apache.dsw 2005-10-09 17:31:40.000000000 +0300 ++++ httpd-2.2.0-branch/Apache.dsw 2005-12-22 04:02:47.000000000 +0200 +@@ -81,6 +81,9 @@ + Project_Dep_Name mod_authn_anon + End Project Dependency + Begin Project Dependency ++ Project_Dep_Name mod_authn_dbd ++ End Project Dependency ++ Begin Project Dependency + Project_Dep_Name mod_authn_dbm + End Project Dependency + Begin Project Dependency +@@ -126,6 +129,9 @@ + Project_Dep_Name mod_dav_fs + End Project Dependency + Begin Project Dependency ++ Project_Dep_Name mod_dbd ++ End Project Dependency ++ Begin Project Dependency + Project_Dep_Name mod_dir + End Project Dependency + Begin Project Dependency +@@ -747,6 +753,33 @@ + + ############################################################################### + ++Project: "mod_authn_dbd"=.\modules\aaa\mod_authn_dbd.dsp - Package Owner=<4> ++ ++Package=<5> ++{{{ ++}}} ++ ++Package=<4> ++{{{ ++ Begin Project Dependency ++ Project_Dep_Name libapr ++ End Project Dependency ++ Begin Project Dependency ++ Project_Dep_Name libaprutil ++ End Project Dependency ++ Begin Project Dependency ++ Project_Dep_Name libhttpd ++ End Project Dependency ++ Begin Project Dependency ++ Project_Dep_Name mod_auth_basic ++ End Project Dependency ++ Begin Project Dependency ++ Project_Dep_Name mod_dbd ++ End Project Dependency ++}}} ++ ++############################################################################### ++ + Project: "mod_authn_dbm"=.\modules\aaa\mod_authn_dbm.dsp - Package Owner=<4> + + Package=<5> +@@ -1110,6 +1143,27 @@ + + ############################################################################### + ++Project: "mod_dbd"=.\modules\database\mod_dbd.dsp - Package Owner=<4> ++ ++Package=<5> ++{{{ ++}}} ++ ++Package=<4> ++{{{ ++ Begin Project Dependency ++ Project_Dep_Name libapr ++ End Project Dependency ++ Begin Project Dependency ++ Project_Dep_Name libaprutil ++ End Project Dependency ++ Begin Project Dependency ++ Project_Dep_Name libhttpd ++ End Project Dependency ++}}} ++ ++############################################################################### ++ + Project: "mod_deflate"=.\modules\filters\mod_deflate.dsp - Package Owner=<4> + + Package=<5> +diff -ur httpd-2.2.0/BuildBin.dsp httpd-2.2.0-branch/BuildBin.dsp +--- httpd-2.2.0/BuildBin.dsp 2005-04-09 09:07:58.000000000 +0300 ++++ httpd-2.2.0-branch/BuildBin.dsp 2005-12-22 04:02:47.000000000 +0200 +@@ -33,15 +33,15 @@ + # PROP BASE Intermediate_Dir "" + # PROP BASE Cmd_Line "NMAKE /f makefile.win" + # 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 ".\Browse\BuildBin.bsc" + # PROP BASE Target_Dir "" + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "" + # PROP Intermediate_Dir "" +-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache21" LONG=Release _tryssl _tryzlib _dummy" ++# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _tryssl _tryzlib _dummy" + # 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 "" + # PROP BASE Cmd_Line "NMAKE /f makefile.win" + # 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 ".\Browse\BuildBin.bsc" + # PROP BASE Target_Dir "" + # PROP Use_Debug_Libraries 1 + # PROP Output_Dir "" + # PROP Intermediate_Dir "" +-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache21" LONG=Debug _tryssl _tryzlib _dummy" ++# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _tryssl _tryzlib _dummy" + # 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 "" + +diff -ur httpd-2.2.0/CHANGES httpd-2.2.0-branch/CHANGES +--- httpd-2.2.0/CHANGES 2005-11-29 10:00:39.000000000 +0200 ++++ httpd-2.2.0-branch/CHANGES 2005-12-22 04:02:47.000000000 +0200 +@@ -1,4 +1,29 @@ + -*- coding: utf-8 -*- ++Changes with Apache 2.2.1 ++ ++ *) Chunk filter: Fix chunk filter to create correct chunks in the case that ++ a flush bucket is surrounded by data buckets. [Ruediger Pluem] ++ ++ *) SECURITY: CVE-2005-3352 (cve.mitre.org) ++ mod_imagemap: Escape untrusted referer header before outputting ++ in HTML to avoid potential cross-site scripting. Change also ++ made to ap_escape_html so we escape quotes. Reported by JPCERT. ++ [Mark Cox] ++ ++ *) Fix syntax error in httpd.h with strict compilers. PR 38740. ++ [Per Olausson ] ++ ++ *) Preserve the Content-Length header for a proxied HEAD response. ++ PR 18757. [Greg Ames] ++ ++ *) Fix recursive ErrorDocument handling. PR 36090. ++ [Chris Darroch ] ++ ++ *) Don't hang on error return from post_read_request. PR37790 [Nick Kew] ++ ++ *) Fix off-by-one error in proxy_balancer. PR37753 ++ [Kazuhiro Osawa ] ++ + Changes with Apache 2.2.0 + + *) mod_negotiation: Minor performance tweak by reusing already calculated +diff -ur httpd-2.2.0/InstallBin.dsp httpd-2.2.0-branch/InstallBin.dsp +--- httpd-2.2.0/InstallBin.dsp 2005-04-09 09:07:58.000000000 +0300 ++++ httpd-2.2.0-branch/InstallBin.dsp 2005-12-22 04:02:45.000000000 +0200 @@ -33,15 +33,15 @@ # PROP BASE Intermediate_Dir "Release" # PROP BASE Cmd_Line "NMAKE /f InstallBin.mak" @@ -50,191 +198,522 @@ Index: InstallBin.dsp # 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 - +diff -ur httpd-2.2.0/LAYOUT httpd-2.2.0-branch/LAYOUT +--- httpd-2.2.0/LAYOUT 2005-11-29 10:00:39.000000000 +0200 ++++ httpd-2.2.0-branch/LAYOUT 2005-12-22 04:02:47.000000000 +0200 +@@ -163,11 +163,7 @@ - # -@@ -391,12 +392,6 @@ - # - #AddHandler cgi-script .cgi + experimental/ ........... -- # For files that include their own HTTP headers: -- #AddHandler send-as-is asis +- leader/ ................. - -- # For server-parsed imagemap files: -- #AddHandler imap-file map +- perchild/ ............... - - # For type maps (negotiated resources): - #AddHandler type-map var +- threadpool/ ............. ++ event/ ................. -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 - + mpmt_os2/ ............... --# WinNT MPM --# ThreadsPerChild: constant number of worker threads in the server process --# MaxRequestsPerChild: maximum number of requests a server process serves -- -- ThreadsPerChild 250 -- MaxRequestsPerChild 0 -- -- - # BeOS MPM - # StartThreads: how many threads do we initially spawn? - # MaxClients: max number of threads we can have (1 thread == 1 client) -Index: docs/conf/httpd.conf.in -=================================================================== ---- docs/conf/httpd.conf.in (.../tags/2.2.0) (wersja 358411) -+++ docs/conf/httpd.conf.in (.../branches/2.2.x) (wersja 358411) -@@ -53,7 +53,6 @@ +diff -ur httpd-2.2.0/Makefile.win httpd-2.2.0-branch/Makefile.win +--- httpd-2.2.0/Makefile.win 2005-09-21 18:14:35.000000000 +0300 ++++ httpd-2.2.0-branch/Makefile.win 2005-12-22 04:02:47.000000000 +0200 +@@ -19,7 +19,7 @@ # - @@LoadModule@@ - -- - + # For example; # - # If you wish httpd to run as a different user or group, you must run -@@ -66,7 +65,6 @@ - User daemon - Group daemon - -- - - # 'Main' server configuration +-# nmake /f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr ++# nmake -f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr # -@@ -173,6 +171,7 @@ - - Order allow,deny - Deny from all -+ Satisfy All - + # Be aware that certain awk's will not accept backslahed names, + # so the server root should be given in forward slashes (quoted), +@@ -33,10 +33,10 @@ - # -@@ -316,12 +315,6 @@ - # - #AddHandler cgi-script .cgi + !IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util") || !EXIST("srclib\apr-iconv") + !MESSAGE Please check out or download and unpack the Apache Portability Runtime +-!MESSAGE sources (apr, apr-iconv and apr-util) into your $(INSTDIR)\srclib dir. ++!MESSAGE sources (apr, apr-iconv and apr-util) into your srclib dir. + !MESSAGE Apache cannot build without these libraries! + !MESSAGE +-!ERROR Need $(INSTDIR)\srclib\ apr, apr-iconv and apr-util ++!ERROR Need srclib\ apr, apr-iconv and apr-util + !ENDIF -- # 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 + # Note; _tryssl: is only used by the msvc developer studio environment to 'fix up' +@@ -119,18 +119,18 @@ + !MESSAGE SERVERNAME = $(SERVERNAME) + !MESSAGE PORT = $(PORT) + !MESSAGE +-!MESSAGE To change these options use 'nmake /f Makefile.win [option=value]' +-!MESSAGE Example: nmake /f Makefile.win PORT=8080 ++!MESSAGE To change these options use 'nmake -f Makefile.win [option=value]' ++!MESSAGE Example: nmake -f Makefile.win PORT=8080 + !MESSAGE + !MESSAGE + !ENDIF -Index: docs/docroot/apache_pb2_ani.gif -=================================================================== -Nie można wyświetlić: plik binarny. -svn:mime-type = image/gif -Index: docs/docroot/apache_pb2.png -=================================================================== -Nie można wyświetlić: plik binarny. -svn:mime-type = image/png -Index: docs/docroot/apache_pb2.gif -=================================================================== -Nie można wyświetlić: plik binarny. -svn:mime-type = image/gif -Index: docs/docroot/apache_pb22_ani.gif -=================================================================== -Nie można wyświetlić: plik binarny. -svn:mime-type = image/gif - -Zmiany atrybutów dla: docs/docroot/apache_pb22_ani.gif -___________________________________________________________________ -Nazwa: svn:mime-type - + image/gif - -Index: docs/docroot/apache_pb22.png -=================================================================== -Nie można wyświetlić: plik binarny. -svn:mime-type = image/png - -Zmiany atrybutów dla: docs/docroot/apache_pb22.png -___________________________________________________________________ -Nazwa: svn:mime-type - + image/png - -Index: docs/docroot/apache_pb22.gif -=================================================================== -Nie można wyświetlić: plik binarny. -svn:mime-type = image/gif - -Zmiany atrybutów dla: docs/docroot/apache_pb22.gif -___________________________________________________________________ -Nazwa: svn:mime-type - + image/gif - -Index: docs/manual/stopping.html.ja.euc-jp -=================================================================== ---- docs/manual/stopping.html.ja.euc-jp (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/stopping.html.ja.euc-jp (.../branches/2.2.x) (wersja 358411) -@@ -16,7 +16,7 @@ - -
<-
-

Ää»ß¤ÈºÆµ¯Æ°

-
-

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) + !IFNDEF MAKEOPT + # Only default the behavior if MAKEOPT= is omitted +-!IF "$(MAKE)" == "NMAKE" ++!IFDEF _NMAKE_VER + # Microsoft NMake options + MAKEOPT=-nologo +-!ELSEIF "($MAKE)" == "make" ++!ELSEIF "$(MAKE)" == "make" + # Borland make options? Not really supported (yet) + MAKEOPT=-s -N + !ENDIF +@@ -178,14 +178,14 @@ + $(MAKE) $(MAKEOPT) -f apriconv.mak CFG="apriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f libapriconv.mak CFG="libapriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET) + !IF "$(CTARGET)" == "CLEAN" +- $(MAKE) $(MAKEOPT) /f build\modules.mk.win clean \ ++ $(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \ + BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=. + !ELSE + cd ccs +- $(MAKE) /nologo /f Makefile.win all \ ++ $(MAKE) $(MAKEOPT) -f Makefile.win all \ + BUILD_MODE=$(LONG) BIND_MODE=shared + cd ..\ces +- $(MAKE) /nologo /f Makefile.win all \ ++ $(MAKE) $(MAKEOPT) -f Makefile.win all \ + BUILD_MODE=$(LONG) BIND_MODE=shared + cd .. + !ENDIF +@@ -216,6 +216,7 @@ + $(MAKE) $(MAKEOPT) -f mod_auth_basic.mak CFG="mod_auth_basic - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_auth_digest.mak CFG="mod_auth_digest - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_authn_anon.mak CFG="mod_authn_anon - Win32 $(LONG)" RECURSE=0 $(CTARGET) ++ $(MAKE) $(MAKEOPT) -f mod_authn_dbd.mak CFG="mod_authn_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_authn_dbm.mak CFG="mod_authn_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_authn_default.mak CFG="mod_authn_default - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_authn_file.mak CFG="mod_authn_file - Win32 $(LONG)" RECURSE=0 $(CTARGET) +@@ -235,6 +236,9 @@ + $(MAKE) $(MAKEOPT) -f mod_mem_cache.mak CFG="mod_mem_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_disk_cache.mak CFG="mod_disk_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. ++ cd modules\database ++ $(MAKE) $(MAKEOPT) -f mod_dbd.mak CFG="mod_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET) ++ cd ..\.. + cd modules\dav\main + $(MAKE) $(MAKEOPT) -f mod_dav.mak CFG="mod_dav - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\..\.. +@@ -246,9 +250,9 @@ + $(MAKE) $(MAKEOPT) -f mod_dumpio.mak CFG="mod_dumpio - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. + cd modules\experimental +- $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. + cd modules\filters ++ $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET) + !IF EXIST("srclib\zlib") + $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET) + !ENDIF +@@ -356,7 +360,7 @@ + "BuildBin - Win32 $(LONG)" $(CTARGET) + !IF "$(CTARGET)" == "/CLEAN" + @cd srclib\apr-iconv +- @$(MAKE) $(MAKEOPT) /f build\modules.mk.win clean \ ++ @$(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \ + BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=. + @cd ..\.. + !ENDIF +@@ -382,6 +386,7 @@ + copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so) "$(inst_so)" <.y + copy modules\aaa\$(LONG)\mod_auth_digest.$(src_so) "$(inst_so)" <.y + copy modules\aaa\$(LONG)\mod_authn_anon.$(src_so) "$(inst_so)" <.y ++ copy modules\aaa\$(LONG)\mod_authn_dbd.$(src_so) "$(inst_so)" <.y + copy modules\aaa\$(LONG)\mod_authn_dbm.$(src_so) "$(inst_so)" <.y + copy modules\aaa\$(LONG)\mod_authn_default.$(src_so) "$(inst_so)" <.y + copy modules\aaa\$(LONG)\mod_authn_file.$(src_so) "$(inst_so)" <.y +@@ -396,11 +401,12 @@ + copy modules\cache\$(LONG)\mod_file_cache.$(src_so) "$(inst_so)" <.y + copy modules\cache\$(LONG)\mod_mem_cache.$(src_so) "$(inst_so)" <.y + copy modules\cache\$(LONG)\mod_disk_cache.$(src_so) "$(inst_so)" <.y ++ copy modules\database\$(LONG)\mod_dbd.$(src_so) "$(inst_so)" <.y + copy modules\dav\fs\$(LONG)\mod_dav_fs.$(src_so) "$(inst_so)" <.y + copy modules\dav\main\$(LONG)\mod_dav.$(src_so) "$(inst_so)" <.y + copy modules\debug\$(LONG)\mod_bucketeer.$(src_so) "$(inst_so)" <.y + copy modules\debug\$(LONG)\mod_dumpio.$(src_so) "$(inst_so)" <.y +- copy modules\experimental\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y ++ copy modules\filters\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y + !IF EXIST("srclib\zlib") + copy modules\filters\$(LONG)\mod_deflate.$(src_so) "$(inst_so)" <.y + !IF EXIST("srclib\zlib\zlib1.$(src_dll)") +diff -ur httpd-2.2.0/README httpd-2.2.0-branch/README +--- httpd-2.2.0/README 2005-11-29 10:00:39.000000000 +0200 ++++ httpd-2.2.0-branch/README 2005-12-22 04:02:47.000000000 +0200 +@@ -16,15 +16,15 @@ + ------------------ + + Details of the latest version can be found on the Apache HTTP +- server project page under http://httpd.apache.org/. ++ server project page under . + + Documentation + ------------- + + The documentation available as of the date of this release is + included in HTML format in the docs/manual/ directory. The most +- up-to-date documentation can be found at +- http://httpd.apache.org/docs-2.2/. ++ up-to-date documentation for the 2.2.x releases can be found at ++ . + + Installation + ------------ +@@ -43,28 +43,28 @@ + o If you want to be informed about new code releases, bug fixes, + security fixes, general news and information about the Apache server + subscribe to the apache-announce mailing list as described under +- http://httpd.apache.org/lists.html#http-announce ++ + + o If you want freely available support for running Apache please join the + Apache user community by subscribing to Users Mailing List at +- http://httpd.apache.org/userslist.html or one of the following USENET +- newsgroups: +- comp.infosystems.www.servers.unix +- comp.infosystems.www.servers.ms-windows ++ or one of the following ++ USENET newsgroups: ++ comp.infosystems.www.servers.unix ++ comp.infosystems.www.servers.ms-windows + Also available at: +- http://groups.google.com/groups?group=comp.infosystems.www.servers ++ + + o If you want commercial support for running Apache please contact + one of the companies and contractors which are listed at +- http://www.apache.org/info/support.cgi ++ + + o If you have a concrete bug report for Apache please go to the + Apache Group Bug Database and submit your report: +- http://httpd.apache.org/bug_report.html ++ + + o If you want to participate in actively developing Apache please + subscribe to the `dev@httpd.apache.org' mailing list as described at +- http://www.apache.org/lists.html#http-dev ++ + + Acknowledgments + ---------------- +diff -ur httpd-2.2.0/docs/conf/extra/httpd-mpm.conf.in httpd-2.2.0-branch/docs/conf/extra/httpd-mpm.conf.in +--- httpd-2.2.0/docs/conf/extra/httpd-mpm.conf.in 2005-11-20 06:44:18.000000000 +0200 ++++ httpd-2.2.0-branch/docs/conf/extra/httpd-mpm.conf.in 2005-12-22 04:02:45.000000000 +0200 +@@ -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 +- +- ThreadsPerChild 250 +- MaxRequestsPerChild 0 +- +- + # BeOS MPM + # StartThreads: how many threads do we initially spawn? + # MaxClients: max number of threads we can have (1 thread == 1 client) +diff -ur httpd-2.2.0/docs/conf/httpd-win.conf httpd-2.2.0-branch/docs/conf/httpd-win.conf +--- httpd-2.2.0/docs/conf/httpd-win.conf 2005-11-13 19:17:31.000000000 +0200 ++++ httpd-2.2.0-branch/docs/conf/httpd-win.conf 2005-12-22 04:02:45.000000000 +0200 +@@ -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 + +diff -ur httpd-2.2.0/docs/conf/httpd.conf.in httpd-2.2.0-branch/docs/conf/httpd.conf.in +--- httpd-2.2.0/docs/conf/httpd.conf.in 2005-11-13 19:17:31.000000000 +0200 ++++ httpd-2.2.0-branch/docs/conf/httpd.conf.in 2005-12-22 04:02:45.000000000 +0200 +@@ -53,7 +53,6 @@ + # + @@LoadModule@@ + +- + + # + # If you wish httpd to run as a different user or group, you must run +@@ -66,7 +65,6 @@ + User daemon + Group daemon + +- + + # 'Main' server configuration + # +@@ -173,6 +171,7 @@ + + Order allow,deny + Deny from all ++ Satisfy All + + + # +@@ -316,12 +315,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 + +diff -ur httpd-2.2.0/docs/manual/bind.html.de httpd-2.2.0-branch/docs/manual/bind.html.de +--- httpd-2.2.0/docs/manual/bind.html.de 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/bind.html.de 2005-12-22 04:02:47.000000000 +0200 @@ -16,7 +16,7 @@

<-

¾ÆÆÄÄ¡ ½ÃÀÛ

-+Apache > HTTP Server > Documentation > Version 2.2

¾ÆÆÄÄ¡ ½ÃÀÛ

+-Apache > HTTP-Server > Dokumentation > Version 2.2

Anbindung

-

°¡´ÉÇÑ ¾ð¾î:  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) +

Verfügbare Sprachen:  de  | +  en  | +diff -ur httpd-2.2.0/docs/manual/bind.html.en httpd-2.2.0-branch/docs/manual/bind.html.en +--- httpd-2.2.0/docs/manual/bind.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/bind.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -16,7 +16,7 @@ -

-
<-
+
+
<-

Documenting Apache 2.0

+-Apache > HTTP Server > Documentation > Version 2.2

Binding

-

Available Languages:  en 

-
-Index: docs/manual/developer/modules.html.ja.euc-jp -=================================================================== ---- docs/manual/developer/modules.html.ja.euc-jp (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/developer/modules.html.ja.euc-jp (.../branches/2.2.x) (wersja 358411) +

Available Languages:  de  | +  en  | +diff -ur httpd-2.2.0/docs/manual/bind.html.fr httpd-2.2.0-branch/docs/manual/bind.html.fr +--- httpd-2.2.0/docs/manual/bind.html.fr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/bind.html.fr 2005-12-22 04:02:45.000000000 +0200 @@ -16,7 +16,7 @@ -

-
<-
+
+
<-

¥â¥¸¥å¡¼¥ë¤Î Apache 1.3 ¤«¤é Apache 2.0 ¤Ø¤Î°Ü¿¢

-+Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > Developer Documentation

¥â¥¸¥å¡¼¥ë¤Î Apache 1.3 ¤«¤é Apache 2.0 ¤Ø¤Î°Ü¿¢

+-Apache > Serveur HTTP > Documentation > Version 2.2

Liaison

-

Available Languages:  en  | -  ja 

-Index: docs/manual/developer/debugging.html.en -=================================================================== ---- docs/manual/developer/debugging.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/developer/debugging.html.en (.../branches/2.2.x) (wersja 358411) +

Langues Disponibles:  de  | +  en  | +diff -ur httpd-2.2.0/docs/manual/bind.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/bind.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/bind.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/bind.html.ja.euc-jp 2005-12-22 04:02:46.000000000 +0200 @@ -16,7 +16,7 @@ -

+
+
<-
+

¥Ð¥¤¥ó¥É

+
+

Available Languages:  de  | +  en  | +diff -ur httpd-2.2.0/docs/manual/bind.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/bind.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/bind.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/bind.html.ko.euc-kr 2005-12-22 04:02:45.000000000 +0200 +@@ -16,7 +16,7 @@ +

+
<-
+

ÁÖ¼Ò¿Í Æ÷Æ® ÁöÁ¤ (Binding)

++Apache > HTTP Server > Documentation > Version 2.2

ÁÖ¼Ò¿Í Æ÷Æ® ÁöÁ¤ (Binding)

+
+

°¡´ÉÇÑ ¾ð¾î:  de  | +  en  | +diff -ur httpd-2.2.0/docs/manual/caching.html.en httpd-2.2.0-branch/docs/manual/caching.html.en +--- httpd-2.2.0/docs/manual/caching.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/caching.html.en 2005-12-22 04:02:47.000000000 +0200 +@@ -16,7 +16,7 @@ +

+
<-
+

Caching Guide

+
+

Available Languages:  en 

+
+diff -ur httpd-2.2.0/docs/manual/configuring.html.de httpd-2.2.0-branch/docs/manual/configuring.html.de +--- httpd-2.2.0/docs/manual/configuring.html.de 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/configuring.html.de 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +
+
<-
+

Konfigurationsdateien

++Apache > HTTP-Server > Dokumentation > Version 2.2

Konfigurationsdateien

+
+

Verfügbare Sprachen:  de  | +  en  | +diff -ur httpd-2.2.0/docs/manual/configuring.html.en httpd-2.2.0-branch/docs/manual/configuring.html.en +--- httpd-2.2.0/docs/manual/configuring.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/configuring.html.en 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

+
<-
+

Configuration Files

++Apache > HTTP Server > Documentation > Version 2.2

Configuration Files

+
+

Available Languages:  de  | +  en  | +diff -ur httpd-2.2.0/docs/manual/configuring.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/configuring.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/configuring.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/configuring.html.ja.euc-jp 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

+
<-
+

ÀßÄê¥Õ¥¡¥¤¥ë

+
+

Available Languages:  de  | +  en  | +diff -ur httpd-2.2.0/docs/manual/configuring.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/configuring.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/configuring.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/configuring.html.ko.euc-kr 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

+
<-
+

¼³Á¤ÆÄÀÏ

++Apache > HTTP Server > Documentation > Version 2.2

¼³Á¤ÆÄÀÏ

+
+

°¡´ÉÇÑ ¾ð¾î:  de  | +  en  | +diff -ur httpd-2.2.0/docs/manual/content-negotiation.html.en httpd-2.2.0-branch/docs/manual/content-negotiation.html.en +--- httpd-2.2.0/docs/manual/content-negotiation.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/content-negotiation.html.en 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

+
<-
+

Content Negotiation

++Apache > HTTP Server > Documentation > Version 2.2

Content Negotiation

+
+

Available Languages:  en  | +  ja  | +diff -ur httpd-2.2.0/docs/manual/content-negotiation.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/content-negotiation.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/content-negotiation.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/content-negotiation.html.ja.euc-jp 2005-12-22 04:02:45.000000000 +0200 +@@ -16,7 +16,7 @@ +

+
<-
+

¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó

++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2

¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó

+
+

Available Languages:  en  | +  ja  | +diff -ur httpd-2.2.0/docs/manual/content-negotiation.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/content-negotiation.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/content-negotiation.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/content-negotiation.html.ko.euc-kr 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

+
<-
+

³»¿ëÇù»ó (Content Negotiation)

++Apache > HTTP Server > Documentation > Version 2.2

³»¿ëÇù»ó (Content Negotiation)

+
+

°¡´ÉÇÑ ¾ð¾î:  en  | +  ja  | +diff -ur httpd-2.2.0/docs/manual/convenience.map httpd-2.2.0-branch/docs/manual/convenience.map +--- httpd-2.2.0/docs/manual/convenience.map 2005-11-13 19:28:20.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/convenience.map 2005-12-22 04:02:46.000000000 +0200 +@@ -374,6 +374,7 @@ + typesconfig mod/mod_mime.html#typesconfig + unsetenv mod/mod_env.html#unsetenv + usecanonicalname mod/core.html#usecanonicalname ++usecanonicalphysicalport mod/core.html#usecanonicalphysicalport + user mod/mpm_common.html#user + userdir mod/mod_userdir.html#userdir + virtualdocumentroot mod/mod_vhost_alias.html#virtualdocumentroot +diff -ur httpd-2.2.0/docs/manual/custom-error.html.en httpd-2.2.0-branch/docs/manual/custom-error.html.en +--- httpd-2.2.0/docs/manual/custom-error.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/custom-error.html.en 2005-12-22 04:02:45.000000000 +0200 +@@ -16,7 +16,7 @@ +

+
<-
+

Custom Error Responses

++Apache > HTTP Server > Documentation > Version 2.2

Custom Error Responses

+
+

Available Languages:  en  | +  es  | +diff -ur httpd-2.2.0/docs/manual/custom-error.html.es httpd-2.2.0-branch/docs/manual/custom-error.html.es +--- httpd-2.2.0/docs/manual/custom-error.html.es 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/custom-error.html.es 2005-12-22 04:02:45.000000000 +0200 +@@ -16,7 +16,7 @@ +

+
<-
+

Respuestas de error personalizadas

++Apache > Servidor HTTP > Documentación > Versión 2.2

Respuestas de error personalizadas

+
+

Idiomas disponibles:  en  | +  es  | +diff -ur httpd-2.2.0/docs/manual/custom-error.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/custom-error.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/custom-error.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/custom-error.html.ja.euc-jp 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

+
<-
+

¥«¥¹¥¿¥à¥¨¥é¡¼¥ì¥¹¥Ý¥ó¥¹

++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2

¥«¥¹¥¿¥à¥¨¥é¡¼¥ì¥¹¥Ý¥ó¥¹

+
+

Available Languages:  en  | +  es  | +diff -ur httpd-2.2.0/docs/manual/custom-error.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/custom-error.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/custom-error.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/custom-error.html.ko.euc-kr 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

+
<-
+

»ç¿ëÀÚÁ¤ÀÇ ¿À·ù ÀÀ´ä

++Apache > HTTP Server > Documentation > Version 2.2

»ç¿ëÀÚÁ¤ÀÇ ¿À·ù ÀÀ´ä

+
+

°¡´ÉÇÑ ¾ð¾î:  en  | +  es  | +diff -ur httpd-2.2.0/docs/manual/developer/API.html.en httpd-2.2.0-branch/docs/manual/developer/API.html.en +--- httpd-2.2.0/docs/manual/developer/API.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/developer/API.html.en 2005-12-22 04:02:45.000000000 +0200 +@@ -16,7 +16,7 @@ +

+
<-
+

Apache 1.3 API notes

+
+

Available Languages:  en 

+
+diff -ur httpd-2.2.0/docs/manual/developer/debugging.html.en httpd-2.2.0-branch/docs/manual/developer/debugging.html.en +--- httpd-2.2.0/docs/manual/developer/debugging.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/developer/debugging.html.en 2005-12-22 04:02:45.000000000 +0200 +@@ -16,7 +16,7 @@ +
<-

Debugging Memory Allocation in APR

@@ -242,23 +721,21 @@ Index: docs/manual/developer/debugging.html.en

Available Languages:  en 

-Index: docs/manual/developer/modules.html.en -=================================================================== ---- docs/manual/developer/modules.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/developer/modules.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/developer/documenting.html.en httpd-2.2.0-branch/docs/manual/developer/documenting.html.en +--- httpd-2.2.0/docs/manual/developer/documenting.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/developer/documenting.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -16,7 +16,7 @@
<-

Converting Modules from Apache 1.3 to Apache 2.0

-+Apache > HTTP Server > Documentation > Version 2.2 > Developer Documentation

Converting Modules from Apache 1.3 to Apache 2.0

+-Apache > HTTP Server > Documentation > Version 2.2 > Developer Documentation

Documenting Apache 2.0

-

Available Languages:  en  | -  ja 

-Index: docs/manual/developer/filters.html.en -=================================================================== ---- docs/manual/developer/filters.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/developer/filters.html.en (.../branches/2.2.x) (wersja 358411) +

Available Languages:  en 

+
+diff -ur httpd-2.2.0/docs/manual/developer/filters.html.en httpd-2.2.0-branch/docs/manual/developer/filters.html.en +--- httpd-2.2.0/docs/manual/developer/filters.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/developer/filters.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -16,7 +16,7 @@
<-
@@ -268,49 +745,57 @@ Index: docs/manual/developer/filters.html.en

Available Languages:  en 

-Index: docs/manual/developer/API.html.en -=================================================================== ---- docs/manual/developer/API.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/developer/API.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/developer/hooks.html.en httpd-2.2.0-branch/docs/manual/developer/hooks.html.en +--- httpd-2.2.0/docs/manual/developer/hooks.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/developer/hooks.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -16,7 +16,7 @@
<-

Apache 2.0 Hook Functions

-

Available Languages:  en 

+

Available Languages:  en 

-Index: docs/manual/developer/thread_safety.html.en -=================================================================== ---- docs/manual/developer/thread_safety.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/developer/thread_safety.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/developer/index.html.en httpd-2.2.0-branch/docs/manual/developer/index.html.en +--- httpd-2.2.0/docs/manual/developer/index.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/developer/index.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -16,7 +16,7 @@
-
<-
+
<-

Apache 2.0 Thread Safety Issues

-+Apache > HTTP Server > Documentation > Version 2.2 > Developer Documentation

Apache 2.0 Thread Safety Issues

+-Apache > HTTP Server > Documentation > Version 2.2

Developer Documentation for Apache 2.0

++Apache > HTTP Server > Documentation > Version 2.2

Developer Documentation for Apache 2.0

-

Available Languages:  en 

+

Available Languages:  en 

-Index: docs/manual/developer/hooks.html.en -=================================================================== ---- docs/manual/developer/hooks.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/developer/hooks.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/developer/modules.html.en httpd-2.2.0-branch/docs/manual/developer/modules.html.en +--- httpd-2.2.0/docs/manual/developer/modules.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/developer/modules.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -16,7 +16,7 @@
<-

Converting Modules from Apache 1.3 to Apache 2.0

++Apache > HTTP Server > Documentation > Version 2.2 > Developer Documentation

Converting Modules from Apache 1.3 to Apache 2.0

-

Available Languages:  en 

-
-Index: docs/manual/developer/request.html.en -=================================================================== ---- docs/manual/developer/request.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/developer/request.html.en (.../branches/2.2.x) (wersja 358411) +

Available Languages:  en  | +  ja 

+diff -ur httpd-2.2.0/docs/manual/developer/modules.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/developer/modules.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/developer/modules.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/developer/modules.html.ja.euc-jp 2005-12-22 04:02:45.000000000 +0200 +@@ -16,7 +16,7 @@ +
+
<-
+

¥â¥¸¥å¡¼¥ë¤Î Apache 1.3 ¤«¤é Apache 2.0 ¤Ø¤Î°Ü¿¢

++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > Developer Documentation

¥â¥¸¥å¡¼¥ë¤Î Apache 1.3 ¤«¤é Apache 2.0 ¤Ø¤Î°Ü¿¢

+
+

Available Languages:  en  | +  ja 

+diff -ur httpd-2.2.0/docs/manual/developer/request.html.en httpd-2.2.0-branch/docs/manual/developer/request.html.en +--- httpd-2.2.0/docs/manual/developer/request.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/developer/request.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -16,7 +16,7 @@
<-
@@ -320,992 +805,559 @@ Index: docs/manual/developer/request.html.en

Available Languages:  en 

-Index: docs/manual/developer/index.html.en -=================================================================== ---- docs/manual/developer/index.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/developer/index.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/developer/thread_safety.html.en httpd-2.2.0-branch/docs/manual/developer/thread_safety.html.en +--- httpd-2.2.0/docs/manual/developer/thread_safety.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/developer/thread_safety.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -16,7 +16,7 @@
-
<-
+
<-

Developer Documentation for Apache 2.0

-+Apache > HTTP Server > Documentation > Version 2.2

Developer Documentation for Apache 2.0

+-Apache > HTTP Server > Documentation > Version 2.2 > Developer Documentation

Apache 2.0 Thread Safety Issues

++Apache > HTTP Server > Documentation > Version 2.2 > Developer Documentation

Apache 2.0 Thread Safety Issues

-

Available Languages:  en 

+

Available Languages:  en 

-Index: docs/manual/upgrading.xml.ko -=================================================================== ---- docs/manual/upgrading.xml.ko (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/upgrading.xml.ko (.../branches/2.2.x) (wersja 358411) -@@ -1,7 +1,7 @@ - - - -- -+ - - -+ - - -+Access Control - Apache HTTP Server -+ -+ -+ -+ -+
-+

Modules | Directives | FAQ | Glossary | Sitemap

-+

Apache HTTP Server Version 2.2

-+
-+
<-
-+

Access Control

-+
-+

Available Languages:  en 

-+
-+ -+

Access control refers to any means of controlling access to any -+ resource. This is separate from authentication and authorization.

-+
-+ -+
top
-+
-+

Related Modules and Directives

-+ -+

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.

-+ -+
top
-+
-+

Access control by host

-+

-+ 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.

-+
top
-+
-+

Access control by environment variable

-+ -+

-+ 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 -+

-+ -+

Warning:

-+

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 -+

-+ -+
top
-+
-+

Access control with mod_rewrite

-+ -+

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.

-+ -+
top
-+
-+

More information

-+

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 

-+
-+ -\ No newline at end of file - -Zmiany atrybutów dla: docs/manual/howto/access.html.en -___________________________________________________________________ -Nazwa: svn:eol-style - + native - -Index: docs/manual/howto/auth.html.en -=================================================================== ---- docs/manual/howto/auth.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/howto/auth.html.en (.../branches/2.2.x) (wersja 358411) +

°¡´ÉÇÑ ¾ð¾î:  en  | +  ja  | +diff -ur httpd-2.2.0/docs/manual/faq/background.html.en httpd-2.2.0-branch/docs/manual/faq/background.html.en +--- httpd-2.2.0/docs/manual/faq/background.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/faq/background.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -16,7 +16,7 @@

<-

Authentication, Authorization and Access Control

-+Apache > HTTP Server > Documentation > Version 2.2 > How-To / Tutorials

Authentication, Authorization and Access Control

+-Apache > HTTP Server > Documentation > Version 2.2 > FAQ

Background - Frequently Asked Questions

++Apache > HTTP Server > Documentation > Version 2.2 > FAQ

Background - Frequently Asked Questions

-

Available Languages:  en  | -  ja  | -@@ -35,8 +35,7 @@ -

  • Letting more than one - person in
    • -
  • Possible problems
    • --
  • What other neat stuff can I --do?
    • -+
  • Alternate password storage
    • -
  • More information
    • -
    -
    top
    -@@ -90,6 +89,9 @@ - of the request, but is not part of the authentication provider - system.

    - -+

    You probably also want to take a look at the Access Control howto, which discusses the -+ various ways to control access to your server.

    -+ -
    top
    -
    -

    Introduction

    -@@ -100,6 +102,11 @@ - -

    This article covers the "standard" way of protecting parts - of your web site that most of you are going to use.

    -+ -+

    Note:

    -+

    If your data really needs to be secure, consider using -+ mod_ssl in addition to any authentication.

    -+
    -
    top
    -
    -

    The Prerequisites

    -@@ -137,7 +144,12 @@ -

    Here's the basics of password protecting a directory on your - server.

    - --

    You'll need to create a password file. This file should be -+

    First, you need to create a password file. Exactly how you do -+ this will vary depending on what authentication provider you have -+ chosen. More on that later. To start with, we'll use a text password -+ file.

    -+ -+

    This file should be - placed somewhere not accessible from the web. This is so that - folks cannot download the password file. For example, if your - documents are served out of /usr/local/apache/htdocs you -@@ -146,7 +158,10 @@ - -

    To create the file, use the htpasswd utility that - came with Apache. This will be located in the bin directory -- of wherever you installed Apache. To create the file, type:

    -+ of wherever you installed Apache. If you have installed Apache from -+ a third-party package, it may be in your execution path.

    -+ -+

    To create the file, type:

    - -

    - htpasswd -c /usr/local/apache/passwd/passwords rbowen -@@ -164,8 +179,8 @@ - -

    If htpasswd is not in your path, of course - you'll have to type the full path to the file to get it to run. -- On my server, it's located at -- /usr/local/apache/bin/htpasswd

    -+ With a default installation, it's located at -+ /usr/local/apache2/bin/htpasswd

    - -

    Next, you'll need to configure the server to request a - password and tell the server which users are allowed access. -@@ -181,6 +196,8 @@ -

    - AuthType Basic
    - AuthName "Restricted Files"
    -+ # (Following line optional)
    -+ AuthBasicProvider file
    - AuthUserFile /usr/local/apache/passwd/passwords
    - Require user rbowen -

    -@@ -191,9 +208,10 @@ - implemented by mod_auth_basic. It is important to be aware, - however, that Basic authentication sends the password from the client to - the server unencrypted. This method should therefore not be used for -- highly sensitive data. Apache supports one other authentication method: -- AuthType Digest. This method is implemented by mod_auth_digest and is much more secure. Only the most recent -- versions of clients are known to support Digest authentication.

    -+ highly sensitive data, unless accompanied by mod_ssl. -+ Apache supports one other authentication method: -+ AuthType Digest. This method is implemented by mod_auth_digest and is much more secure. Most recent -+ browsers support Digest authentication.

    - -

    The AuthName directive sets - the Realm to be used in the authentication. The realm serves -@@ -212,6 +230,12 @@ - will always need to ask again for the password whenever the - hostname of the server changes.

    +

    Available Languages:  en 

    +
    +@@ -83,7 +83,7 @@ + available.

    + -+

    The AuthBasicProvider is, -+ in this case, optional, since file is the default value -+ for this directive. You'll need to use this directive if you are -+ choosing a different source for authentication, such as -+ mod_authn_dbm or mod_authn_dbd.

    -+ -

    The AuthUserFile - directive sets the path to the password file that we just - created with htpasswd. If you have a large number -@@ -269,6 +293,8 @@ -

    - AuthType Basic
    - AuthName "By Invitation Only"
    -+ # Optional line: -+ AuthBasicProvider file - AuthUserFile /usr/local/apache/passwd/passwords
    - AuthGroupFile /usr/local/apache/passwd/groups
    - Require group GroupName -@@ -317,71 +343,31 @@ - different authentication method at that time.

    -
    top
    -
    --

    What other neat stuff can I --do?

    --

    Authentication by username and password is only part of the -- story. Frequently you want to let people in based on something -- other than who they are. Something such as where they are -- coming from.

    -+

    Alternate password storage

    - --

    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.

    -+

    Because storing passwords in plain text files has the above -+ problems, you may wish to store your passwords somewhere else, such -+ as in a database.

    - --

    The usage of these directives is:

    -+

    mod_authn_dbm and mod_authn_dbd -+ are two modules which make this possible. Rather than selecting -+ AuthBasicSource file, -+ instead you can choose dbm or dbd as your -+ storage format.

    - --

    -- Allow from address --

    -+

    To select a dbd file rather than a text file, for example:

    - --

    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 -+ <Directory /www/docs/private>
    -+ AuthName "Private"
    -+ AuthType Basic
    -+ AuthBasicProvider dbm
    -+ AuthDBMUserFile /www/passwords/passwd.dbm
    -+ Require valid-user -

    - --

    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.

    -+

    Other options are available. Consult the -+ mod_authn_dbm documentation for more details.

    -
    top
    -
    -

    More information

    -@@ -390,6 +376,10 @@ - contain some more information about how this all works. - mod_authn_alias can also help in simplifying certain - authentication configurations.

    -+ -+

    And you may want to look at the Access -+ Control howto, which discusses a number of related topics.

    -+ -
    -
    -

    Available Languages:  en  | -Index: docs/manual/howto/cgi.html.en -=================================================================== ---- docs/manual/howto/cgi.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/howto/cgi.html.en (.../branches/2.2.x) (wersja 358411) +-

    ++

    + +

    You may NOT use any original artwork from the Apache + Software Foundation, nor make or use modified versions of such +@@ -98,7 +98,7 @@ + IF and ONLY IF such use can in no way be interpreted as + anything other than an attribution. Using the Apache name and + artwork in a manner that implies endorsement of a product or +- service is strictly forbidden. ++ service is strictly forbidden. + + +

    +diff -ur httpd-2.2.0/docs/manual/faq/error.html.en httpd-2.2.0-branch/docs/manual/faq/error.html.en +--- httpd-2.2.0/docs/manual/faq/error.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/faq/error.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -16,7 +16,7 @@
    <-

    Apache Tutorial: Dynamic Content with CGI

    -+Apache > HTTP Server > Documentation > Version 2.2 > How-To / Tutorials

    Apache Tutorial: Dynamic Content with CGI

    +-Apache > HTTP Server > Documentation > Version 2.2 > FAQ

    Error Messages - Frequently Asked Questions

    ++Apache > HTTP Server > Documentation > Version 2.2 > FAQ

    Error Messages - Frequently Asked Questions

    -

    Available Languages:  en  | -  ja  | -Index: docs/manual/howto/index.xml -=================================================================== ---- docs/manual/howto/index.xml (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/howto/index.xml (.../branches/2.2.x) (wersja 358411) -@@ -30,18 +30,30 @@ - How-To / Tutorials - -

    --
    Authentication
    -+
    Authentication and Authorization
    -
    -

    Authentication is any process by which you verify that - someone is who they claim they are. Authorization is any - process by which someone is allowed to be where they want to - go, or to have information that they want to have.

    - --

    See: Authentication, Authorization, and Access Control

    -+

    See: Authentication, Authorization

    -
    -
    - -
    -+
    Access Control
    -+
    -+

    Access control refers to the process of restricting, or -+ granting access to a resource based on arbitrary criteria. There -+ are a variety of different ways that this can be -+ accomplished.

    -+ -+

    See: Access Control

    -+
    -+
    -+ -+
    -
    Dynamic Content with CGI
    -
    -

    The CGI (Common Gateway Interface) defines a way for a web -Index: docs/manual/howto/ssi.html.ja.euc-jp -=================================================================== ---- docs/manual/howto/ssi.html.ja.euc-jp (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/howto/ssi.html.ja.euc-jp (.../branches/2.2.x) (wersja 358411) +

    Available Languages:  en  | +  ja  | +diff -ur httpd-2.2.0/docs/manual/faq/error.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/faq/error.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/faq/error.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/faq/error.html.ja.euc-jp 2005-12-22 04:02:46.000000000 +0200 @@ -16,7 +16,7 @@

    <-

    Apache ¥Á¥å¡¼¥È¥ê¥¢¥ë: Server Side Includes ÆþÌç

    +-Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > FAQ

    ¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸ ¡½ ¤è¤¯¤¢¤ë¼ÁÌä

    ++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > FAQ

    ¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸ ¡½ ¤è¤¯¤¢¤ë¼ÁÌä

    -

    Available Languages:  en  | -  ja  | -Index: docs/manual/howto/index.xml.ko -=================================================================== ---- docs/manual/howto/index.xml.ko (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/howto/index.xml.ko (.../branches/2.2.x) (wersja 358411) -@@ -1,7 +1,7 @@ - - - -- -+ - - -+ - - -+ -+ -+ -+ -+How-To / Tutorials -+ -+Access Control -+ -+

    -+

    Access control refers to any means of controlling access to any -+ resource. This is separate from authentication and authorization.

    -+     -+ -+ -+ -+
    Access control by host -+

    -+ 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.

    -+
    -+ -+
    Access control by environment variable -+ -+

    -+ 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 -+     -+ -+ Warning: -+

    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 -+

    -+ -+
    -+ -+
    Access control with mod_rewrite -+ -+

    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.

    -+ -+
    -+ -+
    More information -+

    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.

    -+
    -+ -+ -+ - -Zmiany atrybutów dla: docs/manual/howto/access.xml -___________________________________________________________________ -Nazwa: svn:eol-style - + native -Nazwa: svn:keywords - + LastChangedRevision - -Index: docs/manual/howto/auth.xml -=================================================================== ---- docs/manual/howto/auth.xml (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/howto/auth.xml (.../branches/2.2.x) (wersja 358411) -@@ -81,6 +81,10 @@ +

    Available Languages:  en  | +  ja  | +diff -ur httpd-2.2.0/docs/manual/faq/support.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/faq/support.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/faq/support.html.ko.euc-kr 2005-11-13 18:04:55.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/faq/support.html.ko.euc-kr 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    Áö¿ø - ÀÚÁÖ ¹°¾îº¸´Â Áú¹® (FAQ)

    ++Apache > HTTP Server > Documentation > Version 2.2 > FAQ

    Áö¿ø - ÀÚÁÖ ¹°¾îº¸´Â Áú¹® (FAQ)

    +
    +

    °¡´ÉÇÑ ¾ð¾î:  en  | +  ja  | +diff -ur httpd-2.2.0/docs/manual/filter.html.en httpd-2.2.0-branch/docs/manual/filter.html.en +--- httpd-2.2.0/docs/manual/filter.html.en 2005-11-18 21:51:49.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/filter.html.en 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    Filters

    +
    +

    Available Languages:  en  | +  es  | +diff -ur httpd-2.2.0/docs/manual/filter.html.es httpd-2.2.0-branch/docs/manual/filter.html.es +--- httpd-2.2.0/docs/manual/filter.html.es 2005-11-13 15:31:29.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/filter.html.es 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    Filtros

    +
    +

    Idiomas disponibles:  en  | +  es  | +diff -ur httpd-2.2.0/docs/manual/filter.html.fr httpd-2.2.0-branch/docs/manual/filter.html.fr +--- httpd-2.2.0/docs/manual/filter.html.fr 2005-11-13 15:31:29.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/filter.html.fr 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    Filtres

    +
    +

    Langues Disponibles:  en  | +  es  | +diff -ur httpd-2.2.0/docs/manual/filter.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/filter.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/filter.html.ja.euc-jp 2005-11-13 15:31:29.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/filter.html.ja.euc-jp 2005-12-22 04:02:45.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    ¥Õ¥£¥ë¥¿

    +
    +

    Available Languages:  en  | +  es  | +diff -ur httpd-2.2.0/docs/manual/filter.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/filter.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/filter.html.ko.euc-kr 2005-11-13 15:31:29.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/filter.html.ko.euc-kr 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    ÇÊÅÍ

    +
    +

    °¡´ÉÇÑ ¾ð¾î:  en  | +  es  | +diff -ur httpd-2.2.0/docs/manual/glossary.html.de httpd-2.2.0-branch/docs/manual/glossary.html.de +--- httpd-2.2.0/docs/manual/glossary.html.de 2005-11-13 18:04:55.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/glossary.html.de 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    Glossar

    +
    +

    Verfügbare Sprachen:  de  | +  en  | +diff -ur httpd-2.2.0/docs/manual/glossary.html.en httpd-2.2.0-branch/docs/manual/glossary.html.en +--- httpd-2.2.0/docs/manual/glossary.html.en 2005-11-13 18:04:55.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/glossary.html.en 2005-12-22 04:02:47.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    Glossary

    +
    +

    Available Languages:  de  | +  en  | +diff -ur httpd-2.2.0/docs/manual/glossary.html.es httpd-2.2.0-branch/docs/manual/glossary.html.es +--- httpd-2.2.0/docs/manual/glossary.html.es 2005-11-13 18:04:55.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/glossary.html.es 2005-12-22 04:02:47.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    Glosario

    +
    +

    Idiomas disponibles:  de  | +  en  | +diff -ur httpd-2.2.0/docs/manual/glossary.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/glossary.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/glossary.html.ko.euc-kr 2005-11-13 18:04:55.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/glossary.html.ko.euc-kr 2005-12-22 04:02:45.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    ¿ë¾î

    +
    +

    °¡´ÉÇÑ ¾ð¾î:  de  | +  en  | +diff -ur httpd-2.2.0/docs/manual/handler.html.en httpd-2.2.0-branch/docs/manual/handler.html.en +--- httpd-2.2.0/docs/manual/handler.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/handler.html.en 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    Apache's Handler Use

    ++Apache > HTTP Server > Documentation > Version 2.2

    Apache's Handler Use

    +
    +

    Available Languages:  en  | +  es  | +diff -ur httpd-2.2.0/docs/manual/handler.html.es httpd-2.2.0-branch/docs/manual/handler.html.es +--- httpd-2.2.0/docs/manual/handler.html.es 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/handler.html.es 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    Uso de los Handlers en Apache

    ++Apache > Servidor HTTP > Documentación > Versión 2.2

    Uso de los Handlers en Apache

    +
    +

    Idiomas disponibles:  en  | +  es  | +@@ -38,7 +38,7 @@ +

    +

    ¿Qué es un Handler?

    + +-
    Módulos RelacionadosDirectivas Relacionadas
    ++
    Módulos RelacionadosDirectivas Relacionadas
    + + +

    Un "handler" es una representación interna de Apache de +@@ -78,7 +78,7 @@ + CGI. (mod_cgi) + +

  • imap-file: Trata el fichero como un mapa de +- imágenes. (mod_imap)
    • ++ imágenes. (mod_imagemap) + +
  • server-info: Extrae la información de + configuración del +diff -ur httpd-2.2.0/docs/manual/handler.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/handler.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/handler.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/handler.html.ja.euc-jp 2005-12-22 04:02:47.000000000 +0200 +@@ -16,7 +16,7 @@ +
    • +
    <-
    +

    Apache ¤Î¥Ï¥ó¥É¥é¤Î»ÈÍÑ

    +
    +

    Available Languages:  en  | +  es  | +diff -ur httpd-2.2.0/docs/manual/handler.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/handler.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/handler.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/handler.html.ko.euc-kr 2005-12-22 04:02:46.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    ¾ÆÆÄÄ¡¿¡¼­ Çڵ鷯 »ç¿ë

    ++Apache > HTTP Server > Documentation > Version 2.2

    ¾ÆÆÄÄ¡¿¡¼­ Çڵ鷯 »ç¿ë

    +
    +

    °¡´ÉÇÑ ¾ð¾î:  en  | +  es  | +@@ -36,7 +36,7 @@ +

    +

    Çڵ鷯°¡ ¹«¾ùÀΰ¡

    + +-
    °ü·ÃµÈ ¸ðµâ°ü·ÃµÈ Áö½Ã¾î
    ++
    °ü·ÃµÈ ¸ðµâ°ü·ÃµÈ Áö½Ã¾î
    + + +

    ÆÄÀÏÀ» ¿äûÇÒ¶§ ¾ÆÆÄÄ¡°¡ ³»ºÎÀûÀ¸·Î ¼öÇàÇÒ ÀÛ¾÷À» +@@ -66,7 +66,7 @@ + (mod_cgi) + +

  • imap-file: imagemap ±ÔÄ¢ ÆÄÀÏ·Î +- ó¸®ÇÑ´Ù. (mod_imap)
    • ++ ó¸®ÇÑ´Ù. (mod_imagemap) + +
  • server-info: ¼­¹öÀÇ ¼³Á¤ Á¤º¸¸¦ + ¾Ë·ÁÁØ´Ù. (mod_info)
    • +Only in httpd-2.2.0-branch/docs/manual/howto: access.html +Only in httpd-2.2.0-branch/docs/manual/howto: access.html.en +Only in httpd-2.2.0-branch/docs/manual/howto: access.xml +Only in httpd-2.2.0-branch/docs/manual/howto: access.xml.meta +diff -ur httpd-2.2.0/docs/manual/howto/auth.html.en httpd-2.2.0-branch/docs/manual/howto/auth.html.en +--- httpd-2.2.0/docs/manual/howto/auth.html.en 2005-11-16 19:55:37.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/howto/auth.html.en 2005-12-22 04:02:45.000000000 +0200 +@@ -16,7 +16,7 @@ +
    +
    <-
    +

    Authentication, Authorization and Access Control

    ++Apache > HTTP Server > Documentation > Version 2.2 > How-To / Tutorials

    Authentication, Authorization and Access Control

    +
    +

    Available Languages:  en  | +  ja  | +@@ -35,8 +35,7 @@ +

  • Letting more than one + person in
    • +
  • Possible problems
    • +-
  • What other neat stuff can I +-do?
    • ++
  • Alternate password storage
    • +
  • More information
    • +
    +
    top
    +@@ -90,6 +89,9 @@ of the request, but is not part of the authentication provider system.

    -+

    You probably also want to take a look at the Access Control howto, which discusses the ++

    You probably also want to take a look at the Access Control howto, which discusses the + various ways to control access to your server.

    + - - -
    Introduction -@@ -91,6 +95,11 @@ +
    top
    +
    +

    Introduction

    +@@ -100,6 +102,11 @@

    This article covers the "standard" way of protecting parts of your web site that most of you are going to use.

    + -+ Note: ++

    Note:

    +

    If your data really needs to be secure, consider using -+ mod_ssl in addition to any authentication.

    -+ - - -
    The Prerequisites -@@ -128,7 +137,12 @@ ++ mod_ssl in addition to any authentication.

    ++
    +
    top
    +
    +

    The Prerequisites

    +@@ -137,7 +144,12 @@

    Here's the basics of password protecting a directory on your server.

    @@ -1319,9 +1371,9 @@ Index: docs/manual/howto/auth.xml placed somewhere not accessible from the web. This is so that folks cannot download the password file. For example, if your documents are served out of /usr/local/apache/htdocs you -@@ -137,7 +151,10 @@ +@@ -146,7 +158,10 @@ -

    To create the file, use the htpasswd utility that +

    To create the file, use the htpasswd utility that came with Apache. This will be located in the bin directory - of wherever you installed Apache. To create the file, type:

    + of wherever you installed Apache. If you have installed Apache from @@ -1329,11 +1381,11 @@ Index: docs/manual/howto/auth.xml + +

    To create the file, type:

    - +

    htpasswd -c /usr/local/apache/passwd/passwords rbowen -@@ -155,8 +172,8 @@ +@@ -164,8 +179,8 @@ -

    If htpasswd is not in your path, of course +

    If htpasswd is not in your path, of course you'll have to type the full path to the file to get it to run. - On my server, it's located at - /usr/local/apache/bin/htpasswd

    @@ -1342,46 +1394,44 @@ Index: docs/manual/howto/auth.xml

    Next, you'll need to configure the server to request a password and tell the server which users are allowed access. -@@ -172,6 +189,8 @@ - +@@ -181,6 +196,8 @@ +

    AuthType Basic
    AuthName "Restricted Files"
    + # (Following line optional)
    + AuthBasicProvider file
    AuthUserFile /usr/local/apache/passwd/passwords
    Require user rbowen - -@@ -183,10 +202,11 @@ - implemented by mod_auth_basic. It is important to be aware, +

    +@@ -191,9 +208,10 @@ + implemented by mod_auth_basic. It is important to be aware, however, that Basic authentication sends the password from the client to the server unencrypted. This method should therefore not be used for - highly sensitive data. Apache supports one other authentication method: -+ highly sensitive data, unless accompanied by mod_ssl. -+ Apache supports one other authentication method: - AuthType Digest. This method is implemented by mod_auth_digest and is much more secure. Only the most recent +- AuthType Digest. This method is implemented by mod_auth_digest and is much more secure. Only the most recent - versions of clients are known to support Digest authentication.

    -+ >mod_auth_digest and is much more secure. Most recent ++ highly sensitive data, unless accompanied by mod_ssl. ++ Apache supports one other authentication method: ++ AuthType Digest. This method is implemented by mod_auth_digest and is much more secure. Most recent + browsers support Digest authentication.

    -

    The AuthName directive sets +

    The AuthName directive sets the Realm to be used in the authentication. The realm serves -@@ -205,6 +225,13 @@ +@@ -212,6 +230,12 @@ will always need to ask again for the password whenever the hostname of the server changes.

    -+

    The AuthBasicProvider is, ++

    The AuthBasicProvider is, + in this case, optional, since file is the default value + for this directive. You'll need to use this directive if you are + choosing a different source for authentication, such as -+ mod_authn_dbm or mod_authn_dbd.

    ++ mod_authn_dbm or mod_authn_dbd.

    + -

    The AuthUserFile +

    The AuthUserFile directive sets the path to the password file that we just - created with htpasswd. If you have a large number -@@ -266,6 +293,8 @@ - + created with htpasswd. If you have a large number +@@ -269,6 +293,8 @@ +

    AuthType Basic
    AuthName "By Invitation Only"
    + # Optional line: @@ -1389,41 +1439,31 @@ Index: docs/manual/howto/auth.xml AuthUserFile /usr/local/apache/passwd/passwords
    AuthGroupFile /usr/local/apache/passwd/groups
    Require group GroupName -@@ -314,73 +343,31 @@ +@@ -317,71 +343,31 @@ different authentication method at that time.

    - - --
    What other neat stuff can I --do? +
    top
    +
    +-

    What other neat stuff can I +-do?

    -

    Authentication by username and password is only part of the - story. Frequently you want to let people in based on something - other than who they are. Something such as where they are - coming from.

    -+
    Alternate password storage - --

    The Allow and -- Deny directives let +- +-

    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 +- Order directive goes - hand-in-hand with these two, and tells Apache in which order to - apply the filters.

    -+

    Because storing passwords in plain text files has the above -+ problems, you may wish to store your passwords somewhere else, such -+ as in a database.

    - +- -

    The usage of these directives is:

    -+

    mod_authn_dbm and mod_authn_dbd -+ are two modules which make this possible. Rather than selecting -+ AuthBasicSource file, -+ instead you can choose dbm or dbd as your -+ storage format.

    - -- +- +-

    - Allow from address -- -+

    To select a dbd file rather than a text file, for example:

    - +-

    +- -

    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 @@ -1432,83 +1472,125 @@ Index: docs/manual/howto/auth.xml -

    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 -+ <Directory /www/docs/private>
    -+ AuthName "Private"
    -+ AuthType Basic
    -+ AuthBasicProvider dbm
    -+ AuthDBMUserFile /www/passwords/passwd.dbm
    -+ Require valid-user -     ++

    Alternate password storage

    +-

    +- 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.

    -- -- ++

    Because storing passwords in plain text files has the above ++ problems, you may wish to store your passwords somewhere else, such ++ as in a database.

    + +-

    - Deny from host.example.com -- -- +-

    ++

    mod_authn_dbm and mod_authn_dbd ++ are two modules which make this possible. Rather than selecting ++ AuthBasicSource file, ++ instead you can choose dbm or dbd as your ++ storage format.

    + -

    And, if you'd like to block access from an entire domain, - you can specify just part of an address or domain name:

    -- -- ++

    To select a dbd file rather than a text file, for example:

    + +

    - Deny from 192.101.205
    - Deny from cyberthugs.com moreidiots.com
    - Deny from ke -- -- --

    Using Order will let you ++ <Directory /www/docs/private>
    ++ AuthName "Private"
    ++ AuthType Basic
    ++ AuthBasicProvider dbm
    ++ AuthDBMUserFile /www/passwords/passwd.dbm
    ++ Require valid-user +

    + +-

    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:

    +- 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 +-

    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.

    +

    Other options are available. Consult the -+ mod_authn_dbm documentation for more details.

    -
    - -
    More information -@@ -389,6 +376,10 @@ ++ mod_authn_dbm documentation for more details.

    +
    top
    +
    +

    More information

    +@@ -390,6 +376,10 @@ contain some more information about how this all works. - mod_authn_alias can also help in simplifying certain + mod_authn_alias can also help in simplifying certain authentication configurations.

    + +

    And you may want to look at the Access + Control howto, which discusses a number of related topics.

    + - - - -Index: docs/manual/howto/htaccess.html.en -=================================================================== ---- docs/manual/howto/htaccess.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/howto/htaccess.html.en (.../branches/2.2.x) (wersja 358411) +
    +
    +

    Available Languages:  en  | +diff -ur httpd-2.2.0/docs/manual/howto/auth.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/howto/auth.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/howto/auth.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/howto/auth.html.ja.euc-jp 2005-12-22 04:02:45.000000000 +0200 @@ -16,7 +16,7 @@

    <-

    Apache Tutorial: .htaccess files

    -+Apache > HTTP Server > Documentation > Version 2.2 > How-To / Tutorials

    ǧ¾Ú¡¢¾µÇ§¡¢¥¢¥¯¥»¥¹À©¸æ

    -

    Available Languages:  en  | -  ja  | -Index: docs/manual/howto/cgi.html.ko.euc-kr -=================================================================== ---- docs/manual/howto/cgi.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/howto/cgi.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) +

    Available Languages:  en  | +  ja  | +diff -ur httpd-2.2.0/docs/manual/howto/auth.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/howto/auth.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/howto/auth.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/howto/auth.html.ko.euc-kr 2005-12-22 04:02:45.000000000 +0200 +@@ -17,7 +17,7 @@ +

    +
    <-
    +

    ÀÎÁõ(Authentication), ±ÇÇѺο©(Authorization), ++Apache > HTTP Server > Documentation > Version 2.2 > How-To / Tutorials

    ÀÎÁõ(Authentication), ±ÇÇѺο©(Authorization), + Á¢±ÙÁ¦¾î(Access Control)

    +
    +

    °¡´ÉÇÑ ¾ð¾î:  en  | +diff -ur httpd-2.2.0/docs/manual/howto/cgi.html.en httpd-2.2.0-branch/docs/manual/howto/cgi.html.en +--- httpd-2.2.0/docs/manual/howto/cgi.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/howto/cgi.html.en 2005-12-22 04:02:45.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    Apache Tutorial: Dynamic Content with CGI

    ++Apache > HTTP Server > Documentation > Version 2.2 > How-To / Tutorials

    Apache Tutorial: Dynamic Content with CGI

    +
    +

    Available Languages:  en  | +  ja  | +diff -ur httpd-2.2.0/docs/manual/howto/cgi.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/howto/cgi.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/howto/cgi.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/howto/cgi.html.ja.euc-jp 2005-12-22 04:02:45.000000000 +0200 +@@ -16,7 +16,7 @@ +

    +
    <-
    +

    Apache Tutorial: CGI ¤Ë¤è¤ëưŪ¥³¥ó¥Æ¥ó¥Ä

    +
    +

    Available Languages:  en  | +  ja  | +diff -ur httpd-2.2.0/docs/manual/howto/cgi.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/howto/cgi.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/howto/cgi.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/howto/cgi.html.ko.euc-kr 2005-12-22 04:02:45.000000000 +0200 @@ -16,7 +16,7 @@

    <-
    @@ -1518,69 +1600,57 @@ Index: docs/manual/howto/cgi.html.ko.euc-kr

    °¡´ÉÇÑ ¾ð¾î:  en  |  ja  | -Index: docs/manual/howto/ssi.html.en -=================================================================== ---- docs/manual/howto/ssi.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/howto/ssi.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/howto/htaccess.html.en httpd-2.2.0-branch/docs/manual/howto/htaccess.html.en +--- httpd-2.2.0/docs/manual/howto/htaccess.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/howto/htaccess.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -16,7 +16,7 @@

    <-

    Apache Tutorial: Introduction to Server Side Includes

    -+Apache > HTTP Server > Documentation > Version 2.2 > How-To / Tutorials

    Apache Tutorial: Introduction to Server Side Includes

    +-Apache > HTTP Server > Documentation > Version 2.2 > How-To / Tutorials

    Apache Tutorial: .htaccess files

    ++Apache > HTTP Server > Documentation > Version 2.2 > How-To / Tutorials

    Apache Tutorial: .htaccess files

    -

    Available Languages:  en  | -  ja  | -Index: docs/manual/howto/public_html.html.en -=================================================================== ---- docs/manual/howto/public_html.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/howto/public_html.html.en (.../branches/2.2.x) (wersja 358411) +

    Available Languages:  en  | +  ja  | +diff -ur httpd-2.2.0/docs/manual/howto/htaccess.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/howto/htaccess.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/howto/htaccess.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/howto/htaccess.html.ja.euc-jp 2005-12-22 04:02:45.000000000 +0200 @@ -16,7 +16,7 @@

    <-

    Apache ¥Á¥å¡¼¥È¥ê¥¢¥ë: .htaccess ¥Õ¥¡¥¤¥ë

    -

    Available Languages:  en  | -  ja  | -Index: docs/manual/howto/index.html.ko.euc-kr -=================================================================== ---- docs/manual/howto/index.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/howto/index.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) -@@ -16,12 +16,14 @@ +

    Available Languages:  en  | +  ja  | +diff -ur httpd-2.2.0/docs/manual/howto/htaccess.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/howto/htaccess.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/howto/htaccess.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/howto/htaccess.html.ko.euc-kr 2005-12-22 04:02:45.000000000 +0200 +@@ -16,7 +16,7 @@

    -
    <-
    +
    <-

    How-To / ÅõÅ丮¾ó

    -+Apache > HTTP Server > Documentation > Version 2.2

    How-To / ÅõÅ丮¾ó

    +-Apache > HTTP Server > Documentation > Version 2.2 > How-To / Tutorials

    ¾ÆÆÄÄ¡ ÅõÅ丮¾ó: .htaccess ÆÄÀÏ

    ++Apache > HTTP Server > Documentation > Version 2.2 > How-To / Tutorials

    ¾ÆÆÄÄ¡ ÅõÅ丮¾ó: .htaccess ÆÄÀÏ

    -

    °¡´ÉÇÑ ¾ð¾î:  en  | -  ja  | -  ko 

    -
    -+
    ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù. -+ ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.
    -
    -
    top
    -
    -Index: docs/manual/howto/auth.xml.ko -=================================================================== ---- docs/manual/howto/auth.xml.ko (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/howto/auth.xml.ko (.../branches/2.2.x) (wersja 358411) -@@ -1,7 +1,7 @@ - - - -- -+ - - -+ - - -+ - - -+ - - -+ - - -+ - - -+ - - -+ - - +-mod_imap - Apache HTTP Server ++mod_imagemap - Apache HTTP Server + + + +@@ -17,9 +17,9 @@
    <-
    -+Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +-Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    ++Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    -

    Apache Core Features

    +-

    ¾ÆÆÄÄ¡ ¸ðµâ mod_imap

    ++

    ¾ÆÆÄÄ¡ ¸ðµâ mod_imagemap

    -@@ -2399,7 +2399,7 @@ -

    This directive selects which authenticated users can access a - resource. The restrictions are processed by authorization - modules. Some of the allowed syntaxes provided by -- mod_authz_owner and -+ mod_authz_user and - mod_authz_groupfile are:

    +

    °¡´ÉÇÑ ¾ð¾î:  en  | +  ko 

    +@@ -28,8 +28,8 @@ + ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.
    + + +- +-
    ¼³¸í:¼­¹öÃø À̹ÌÁö¸Ê(imagemap) ó¸®
    »óÅÂ:Base
    ¸ðµâ¸í:imap_module
    ¼Ò½ºÆÄÀÏ:mod_imap.c
    ++¸ðµâ¸í:imagemap_module ++¼Ò½ºÆÄÀÏ:mod_imagemap.c +

    ¿ä¾à

    -
    -@@ -2441,7 +2441,37 @@ - place the Require statement into a - <Limit> - section.

    -+ -+

    If Require is used together with -+ the Allow or -+ Deny directives, -+ then the interaction of these restrictions is controlled by -+ the Satisfy directive.

    - -+

    Removing controls in subdirectories

    -+

    The following example shows how to use the Satisfy directive to disable access -+ controls in a subdirectory of a protected directory. This -+ technique should be used with caution, because it will also -+ disable any access controls imposed by -+ mod_authz_host.

    -+

    -+ <Directory /path/to/protected/>
    -+ -+ Require user david
    -+     -+ </Directory>
    -+ <Directory /path/to/protected/unprotected>
    -+ -+ # All access controls and authentication are disabled
    -+ # in this directory
    -+ Satisfy Any
    -+ Allow from all
    -+     -+ </Directory>
    -+

    -+
    -+ -+ -

    See also

    -
    <-
    -+Apache > HTTP-Server > Dokumentation > Version 2.2 > Module
    +-Apache > HTTP Server > Documentation > Version 2.2 > Modules
    ++Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache-MPM prefork

    +

    Apache Module mod_include

    -Index: docs/manual/mod/mod_cgid.html.en -=================================================================== ---- docs/manual/mod/mod_cgid.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_cgid.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_include.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_include.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_include.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_include.html.ja.euc-jp 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +-Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    ++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    -

    Apache Module mod_cgid

    +

    Apache ¥â¥¸¥å¡¼¥ë mod_include

    -Index: docs/manual/mod/event.html.en -=================================================================== ---- docs/manual/mod/event.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/event.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_info.html.en httpd-2.2.0-branch/docs/manual/mod/mod_info.html.en +--- httpd-2.2.0/docs/manual/mod/mod_info.html.en 2005-11-13 18:04:55.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_info.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4090,122 +4134,11 @@ Index: docs/manual/mod/event.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache MPM event

    +

    Apache Module mod_info

    -@@ -31,23 +31,23 @@ -

    Summary

    - -

    Warning

    --

    This MPM is experimental, so it may or may not work -- as expected.

    -+

    This MPM is experimental, so it may or may not work as -+ expected.

    -
    -- -+ -+

    The event Multi-Processing Module (MPM) is -+ designed to allow more requests to be served simultaneously by -+ passing off some processing work to supporting threads, freeing up -+ the main threads to work on new requests. It is based on the -+ worker MPM, which implements a hybrid -+ multi-process multi-threaded server. Run-time configuration -+ directives are identical to those provided by -+ worker.

    -+ -

    To use the event MPM, add - --with-mpm=event to the configure - script's arguments when building the httpd.

    -- --

    This MPM depends on APR's atomic -- compare-and-swap operations for thread synchronization. If you are -- compiling for an x86 target and you don't need to support 386s, or -- you are compiling for a SPARC and you don't need to run on -- pre-UltraSPARC chips, add -- --enable-nonportable-atomics=yes to the -- configure script's arguments. This will cause -- APR to implement atomic operations using efficient opcodes not -- available in older CPUs.

    -+ -
    -

    Directives

    - --
    -+

    Topics

    -+

    See also

    -+
    -+
    top
    -+
    -+

    How it Works

    -+

    This MPM tries to fix the 'keep alive problem' in HTTP. After a client -+ completes the first request, the client can keep the connection -+ open, and send further requests using the same socket. This can -+ save signifigant overhead in creating TCP connections. However, -+ Apache traditionally keeps an entire child process/thread waiting -+ for data from the client, which brings its own disadvantages. To -+ solve this problem, this MPM uses a dedicated thread to handle both -+ the Listening sockets, and all sockets that are in a Keep Alive -+ state.

    - -+

    The MPM assumes that the underlying apr_pollset -+ implementation is reasonably threadsafe. This enables the MPM to -+ avoid excessive high level locking, or having to wake up the listener -+ thread in order to send it a keep-alive socket. This is currently -+ only compatible with KQueue and EPoll.

    -+ -+
    top
    -+
    -+

    Requirements

    -+

    This MPM depends on APR's atomic -+ compare-and-swap operations for thread synchronization. If you are -+ compiling for an x86 target and you don't need to support 386s, or -+ you are compiling for a SPARC and you don't need to run on -+ pre-UltraSPARC chips, add -+ --enable-nonportable-atomics=yes to the -+ configure script's arguments. This will cause -+ APR to implement atomic operations using efficient opcodes not -+ available in older CPUs.

    -+ -+

    This MPM does not perform well on older platforms which lack good -+ threading, but the requirement for EPoll or KQueue makes this -+ moot.

    -+ -+
      -+ -+
    • To use this MPM on FreeBSD, FreeBSD 5.3 or higher is recommended. -+ However, it is possible to run this MPM on FreeBSD 5.2.1, if you -+ use libkse (see man libmap.conf).
      • -+ -+
    • For NetBSD, at least version 2.0 is recommended.
      • -+ -+
    • For Linux, a 2.6 kernel is recommended. It is also necessary to -+ ensure that your version of glibc has been compiled -+ with support for EPoll.
      • -+ -+
    -+
    top
    -+
    -+

    Issues

    -+

    At present, this MPM is incompatible with mod_ssl, and -+ other input filters.

    -
    -+
    -
    -

    Available Languages:  en 

    -
    <-
    @@ -4213,12 +4146,11 @@ Index: docs/manual/mod/mod_log_forensic.html.ja.euc-jp -Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    +Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    -

    Apache ¥â¥¸¥å¡¼¥ë mod_log_forensic

    +

    Apache ¥â¥¸¥å¡¼¥ë mod_info

    -Index: docs/manual/mod/mod_mem_cache.html.ko.euc-kr -=================================================================== ---- docs/manual/mod/mod_mem_cache.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_mem_cache.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_info.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/mod/mod_info.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/mod/mod_info.html.ko.euc-kr 2005-11-13 18:04:55.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_info.html.ko.euc-kr 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4226,25 +4158,35 @@ Index: docs/manual/mod/mod_mem_cache.html.ko.euc-kr -Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    +Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    -

    ¾ÆÆÄÄ¡ ¸ðµâ mod_mem_cache

    +

    ¾ÆÆÄÄ¡ ¸ðµâ mod_info

    -Index: docs/manual/mod/quickreference.html.ja.euc-jp -=================================================================== ---- docs/manual/mod/quickreference.html.ja.euc-jp (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/quickreference.html.ja.euc-jp (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_isapi.html.en httpd-2.2.0-branch/docs/manual/mod/mod_isapi.html.en +--- httpd-2.2.0/docs/manual/mod/mod_isapi.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_isapi.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    -

    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö ¥¯¥¤¥Ã¥¯¥ê¥Õ¥¡¥ì¥ó¥¹

    +-Apache > HTTP Server > Documentation > Version 2.2 > Modules
    ++Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +
    +

    Apache Module mod_isapi

    -

    Available Languages:  de  | -Index: docs/manual/mod/prefork.html.en -=================================================================== ---- docs/manual/mod/prefork.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/prefork.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_isapi.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/mod/mod_isapi.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/mod/mod_isapi.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_isapi.html.ko.euc-kr 2005-12-22 04:02:45.000000000 +0200 +@@ -17,7 +17,7 @@ +

    +
    <-
    + ++Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    +
    +

    ¾ÆÆÄÄ¡ ¸ðµâ mod_isapi

    +
    +diff -ur httpd-2.2.0/docs/manual/mod/mod_ldap.html.en httpd-2.2.0-branch/docs/manual/mod/mod_ldap.html.en +--- httpd-2.2.0/docs/manual/mod/mod_ldap.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_ldap.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4252,12 +4194,11 @@ Index: docs/manual/mod/prefork.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache MPM prefork

    +

    Apache Module mod_ldap

    -Index: docs/manual/mod/mod_negotiation.html.en -=================================================================== ---- docs/manual/mod/mod_negotiation.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_negotiation.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_log_config.html.en httpd-2.2.0-branch/docs/manual/mod/mod_log_config.html.en +--- httpd-2.2.0/docs/manual/mod/mod_log_config.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_log_config.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4265,25 +4206,23 @@ Index: docs/manual/mod/mod_negotiation.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache Module mod_negotiation

    +

    Apache Module mod_log_config

    -Index: docs/manual/mod/quickreference.html.de -=================================================================== ---- docs/manual/mod/quickreference.html.de (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/quickreference.html.de (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_log_config.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_log_config.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_log_config.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_log_config.html.ja.euc-jp 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP-Server > Dokumentation > Version 2.2 > Module
    - ++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    +
    +

    Apache ¥â¥¸¥å¡¼¥ë mod_log_config

    -

    Verfügbare Sprachen:  de  | -Index: docs/manual/mod/mod_authz_host.html.ko.euc-kr -=================================================================== ---- docs/manual/mod/mod_authz_host.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_authz_host.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_log_config.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/mod/mod_log_config.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/mod/mod_log_config.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_log_config.html.ko.euc-kr 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@

    <-
    @@ -4291,38 +4230,35 @@ Index: docs/manual/mod/mod_authz_host.html.ko.euc-kr -Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    +Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    -

    ¾ÆÆÄÄ¡ ¸ðµâ mod_authz_host

    +

    ¾ÆÆÄÄ¡ ¸ðµâ mod_log_config

    -Index: docs/manual/mod/mod_cache.html.ko.euc-kr -=================================================================== ---- docs/manual/mod/mod_cache.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_cache.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_log_forensic.html.en httpd-2.2.0-branch/docs/manual/mod/mod_log_forensic.html.en +--- httpd-2.2.0/docs/manual/mod/mod_log_forensic.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_log_forensic.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    +-Apache > HTTP Server > Documentation > Version 2.2 > Modules
    ++Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    ¾ÆÆÄÄ¡ ¸ðµâ mod_cache

    +

    Apache Module mod_log_forensic

    -Index: docs/manual/mod/directive-dict.html.en -=================================================================== ---- docs/manual/mod/directive-dict.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/directive-dict.html.en (.../branches/2.2.x) (wersja 358411) -@@ -16,7 +16,7 @@ +diff -ur httpd-2.2.0/docs/manual/mod/mod_log_forensic.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_log_forensic.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_log_forensic.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_log_forensic.html.ja.euc-jp 2005-12-22 04:02:46.000000000 +0200 +@@ -17,7 +17,7 @@
    <-

    Terms Used to Describe Directives

    -+Apache > HTTP Server > Documentation > Version 2.2
    ++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    +
    +

    Apache ¥â¥¸¥å¡¼¥ë mod_log_forensic

    -

    Available Languages:  en  | -  ja  | -Index: docs/manual/mod/mod_authz_owner.html.en -=================================================================== ---- docs/manual/mod/mod_authz_owner.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_authz_owner.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_logio.html.en httpd-2.2.0-branch/docs/manual/mod/mod_logio.html.en +--- httpd-2.2.0/docs/manual/mod/mod_logio.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_logio.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@

    <-
    @@ -4330,58 +4266,23 @@ Index: docs/manual/mod/mod_authz_owner.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache Module mod_authz_owner

    +

    Apache Module mod_logio

    -Index: docs/manual/mod/mod_authn_dbd.xml -=================================================================== ---- docs/manual/mod/mod_authn_dbd.xml (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_authn_dbd.xml (.../branches/2.2.x) (wersja 358411) -@@ -101,7 +101,6 @@ - AuthDBDUserPWQuery query - directory - --AuthConfig - - -

    The AuthDBDUserPWQuery specifies an -@@ -123,17 +122,16 @@ - AuthDBDUserRealmQuery query - directory - --AuthConfig - - --

    The AuthDBDUserRealmPWQuery specifies an -+

    The AuthDBDUserRealmQuery specifies an - SQL query to look up a password for a specified user and realm. - The query must take two string (typically SQL varchar) arguments - (username and realm), and return a single value (encrypted password). -

    - -- AuthDBDUserRealmPWQuery "SELECT password FROM authn -- WHERE username = %s AND realm = %s" -+ AuthDBDUserRealmQuery "SELECT password FROM authn -+ WHERE username = %s AND realm = %s" - - -     -Index: docs/manual/mod/mod_actions.html.de -=================================================================== ---- docs/manual/mod/mod_actions.html.de (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_actions.html.de (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_logio.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_logio.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_logio.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_logio.html.ja.euc-jp 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP-Server > Dokumentation > Version 2.2 > Module
    +-Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    ++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    -

    Apache-Modul mod_actions

    +

    Apache ¥â¥¸¥å¡¼¥ë mod_logio

    -Index: docs/manual/mod/mod_cern_meta.html.ko.euc-kr -=================================================================== ---- docs/manual/mod/mod_cern_meta.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_cern_meta.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_logio.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/mod/mod_logio.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/mod/mod_logio.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_logio.html.ko.euc-kr 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4389,38 +4290,47 @@ Index: docs/manual/mod/mod_cern_meta.html.ko.euc-kr -Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    +Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    -

    ¾ÆÆÄÄ¡ ¸ðµâ mod_cern_meta

    +

    ¾ÆÆÄÄ¡ ¸ðµâ mod_logio

    -Index: docs/manual/mod/quickreference.html.en -=================================================================== ---- docs/manual/mod/quickreference.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/quickreference.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_mem_cache.html.en httpd-2.2.0-branch/docs/manual/mod/mod_mem_cache.html.en +--- httpd-2.2.0/docs/manual/mod/mod_mem_cache.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_mem_cache.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Directive Quick Reference

    +
    +

    Apache Module mod_mem_cache

    -

    Available Languages:  de  | -Index: docs/manual/mod/quickreference.html.es -=================================================================== ---- docs/manual/mod/quickreference.html.es (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/quickreference.html.es (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_mem_cache.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_mem_cache.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_mem_cache.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_mem_cache.html.ja.euc-jp 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@

    <-
    -+Apache > Servidor HTTP > Documentación > Versión 2.2 > Módulos
    - ++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    +
    +

    Apache ¥â¥¸¥å¡¼¥ë mod_mem_cache

    -

    Idiomas disponibles:  de  | -Index: docs/manual/mod/mod_dav_fs.html.en -=================================================================== ---- docs/manual/mod/mod_dav_fs.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_dav_fs.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_mem_cache.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/mod/mod_mem_cache.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/mod/mod_mem_cache.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_mem_cache.html.ko.euc-kr 2005-12-22 04:02:46.000000000 +0200 +@@ -17,7 +17,7 @@ +

    +
    <-
    + ++Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    +
    +

    ¾ÆÆÄÄ¡ ¸ðµâ mod_mem_cache

    +
    +diff -ur httpd-2.2.0/docs/manual/mod/mod_mime.html.en httpd-2.2.0-branch/docs/manual/mod/mod_mime.html.en +--- httpd-2.2.0/docs/manual/mod/mod_mime.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_mime.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4428,25 +4338,11 @@ Index: docs/manual/mod/mod_dav_fs.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache Module mod_dav_fs

    +

    Apache Module mod_mime

    -Index: docs/manual/mod/worker.xml.meta -=================================================================== ---- docs/manual/mod/worker.xml.meta (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/worker.xml.meta (.../branches/2.2.x) (wersja 358411) -@@ -6,7 +6,7 @@ - .. - - -- de -+ de - en - ja - -Index: docs/manual/mod/mod_unique_id.html.ja.euc-jp -=================================================================== ---- docs/manual/mod/mod_unique_id.html.ja.euc-jp (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_unique_id.html.ja.euc-jp (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_mime.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_mime.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_mime.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_mime.html.ja.euc-jp 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4454,25 +4350,23 @@ Index: docs/manual/mod/mod_unique_id.html.ja.euc-jp -Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    +Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    -

    Apache ¥â¥¸¥å¡¼¥ë mod_unique_id

    +

    Apache ¥â¥¸¥å¡¼¥ë mod_mime

    -Index: docs/manual/mod/mod_auth_basic.html.ko.euc-kr -=================================================================== ---- docs/manual/mod/mod_auth_basic.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_auth_basic.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_mime_magic.html.en httpd-2.2.0-branch/docs/manual/mod/mod_mime_magic.html.en +--- httpd-2.2.0/docs/manual/mod/mod_mime_magic.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_mime_magic.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    +-Apache > HTTP Server > Documentation > Version 2.2 > Modules
    ++Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    ¾ÆÆÄÄ¡ ¸ðµâ mod_auth_basic

    +

    Apache Module mod_mime_magic

    -Index: docs/manual/mod/mod_auth_digest.html.en -=================================================================== ---- docs/manual/mod/mod_auth_digest.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_auth_digest.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_negotiation.html.en httpd-2.2.0-branch/docs/manual/mod/mod_negotiation.html.en +--- httpd-2.2.0/docs/manual/mod/mod_negotiation.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_negotiation.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4480,31 +4374,23 @@ Index: docs/manual/mod/mod_auth_digest.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache Module mod_auth_digest

    +

    Apache Module mod_negotiation

    -@@ -56,6 +56,7 @@ -
  • AuthType
    • -
  • Require
    • -
  • Satisfy
    • -+
  • Authentication howto
    • -
    -
    top
    -
    -@@ -253,8 +254,8 @@ - by the mod_authn_file module. Make sure - that the chosen provider module is present in the server.

    - --

    See mod_authn_dbm and mod_authn_file -- for providers.

    -+

    See mod_authn_dbm, mod_authn_file, -+ and mod_authn_dbd for providers.

    - -
    -
    top
    -Index: docs/manual/mod/mod_actions.html.en -=================================================================== ---- docs/manual/mod/mod_actions.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_actions.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_negotiation.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_negotiation.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_negotiation.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_negotiation.html.ja.euc-jp 2005-12-22 04:02:45.000000000 +0200 +@@ -17,7 +17,7 @@ +
    +
    <-
    + ++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    +
    +

    Apache ¥â¥¸¥å¡¼¥ë mod_negotiation

    +
    +diff -ur httpd-2.2.0/docs/manual/mod/mod_nw_ssl.html.en httpd-2.2.0-branch/docs/manual/mod/mod_nw_ssl.html.en +--- httpd-2.2.0/docs/manual/mod/mod_nw_ssl.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_nw_ssl.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4512,12 +4398,11 @@ Index: docs/manual/mod/mod_actions.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache Module mod_actions

    +

    Apache Module mod_nw_ssl

    -Index: docs/manual/mod/mod_headers.html.en -=================================================================== ---- docs/manual/mod/mod_headers.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_headers.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_proxy.html.en httpd-2.2.0-branch/docs/manual/mod/mod_proxy.html.en +--- httpd-2.2.0/docs/manual/mod/mod_proxy.html.en 2005-11-16 17:57:54.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_proxy.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4525,38 +4410,35 @@ Index: docs/manual/mod/mod_headers.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache Module mod_headers

    +

    Apache Module mod_proxy

    -Index: docs/manual/mod/mod_so.html.ko.euc-kr -=================================================================== ---- docs/manual/mod/mod_so.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_so.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_proxy.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_proxy.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_proxy.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_proxy.html.ja.euc-jp 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    +-Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    ++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    -

    ¾ÆÆÄÄ¡ ¸ðµâ mod_so

    +

    Apache ¥â¥¸¥å¡¼¥ë mod_proxy

    -Index: docs/manual/mod/beos.html.de -=================================================================== ---- docs/manual/mod/beos.html.de (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/beos.html.de (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_proxy_ajp.html.en httpd-2.2.0-branch/docs/manual/mod/mod_proxy_ajp.html.en +--- httpd-2.2.0/docs/manual/mod/mod_proxy_ajp.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_proxy_ajp.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP-Server > Dokumentation > Version 2.2 > Module
    +-Apache > HTTP Server > Documentation > Version 2.2 > Modules
    ++Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache-MPM beos

    +

    Apache Module mod_proxy_ajp

    -Index: docs/manual/mod/mod_cgid.html.ja.euc-jp -=================================================================== ---- docs/manual/mod/mod_cgid.html.ja.euc-jp (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_cgid.html.ja.euc-jp (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_proxy_ajp.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_proxy_ajp.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_proxy_ajp.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_proxy_ajp.html.ja.euc-jp 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4564,155 +4446,59 @@ Index: docs/manual/mod/mod_cgid.html.ja.euc-jp -Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    +Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    -

    Apache ¥â¥¸¥å¡¼¥ë mod_cgid

    +

    Apache ¥â¥¸¥å¡¼¥ë mod_proxy_ajp

    -Index: docs/manual/mod/mod_authz_groupfile.html.ko.euc-kr -=================================================================== ---- docs/manual/mod/mod_authz_groupfile.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_authz_groupfile.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_proxy_balancer.html.en httpd-2.2.0-branch/docs/manual/mod/mod_proxy_balancer.html.en +--- httpd-2.2.0/docs/manual/mod/mod_proxy_balancer.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_proxy_balancer.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    +-Apache > HTTP Server > Documentation > Version 2.2 > Modules
    ++Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    ¾ÆÆÄÄ¡ ¸ðµâ mod_authz_groupfile

    +

    Apache Module mod_proxy_balancer

    -Index: docs/manual/mod/mod_usertrack.html.en -=================================================================== ---- docs/manual/mod/mod_usertrack.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_usertrack.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +-Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    ++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    -

    Apache Module mod_usertrack

    +

    Apache ¥â¥¸¥å¡¼¥ë mod_proxy_balancer

    -Index: docs/manual/mod/mod_echo.html.ko.euc-kr -=================================================================== ---- docs/manual/mod/mod_echo.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_echo.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_proxy_connect.html.en httpd-2.2.0-branch/docs/manual/mod/mod_proxy_connect.html.en +--- httpd-2.2.0/docs/manual/mod/mod_proxy_connect.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_proxy_connect.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    +-Apache > HTTP Server > Documentation > Version 2.2 > Modules
    ++Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    ¾ÆÆÄÄ¡ ¸ðµâ mod_echo

    +

    Apache Module mod_proxy_connect

    -Index: docs/manual/mod/event.xml -=================================================================== ---- docs/manual/mod/event.xml (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/event.xml (.../branches/2.2.x) (wersja 358411) -@@ -30,14 +30,46 @@ - - - Warning --

    This MPM is experimental, so it may or may not work -- as expected.

    -+

    This MPM is experimental, so it may or may not work as -+ expected.

    -     -- -+ -+

    The event Multi-Processing Module (MPM) is -+ designed to allow more requests to be served simultaneously by -+ passing off some processing work to supporting threads, freeing up -+ the main threads to work on new requests. It is based on the -+ worker MPM, which implements a hybrid -+ multi-process multi-threaded server. Run-time configuration -+ directives are identical to those provided by -+ worker.

    -+ -

    To use the event MPM, add - --with-mpm=event to the configure - script's arguments when building the httpd.

    -- -+ -+     -+ -+The worker MPM -+ -+
    How it Works -+

    This MPM tries to fix the 'keep alive problem' in HTTP. After a client -+ completes the first request, the client can keep the connection -+ open, and send further requests using the same socket. This can -+ save signifigant overhead in creating TCP connections. However, -+ Apache traditionally keeps an entire child process/thread waiting -+ for data from the client, which brings its own disadvantages. To -+ solve this problem, this MPM uses a dedicated thread to handle both -+ the Listening sockets, and all sockets that are in a Keep Alive -+ state.

    -+ -+

    The MPM assumes that the underlying apr_pollset -+ implementation is reasonably threadsafe. This enables the MPM to -+ avoid excessive high level locking, or having to wake up the listener -+ thread in order to send it a keep-alive socket. This is currently -+ only compatible with KQueue and EPoll.

    -+ -+
    -+
    Requirements -

    This MPM depends on APR's atomic - compare-and-swap operations for thread synchronization. If you are - compiling for an x86 target and you don't need to support 386s, or -@@ -46,9 +78,33 @@ - --enable-nonportable-atomics=yes to the - configure script's arguments. This will cause - APR to implement atomic operations using efficient opcodes not -- available in older CPUs.

    -- -+ available in older CPUs.

    - -+

    This MPM does not perform well on older platforms which lack good -+ threading, but the requirement for EPoll or KQueue makes this -+ moot.

    -+ -+
      -+ -+
    • To use this MPM on FreeBSD, FreeBSD 5.3 or higher is recommended. -+ However, it is possible to run this MPM on FreeBSD 5.2.1, if you -+ use libkse (see man libmap.conf).
      • -+ -+
    • For NetBSD, at least version 2.0 is recommended.
      • -+ -+
    • For Linux, a 2.6 kernel is recommended. It is also necessary to -+ ensure that your version of glibc has been compiled -+ with support for EPoll.
      • -+ -+
    -+
    -+ -+
    Issues -+

    At present, this MPM is incompatible with mod_ssl, and -+ other input filters.

    -+
    -+ -+ - AcceptMutex - - CoreDumpDirectory -Index: docs/manual/mod/mod_disk_cache.html.ja.euc-jp -=================================================================== ---- docs/manual/mod/mod_disk_cache.html.ja.euc-jp (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_disk_cache.html.ja.euc-jp (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_proxy_ftp.html.en httpd-2.2.0-branch/docs/manual/mod/mod_proxy_ftp.html.en +--- httpd-2.2.0/docs/manual/mod/mod_proxy_ftp.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_proxy_ftp.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    +-Apache > HTTP Server > Documentation > Version 2.2 > Modules
    ++Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache ¥â¥¸¥å¡¼¥ë mod_disk_cache

    +

    Apache Module mod_proxy_ftp

    -Index: docs/manual/mod/beos.html.en -=================================================================== ---- docs/manual/mod/beos.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/beos.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_proxy_http.html.en httpd-2.2.0-branch/docs/manual/mod/mod_proxy_http.html.en +--- httpd-2.2.0/docs/manual/mod/mod_proxy_http.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_proxy_http.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4720,12 +4506,11 @@ Index: docs/manual/mod/beos.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache MPM beos

    +

    Apache Module mod_proxy_http

    -Index: docs/manual/mod/mod_info.html.en -=================================================================== ---- docs/manual/mod/mod_info.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_info.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_rewrite.html.en httpd-2.2.0-branch/docs/manual/mod/mod_rewrite.html.en +--- httpd-2.2.0/docs/manual/mod/mod_rewrite.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_rewrite.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4733,25 +4518,23 @@ Index: docs/manual/mod/mod_info.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache Module mod_info

    +

    Apache Module mod_rewrite

    -Index: docs/manual/mod/beos.html.es -=================================================================== ---- docs/manual/mod/beos.html.es (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/beos.html.es (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_setenvif.html.en httpd-2.2.0-branch/docs/manual/mod/mod_setenvif.html.en +--- httpd-2.2.0/docs/manual/mod/mod_setenvif.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_setenvif.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > Servidor HTTP > Documentación > Versión 2.2 > Módulos
    +-Apache > HTTP Server > Documentation > Version 2.2 > Modules
    ++Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    MPM de Apache beos

    +

    Apache Module mod_setenvif

    -Index: docs/manual/mod/mod_authz_user.html.ja.euc-jp -=================================================================== ---- docs/manual/mod/mod_authz_user.html.ja.euc-jp (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_authz_user.html.ja.euc-jp (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_setenvif.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_setenvif.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_setenvif.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_setenvif.html.ja.euc-jp 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4759,12 +4542,23 @@ Index: docs/manual/mod/mod_authz_user.html.ja.euc-jp -Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    +Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    -

    Apache ¥â¥¸¥å¡¼¥ë mod_authz_user

    +

    Apache ¥â¥¸¥å¡¼¥ë mod_setenvif

    +
    +diff -ur httpd-2.2.0/docs/manual/mod/mod_setenvif.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/mod/mod_setenvif.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/mod/mod_setenvif.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_setenvif.html.ko.euc-kr 2005-12-22 04:02:45.000000000 +0200 +@@ -17,7 +17,7 @@ +
    +
    <-
    + ++Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    +
    +

    ¾ÆÆÄÄ¡ ¸ðµâ mod_setenvif

    -Index: docs/manual/mod/mod_proxy_http.html.en -=================================================================== ---- docs/manual/mod/mod_proxy_http.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_proxy_http.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_so.html.en httpd-2.2.0-branch/docs/manual/mod/mod_so.html.en +--- httpd-2.2.0/docs/manual/mod/mod_so.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_so.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4772,12 +4566,35 @@ Index: docs/manual/mod/mod_proxy_http.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache Module mod_proxy_http

    +

    Apache Module mod_so

    +
    +diff -ur httpd-2.2.0/docs/manual/mod/mod_so.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_so.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_so.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_so.html.ja.euc-jp 2005-12-22 04:02:45.000000000 +0200 +@@ -17,7 +17,7 @@ +
    +
    <-
    + ++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    +
    +

    Apache ¥â¥¸¥å¡¼¥ë mod_so

    +
    +diff -ur httpd-2.2.0/docs/manual/mod/mod_so.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/mod/mod_so.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/mod/mod_so.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_so.html.ko.euc-kr 2005-12-22 04:02:46.000000000 +0200 +@@ -17,7 +17,7 @@ +
    +
    <-
    + ++Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    +
    +

    ¾ÆÆÄÄ¡ ¸ðµâ mod_so

    -Index: docs/manual/mod/mod_env.html.en -=================================================================== ---- docs/manual/mod/mod_env.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_env.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_speling.html.en httpd-2.2.0-branch/docs/manual/mod/mod_speling.html.en +--- httpd-2.2.0/docs/manual/mod/mod_speling.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_speling.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4785,25 +4602,23 @@ Index: docs/manual/mod/mod_env.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache Module mod_env

    +

    Apache Module mod_speling

    -Index: docs/manual/mod/mpm_common.html.de -=================================================================== ---- docs/manual/mod/mpm_common.html.de (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mpm_common.html.de (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_speling.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_speling.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_speling.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_speling.html.ja.euc-jp 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP-Server > Dokumentation > Version 2.2 > Module
    +-Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    ++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    -

    Allgemeine Direktiven der Apache-MPMs

    +

    Apache ¥â¥¸¥å¡¼¥ë mod_speling

    -Index: docs/manual/mod/mod_speling.html.ko.euc-kr -=================================================================== ---- docs/manual/mod/mod_speling.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_speling.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_speling.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/mod/mod_speling.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/mod/mod_speling.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_speling.html.ko.euc-kr 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4813,10 +4628,9 @@ Index: docs/manual/mod/mod_speling.html.ko.euc-kr

    ¾ÆÆÄÄ¡ ¸ðµâ mod_speling

    -Index: docs/manual/mod/mod_cache.html.en -=================================================================== ---- docs/manual/mod/mod_cache.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_cache.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_ssl.html.en httpd-2.2.0-branch/docs/manual/mod/mod_ssl.html.en +--- httpd-2.2.0/docs/manual/mod/mod_ssl.html.en 2005-11-16 17:57:54.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_ssl.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4824,12 +4638,11 @@ Index: docs/manual/mod/mod_cache.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache Module mod_cache

    +

    Apache Module mod_ssl

    -Index: docs/manual/mod/mod_log_config.html.en -=================================================================== ---- docs/manual/mod/mod_log_config.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_log_config.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_status.html.en httpd-2.2.0-branch/docs/manual/mod/mod_status.html.en +--- httpd-2.2.0/docs/manual/mod/mod_status.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_status.html.en 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4837,38 +4650,35 @@ Index: docs/manual/mod/mod_log_config.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache Module mod_log_config

    +

    Apache Module mod_status

    -Index: docs/manual/mod/mod_proxy_balancer.html.en -=================================================================== ---- docs/manual/mod/mod_proxy_balancer.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_proxy_balancer.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_status.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_status.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_status.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_status.html.ja.euc-jp 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +-Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    ++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    -

    Apache Module mod_proxy_balancer

    +

    Apache ¥â¥¸¥å¡¼¥ë mod_status

    -Index: docs/manual/mod/mod_log_forensic.html.en -=================================================================== ---- docs/manual/mod/mod_log_forensic.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_log_forensic.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_status.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/mod/mod_status.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/mod/mod_status.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_status.html.ko.euc-kr 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +-Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    ++Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    -

    Apache Module mod_log_forensic

    +

    ¾ÆÆÄÄ¡ ¸ðµâ mod_status

    -Index: docs/manual/mod/mod_authnz_ldap.html.en -=================================================================== ---- docs/manual/mod/mod_authnz_ldap.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_authnz_ldap.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_suexec.html.en httpd-2.2.0-branch/docs/manual/mod/mod_suexec.html.en +--- httpd-2.2.0/docs/manual/mod/mod_suexec.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_suexec.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4876,88 +4686,35 @@ Index: docs/manual/mod/mod_authnz_ldap.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache Module mod_authnz_ldap

    +

    Apache Module mod_suexec

    -Index: docs/manual/mod/mod_dav.html.en -=================================================================== ---- docs/manual/mod/mod_dav.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_dav.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_suexec.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_suexec.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_suexec.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_suexec.html.ja.euc-jp 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    -+Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +-Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    ++Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    -

    Apache Module mod_dav

    +

    Apache ¥â¥¸¥å¡¼¥ë mod_suexec

    -Index: docs/manual/mod/mod_imagemap.html.ko.euc-kr -=================================================================== ---- docs/manual/mod/mod_imagemap.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_imagemap.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) -@@ -5,7 +5,7 @@ - This file is generated from xml source: DO NOT EDIT - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - --> --mod_imap - Apache HTTP Server -+mod_imagemap - Apache HTTP Server - - - -@@ -17,9 +17,9 @@ +diff -ur httpd-2.2.0/docs/manual/mod/mod_suexec.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/mod/mod_suexec.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/mod/mod_suexec.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_suexec.html.ko.euc-kr 2005-12-22 04:02:45.000000000 +0200 +@@ -17,7 +17,7 @@
    <-
    +Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    --

    ¾ÆÆÄÄ¡ ¸ðµâ mod_imap

    -+

    ¾ÆÆÄÄ¡ ¸ðµâ mod_imagemap

    +

    ¾ÆÆÄÄ¡ ¸ðµâ mod_suexec

    -

    °¡´ÉÇÑ ¾ð¾î:  en  | -  ko 

    -@@ -28,8 +28,8 @@ - ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.
    - - -- --
    ¼³¸í:¼­¹öÃø À̹ÌÁö¸Ê(imagemap) ó¸®
    »óÅÂ:Base
    ¸ðµâ¸í:imap_module
    ¼Ò½ºÆÄÀÏ:mod_imap.c
    -+¸ðµâ¸í:imagemap_module -+¼Ò½ºÆÄÀÏ:mod_imagemap.c -

    ¿ä¾à

    - -

    ÀÌ ¸ðµâÀº imagemap CGI ÇÁ·Î±×·¥À» ´ë½ÅÇÏ¿© -@@ -280,7 +280,7 @@ - »ç¿ëÀå¼Ò:ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®, directory, .htaccess - Override ¿É¼Ç:Indexes - »óÅÂ:Base --¸ðµâ:mod_imap -+¸ðµâ:mod_imagemap - -

    ImapBase Áö½Ã¾î´Â À̹ÌÁö¸Ê ÆÄÀÏ¿¡¼­ - »ç¿ëÇÒ base ±âº»°ªÀ» ¼³Á¤ÇÑ´Ù. À̹ÌÁö¸Ê ÆÄÀÏ -@@ -303,7 +303,7 @@ - »ç¿ëÀå¼Ò:ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®, directory, .htaccess - Override ¿É¼Ç:Indexes - »óÅÂ:Base --¸ðµâ:mod_imap -+¸ðµâ:mod_imagemap - -

    ImapDefault Áö½Ã¾î´Â À̹ÌÁö¸Ê - ÆÄÀÏ¿¡¼­ »ç¿ëÇÒ default ±âº»°ªÀ» ¼³Á¤ÇÑ´Ù. -@@ -322,7 +322,7 @@ - »ç¿ëÀå¼Ò:ÁÖ¼­¹ö¼³Á¤, °¡»óÈ£½ºÆ®, directory, .htaccess - Override ¿É¼Ç:Indexes - »óÅÂ:Base --¸ðµâ:mod_imap -+¸ðµâ:mod_imagemap - -

    ImapMenu Áö½Ã¾î´Â À̹ÌÁö¸Ê ÆÄÀÏ¿¡ - À¯È¿ÇÑ ÁÂÇ¥¸¦ ÁÖÁö ¾ÊÀº °æ¿ì ÃëÇÒ ÇൿÀ» °áÁ¤ÇÑ´Ù.

    -Index: docs/manual/mod/mod_so.html.en -=================================================================== ---- docs/manual/mod/mod_so.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_so.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_unique_id.html.en httpd-2.2.0-branch/docs/manual/mod/mod_unique_id.html.en +--- httpd-2.2.0/docs/manual/mod/mod_unique_id.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_unique_id.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4965,12 +4722,11 @@ Index: docs/manual/mod/mod_so.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache Module mod_so

    +

    Apache Module mod_unique_id

    -Index: docs/manual/mod/mod_dav.html.ja.euc-jp -=================================================================== ---- docs/manual/mod/mod_dav.html.ja.euc-jp (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_dav.html.ja.euc-jp (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_unique_id.html.ja.euc-jp httpd-2.2.0-branch/docs/manual/mod/mod_unique_id.html.ja.euc-jp +--- httpd-2.2.0/docs/manual/mod/mod_unique_id.html.ja.euc-jp 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_unique_id.html.ja.euc-jp 2005-12-22 04:02:46.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4978,12 +4734,11 @@ Index: docs/manual/mod/mod_dav.html.ja.euc-jp -Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    +Apache > HTTP ¥µ¡¼¥Ð > ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó > ¥Ð¡¼¥¸¥ç¥ó 2.2 > ¥â¥¸¥å¡¼¥ë
    -

    Apache ¥â¥¸¥å¡¼¥ë mod_dav

    +

    Apache ¥â¥¸¥å¡¼¥ë mod_unique_id

    -Index: docs/manual/mod/mod_authn_anon.html.ko.euc-kr -=================================================================== ---- docs/manual/mod/mod_authn_anon.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mod_authn_anon.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_unique_id.html.ko.euc-kr httpd-2.2.0-branch/docs/manual/mod/mod_unique_id.html.ko.euc-kr +--- httpd-2.2.0/docs/manual/mod/mod_unique_id.html.ko.euc-kr 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_unique_id.html.ko.euc-kr 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@
    <-
    @@ -4991,25 +4746,11 @@ Index: docs/manual/mod/mod_authn_anon.html.ko.euc-kr -Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    +Apache > HTTP Server > Documentation > Version 2.2 > ¸ðµâ
    -

    ¾ÆÆÄÄ¡ ¸ðµâ mod_authn_anon

    -
    -Index: docs/manual/mod/directive-dict.html.ko.euc-kr -=================================================================== ---- docs/manual/mod/directive-dict.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/directive-dict.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411) -@@ -16,7 +16,7 @@ -
    -
    <-
    -

    Áö½Ã¾î¸¦ ¼³¸íÇϴµ¥ »ç¿ëÇÑ ¿ë¾îµé

    -+Apache > HTTP Server > Documentation > Version 2.2

    Áö½Ã¾î¸¦ ¼³¸íÇϴµ¥ »ç¿ëÇÑ ¿ë¾îµé

    +

    ¾ÆÆÄÄ¡ ¸ðµâ mod_unique_id

    -

    °¡´ÉÇÑ ¾ð¾î:  en  | -  ja  | -Index: docs/manual/mod/mpm_common.html.en -=================================================================== ---- docs/manual/mod/mpm_common.html.en (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/mpm_common.html.en (.../branches/2.2.x) (wersja 358411) +diff -ur httpd-2.2.0/docs/manual/mod/mod_userdir.html.en httpd-2.2.0-branch/docs/manual/mod/mod_userdir.html.en +--- httpd-2.2.0/docs/manual/mod/mod_userdir.html.en 2005-11-13 08:38:36.000000000 +0200 ++++ httpd-2.2.0-branch/docs/manual/mod/mod_userdir.html.en 2005-12-22 04:02:45.000000000 +0200 @@ -17,7 +17,7 @@

    <-
    @@ -5017,128 +4758,59 @@ Index: docs/manual/mod/mpm_common.html.en -Apache > HTTP Server > Documentation > Version 2.2 > Modules
    +Apache > HTTP Server > Documentation > Version 2.2 > Modules
    -

    Apache MPM Common Directives

    +

    Apache Module mod_userdir

    -Index: docs/manual/mod/core.xml.de -=================================================================== ---- docs/manual/mod/core.xml.de (.../tags/2.2.0) (wersja 358411) -+++ docs/manual/mod/core.xml.de (.../branches/2.2.x) (wersja 358411) -@@ -1,7 +1,7 @@ - - - -- -+ - - -+ - - -+ - - -+ - - -+ - - -+ - - -+ - - -+ - - -+ - - -+ - - -+ - - -+ - -