From 2f391ad03cd21ce82ba01e29768d659df14b77fd Mon Sep 17 00:00:00 2001
From: Yoshiki Hayashi
IPv4 $B$H(B IPv6 $B$N%3%M%/%7%g%s$r:G>.8B$N%=%1%C%H$G07$$$?$$$N$G$"$l$P!"(B +
$B0lJ}$G!"(BLinux $B$d(B Tru64 $B$H$$$C$?%W%i%C%H%[!<%`$G(B IPv4 $B$H(B IPv6
+ $B$NN>J}$r07$&$K$O!"%^%C%W%H%"%I%l%9$r;HMQ$9$k(B$B0J30$NJ}K!$O$"$j$^$;$s(B$B!#(B
+ IPv4 $B$H(B IPv6 $B$N%3%M%/%7%g%s$r:G>.8B$N%=%1%C%H$G07$$$?$$$N$G$"$l$P!"(B
IPv4 $B%^%C%W$N(B IPv6 $B%"%I%l%9$r;HMQ$9$kI,MW$,$"$j!"(B
- --enable-v4-mapped configure $B%*%W%7%g%s$r;XDj$7$F!"C1=c$K(B
- Listen
- $B%G%#%l%/%F%#%V$G
+ --enable-v4-mapped configure $B%*%W%7%g%s$r;XDj$7$^$9!#(B
- Listen 80
-
--enable-v4-mapped $B$G$O!"(BApache
- $B$N@8@.$9$k%G%U%)%k%H$N@_Dj%U%!%$%kCf$N(B
- Listen
- $B%G%#%l%/%F%#%V$O$3$N7A<0$r;HMQ$7$F$$$^$9!#(B
- --enable-v4-mapped $B$O!"(B
+
$B%W%i%C%H%U%)!<%`$d(B APR $B$,2?$r%5%]!<%H$9$k$+(B$B$K4X$o$i$:!"(B
+ $B%W%i%C%H%U%)!<%`$d(B APR $B$,2?$r%5%]!<%H$9$k$+$K4X$o$i$:!"(B
IPv4 $B%3%M%/%7%g%s$N$_$r07$&$h$&$K$7$?$$>l9g$O!"(B
$BListen $B%G%#%l%/%F%#%V$G(B
@@ -129,25 +121,15 @@
Listen 192.170.2.1:80
IPv4 $B$H(B IPv6 $B$N%3%M%/%7%g%s$r8DJL$N%=%1%C%H$G07$&$h$&$K$7$?$$>l9g(B
+ $B>r7o$rK~$?$9%W%i%C%H%[!<%`$G!"(BApache $B$,(B
+ IPv4 $B$H(B IPv6 $B$N%3%M%/%7%g%s$r8DJL$N%=%1%C%H$G07$&$h$&$K$7$?$$>l9g(B
($B$D$^$j(B IPv4 $B%^%C%W$N%"%I%l%9$rL58z$K$7$?$$>l9g(B)
$B$O!"(B $B%3%s%F%s%H%M%4%7%(!<%7%g%s$O(B
Apache $B$O(B HTTP/1.1 $B5,3J$GDj5A$5$l$F$$$k(B 'server
driven' $B%3%s%F%s%H%M%4%7%(!<%7%g%s$r%5%]!<%H$7$F$$$^$9!#(B
- Accept, Accept-Language, Accept-Charset, Accept-Encoding
+ $B%?%$%W%^%C%W$O(B $B$r%5!<%P@_Dj%U%!%$%kCf$K=q$/$3$H$,0lHVNI$$J}K!$G$9!#(B $B%?%$%W%^%C%W%U%!%$%k$O5-=R$9$k%j%=!<%9$HF1$8L>A0$r;}$C$F$$$F!"(B
@@ -163,7 +165,7 @@
Content-language: fr, de $B$?$H$((B MultiViews $B$r;HMQ$9$k$h$&$K$J$C$F$$$?$H$7$F$b!"(B
- $B%U%!%$%kL>$N3HD%;R$h$j%?%$%W%^%C%W$NJ}$,M%@h8"$r;}(B$B$D$H$$$&$3$H$K$b(B
+ $B%U%!%$%kL>$N3HD%;R$h$j%?%$%W%^%C%W$NJ}$,M%@h8"$r;}$D(B$B$H$$$&$3$H$K$b(B
$BCm0U$7$F$/$@$5$$!#(B
variant $B$NIJOptions All $B$O(B
$B>e5-$N(B Apaceh $B%M%4%7%(!<%7%g%s%"%k%4%j%:%`$N873J$J2r$B>e5-$N(B Apache $B%M%4%7%(!<%7%g%s%"%k%4%j%:%`$N873J$J2rpJs$rAw$k(B
$B%V%i%&%68~$1$K$h$j$h$$7k2L$rF@$k$?$a$K9T$o$l$^$9!#(B
$B$+$J$j%]%T%e%i!<$J%V%i%&%6$G!"$b$7$J$$$H4V0c$C$?(B variant
- $B$rA*Br$9$k7k2L$K$J$C$F$7$^$&$h$&$J(B Accept
+ $B$rA*Br$9$k7k2L$K$J$C$F$7$^$&$h$&$J(B Accept: $B%j%/%(%9%H%X%C%@$O%a%G%#%"%?%$%W$NM%@h798~$r;XDj$7$^$9!#(B
+ $B$3$&$9$k$3$H$NA@$$$O!"L@<(E*$K%j%9%H$7$F$$$k%?%$%W$,M%@h$5$l$k$1$l$I$b!"(B
$B0[$J$kI=8=$,MxMQ2DG=$G$"$l$P$=$l$G$bNI$$!"$H$$$&$3$H$G$9!#(B
- $B$7$+$7(B$B$J$,$i!">e$N4pK\E*$J%"%k%4%j%:%`$G$O!"(B
+ $B$7$+$7$J$,(B$B$i!">e$N4pK\E*$J%"%k%4%j%:%`$G$O!"(B
*/* $B%o%$%k%I%+!<%I$OB>$NA4$F$N%?%$%W$HA4$/F1Ey$J$N$GM%@h$5$l$^$;$s!#(B
$B%V%i%&%6$O(B */* $B$K$b$C$HDc$$IJ
@@ -471,12 +473,12 @@
$BL@<(E*$K%j%9%H$5$l$F$$$k%?%$%W$K9gCW$9$k(B variant $B$,$J$$>l9g$K$N$_!"(B
$BB>$N%?%$%W$,JV$5$l$^$9!#(B $B$b$7(B Accept: $B%X%C%@$,(B q $BCM$rA4$/4^$s$G(B$B$$$J$1$l$P(B$B!"(B
+ $B$b$7(B $B%5!<%P$N%Z!<%8$r%/%i%$%"%s%H$,%j%/%(%9%H$7$?$1$l$I$b!"(B
- $B%V%i%&%6$NAw$C$F$-$?(B Accept-Language $B$K9gCW$9$k%Z!<%8$,0l$D$b(B
+ $B%V%i%&%6$NAw$C$F$-$?(B $B$h$j9bEY$J%F%/%K%C%/(B (Cookie $B$dFC HTTP/1.1 $B%/%i%$%"%s%H$KBP$7$F$O!"%l%9%]%s%9$N%M%4%7%(!<%7%g%sVary HTTP $B%l%9%]%s%9%X%C%@$rAw$j$^$9!#(B
+ $B%-%c%C%7%e$O!"$3$l$r;H$C$F8eB3$N%j%/%(%9%H$KBP$7$F%m!<%+%k%3%T!<$G1~Ez$G$-$k$+(B
+ $B$I$&$+$r7hDj$G$-$^$9!#(B
+ $B%M%4%7%(!<%7%g%sforce-no-vary $B4D6-JQ?t(B$B$r(B
+ $B@_Dj$7$^$9!#(B $B%^%$%J!<%P!<%8%g%s$+$i$=$Nl9g$O!"$^$:(B
+ $B%"%C%W%0%l!<%I(B$B$r$4Mw2<$5$$!#(B NN $B$O:G?7$N%^%$%J!<%P!<(B$B%8%g%s%J%s%P!<$K!"(B
+ NN $B$O:G?7$N%^%$%J!<%P!<%8%g%s%J%s%P!<$K!"(B
PREFIX $B$O%$%s%9%H!<%k$9$k%5!<%P$G$N%U%!%$%k%7%9%F%`$N%Q%9$K!"(B
$BCV$-49$($F$/$@$5$$!#(BPREFIX $B$r;XDj$7$J$+$C$?>l9g$O!"(B
$B%G%U%)%k%H$N(B $B$G%F%9(B$B%H$7$^$9!#(B
+ $B$G%F%9%H$7$^$9!#(B
PGP $B=pL>$OI,$:(B $B%a%$%s$N(B Apache
$B%&%'%V%5%$%H(B$B$+$i $Bconfigure $B%9%/%j%W%H$G9T$J$$$^$9!#(B
(Apache $B%=!<%9%D%j!<$N(B CVS
$BHG$r%@%&%s%m!<%I$7$?3+H/ Apache $B$O%b%8%e!<%k2=$5$l$?%5!<%P$G$9!#(B
- $B$4(B$B$/$4$/4pK\E*$J5!G=$@$1$,!"%3%"%5!<%P$K4^$^$l$F$$$^$9!#(B
+ $B$4$/$4$/4pK\E*$J5!G=$@$1$,!"%3%"%5!<%P$K4^$^$l$F$$$^$9!#(B
$B3HD%5!G=$OMM!9$J%b%8%e!<%k$N7A$GDs6!$5$l$^$9!#(B
$B@_Dj%W%m%;%9Cf$G$O!"$I$s$J%b%8%e!<%k$r%5!<%P$G;H$&$h$&$K(B
$B%3%s%Q%$%k$9$k$+A*$P$J$1$l$P$J$j$^$;$s!#$3$N%^%K%e%"%k$K$"$k(B$B%b%8%e!<%k$N0lMw(B$B$r(B
@@ -452,7 +456,7 @@
$B4pK\E*$J@_Dj$r$9$k$N$K!"(BPentium III/Linux 2.2
$B$N%7%9%F%`$G$*$*$h$=(B 3 $BJ,DxEY$+$+$j$^$9$,!"(B
$B$"$i$+$8$a$4N;>52<$5$$!#(B
- $B$^$?!";~4V$O%O!<(B$B%I%&%'%"$dM-8z$K$7$?%b%8%e!<%k$N?t$K(B
+ $B$^$?!";~4V$O%O!<%I%&%'%"$dM-8z$K$7$?%b%8%e!<%k$N?t$K(B
$BBg$-$/0MB8$9$k$G$7$g$&!#(B $B%"%C%W%0%l!<%I$G$^$:9T$J$&$Y$-$3$H$O!"%j%j!<%9%"%J%&%s%9$H(B
+ $B%=!<%9%G%#%9%H%j%S%e!<%7%g%s$KF~$C$F$$$k(B $B%^%$%J!<%P!<%8%g%s$+$il9g(B
+ ($BNc$($P(B 2.0.55 $B$+$i(B 2.0.57 $B$X(B) $B$O!"$b$C$H4JC1$G$9!#(B
+ $BA02s$N%$%s%9%H!<%k;~$N%=!<%9%D%j!<$,;D$5$l$F$$$k$N$G$"$l$P!"(B
+ $B%"%C%W%0%l!<%I$O$5$i$K4JC1$G$9!#8E$$%=!<%9%D%j!<$N%k!<%H$KB8:_$9$k(B
+ Available Languages: de |
diff --git a/docs/manual/mod/directive-dict.html.ja.jis b/docs/manual/mod/directive-dict.html.ja.jis
index 370ddc20532..e3d74e56d27 100644
--- a/docs/manual/mod/directive-dict.html.ja.jis
+++ b/docs/manual/mod/directive-dict.html.ja.jis
@@ -175,11 +175,11 @@
$B%G%#%l%/%F%#%V$NM-8z$J0LCV$O!" $B$3$N%b%8%e!<%k$K$OFs$D$N%G%#%l%/%F%#%V$,$"$j$^$9!#(B $B$3$N%G%#%l%/%F%#%V$O(B action-type
$B$,%j%/%(%9%H$5$l$?$H$-$K(B cgi-script
@@ -72,11 +74,13 @@ CGI $B%9%/%j%W%H$r $B:G=i$NNc$G$O!"(BMIME $B%3%s%F%s%H%?%$%W$,(B 2 $BHVL\$NNc$G$O!"3HD%;R$,(B $B%*%W%7%g%s$N(B 2 $BHVL\$NNc$G$O!"3HD%;R$,(B Script $B%3%^%s%I$O%G%U%)%k%H$NF0:n$rDI2C$9$k$@$1$G$"$k$3$H$K(B
+ $B%M%C%H%o!<%/(B a.b.c.d $B$H%M%C%H%^%9%/(B w.x.y.z $B$G$9!#(B
+ $B%M%C%H%o!<%/(B a.b.c.d $B$H%M%C%H%^%9(B$B%/(B w.x.y.z $B$G$9!#(B
$B$h$j:YN3EY$N%5%V%M%C%H@)8BMQ$G$9!#(B $B$3$N>l9g!"(Buser-agent $B$NJ8;zNs$,(B $B%-!<%o!<%I$O%3%s%^$GJ,N%$9$k$3$H$@$1$,2DG=$G$9!#(B
- $B4V$K(B$B6uGr$,$"$C$F$O$$$1$^$;$s(B$B!#$I$N>l9g$G$b!"(B $B
$BJQ?t$r=PNO$9$kA0$K!"JQ?tCf$NFCJLJ8;z$r$I$N$h$&$K%(%s%3!<%I$9$k$+$r(B
- $B;XDj$7$^$9!#(B--enable-v4-mapped $B$O!"(B
FreeBSD, NetBSD, OpenBSD $B0J30$NA4$F$N%W%i%C%H%[!<%`$G$N%G%U%)%k%H$G$9!#(B
$B$G$9$+$i!"$*$=$i$/$*--disable-v4-mapped configure
$B%*%W%7%g%s$r;XDj$7$F!"Listen
- $B%G%#%l%/%F%#%V$r;HMQ$7$F$/$@$5$$!#(B
- Listen [::]:80
- Listen 0.0.0.0:80
- --disable-v4-mapped $B$G$O!"(BApache
- $B$N@8@.$9$k%G%U%)%k%H$N@_Dj%U%!%$%kCf$N(B
- Listen
- $B%G%#%l%/%F%#%V$O$3$N7A<0$r;HMQ$7$F$$$^$9!#(B
+ $B%G%#%l%/%F%#%V$r;HMQ$7$F$/$@$5$$!#(B
--disable-v4-mapped $B$O!"(B
FreeBSD, NetBSD, OpenBSD $B%W%i%C%H%[!<%`$G$N%G%U%)%k%H$G$9!#(B$B%P!<%A%c%k%[%9%H$KBP$7$F$I$&F/$/$N$+(B
diff --git a/docs/manual/content-negotiation.html.ja.jis b/docs/manual/content-negotiation.html.ja.jis
index c306b604e06..bcf47769848 100644
--- a/docs/manual/content-negotiation.html.ja.jis
+++ b/docs/manual/content-negotiation.html.ja.jis
@@ -34,8 +34,7 @@
mod_negotiation
- $B%b%8%e!<%k$K$h$C$F(B
- $BDs6!$5$l$F$$$F!"%G%U%)%k%H$GAH$_9~$^$l$F$$$^$9!#(B
$B%3%s%F%s%H%M%4%7%(!<%7%g%s$K$D$$$F(B
Apache $B$K$*$1$k%M%4%7%(!<%7%g%s(B
Accept-Language: fr; q=1.0, en; q=0.5
@@ -85,7 +84,8 @@
Accept, Accept-Language,
+ Accept-Charset, Accept-Encoding
$B%j%/%(%9%H%X%C%@$r40A4$K%5%]!<%H$7$F$$$^$9!#(BApache $B$O(B
'transparent' $B%3%s%F%s%H%M%4%7%(!<%7%g%s$b%5%]!<%H$7$F$$$^$9$,!"(B
$B$3$l$O(B RFC 2295 $B$H(B RFC 2296 $B$GDj5A$5$l$F$$$k;n83E*$J(B
@@ -117,7 +117,7 @@
*.var $B%U%!%$%k(B)
+ ($B$9(B$B$J$o$A(B *.var $B%U%!%$%k(B)
$B$r;H$&J}K!!#(B $B$3$l$O(B variant
$B$rL@<(E*$K5s$2$F$$$k%U%!%$%k$r;XDj$7$^$9!#(Btype-map $B%O%s%I%i(B
($B$b$7$/$O!"8E$$(B Apache
- $B$N@_Dj$H2<0L8_49$G$"$k(B mime $B%?%$%W(B
+ $B$N@_Dj$H2<0L8_49$G$"$k(B MIME $B%?%$%W(B
application/x-type-map)
$B$K4XO"IU$1$i$l$?%I%-%e%a%s%H$G$9!#(B
$B$3$N5!G=$r;H$&$?$a$K$O!"$"$k%U%!%$%k$N3HD%;R$r(B
@@ -138,7 +138,9 @@
$B$H$7$FDj5A$9$k$h$&$J%O%s%I%i$r!"(B
$B@_Dj%U%!%$%kCf$KCV$/I,MW$,$"$k$3$H$KCm0U$7$F$/$@$5$$!#(B
$B$3$l$O(BAddHandler type-map .var
MultiViews
- $B$r%;%C%H$7$J$$$3$H$KCm0U$7$F$/$@$5$$!#L@(B$B<(E*$K(B
+ $B$r%;%C%H$7$J$$$3$H$KCm0U$7$F$/$@$5$$!#L@<((B$BE*$K(B
$B$=$NL>A0$r=q$/I,MW$,$"$j$^$9!#(BMultiViews $B$N8z2L$O0J2<$N$h$&$K$J$j$^$9(B:
@@ -260,7 +262,7 @@
$B!V:GE,$J!W(B variant $B$r7hDj$9$k$?$a$KFs$D$NJ}K!$N(B
$B$I$A$i$+$r5/F0$7$^$9!#(B
Apache $B$N%3%s%F%s%H%M%4%7%(!<%7%g%s$N5!G=$r;H$&$?$a$K!"(B
- $B$I$N$h$&$K$7(B$B$F$3$ND4Dd$,9T$o$l$k$+>\:Y$rCN$kI,MW$O$"$j$^$;$s!#(B
+ $B$I$N$h$&$K$7$F(B$B$3$ND4Dd$,9T$o$l$k$+>\:Y$rCN$kI,MW$O$"$j$^$;$s!#(B
$B$7$+$7$J$,$i!"$3$NJ8=q$N;D$j$G$O4X?4$N$"$k?M$N$?$a$K!"(B
$B;HMQ$5$l$F$$$kJ}K!$K$D$$$F@bL@$7$F$$$^$9!#(B
$B%a%G%#%"%?%$%W(B
- $B%V%i%&%6$O(B Accept
+ $B%V%i%&%6$O(B Accept
$B%X%C%@%U%#!<%k%I$GM%@h798~$r;XDj$7$^$9!#(B
$B%"%$%F%`$=$l$>$l$O!"4XO"$7$?IJ
$B8@8l(B
- $B%V%i%&%6$O(B Accept-Language
+ $B%V%i%&%6$O(B
+ $B4XO"$E$1$k(B$B$3$H$,$G$-$^$9!#(B
Accept-Language
$B%X%C%@%U%#!<%k%I$GM%@h798~$r;XDj$7$^$9!#(B
$BMWAG$=$l$>$l$KIJe$N8@8l$H(B
- $B4XO"$E(B$B$1$k$3$H$,$G$-$^$9!#(B
@@ -327,7 +329,7 @@
$B%(%s%3!<%G%#%s%0(B
- $B%V%i%&%6$O(B Accept-Encoding
+ $B%V%i%&%6$O(B Accept-Encoding
$B%X%C%@%U%#!<%k%I$GM%@h798~$r;XDj$7$^$9!#(B
$BMWAG$=$l$>$l$KIJ
- $BJ8;z%;%C%H(B
- $B%V%i%&%6$O(B Accept-Charset
+ $B%V%i%&%6$O(B Accept-Charset
$B%X%C%@%U%#!<%k%I$GM%@h798~$r;XDj$7$^$9!#(B
$BMWAG$=$l$>$l$KIJ
- Accept-Language $B%X%C%@$N8@8l=g$+!"(B
($B$b$7$"$l$P(B)
LanguagePriority
- $B%G%#%l%/%F%#%V$N8@8l=g$G:GE,$J8@8l$N(B variant $B$rA*$S$^$9(B$B!#(BAccept-Charset $B%X%C%@9T$GM?$($i$l$F$$$k:G9b$NJ8;z%;%C%H(B
$B%a%G%#%"%Q%i%a!<%?$r;}$D(B variant $B$rA*$S$^$9!#(B
$BL@<(E*$K=|30$5$l$F$$$J$$8B$j!"(BISO-8859-1
$B$,5vMF$5$l$k$h$&$K$J$C$F$$$^$9!#(B
@@ -409,36 +411,36 @@
$BIJ
- Accept
$B%X%C%@>pJs$rAw$k$b$N$b$"$j$^$9!#(B
$B%V%i%&%6$,40A4$G@5$7$$>pJs$rAw$C$F$$$l$P!"(B
$B$3$N?tCMJQ2=$OE,MQ$5$l$^$;$s!#(B$B%a%G%#%"%?%$%W$H%o%$%k%I%+!<%I(B
- Accept: $B%j%/%(%9%H%X%C%@$O%a%G%#%"%?%$%W$NM%@h798~$r;XDj$7$^$9!#(B
$B$3$l$O$^$?!"(B"image/*" $B$d(B "*/*"
$B$H$$$C$?!V%o%$%k%I%+!<%I!W%a%G%#%"%?%$%W$r4^$`$3$H$,$G$-$^$9!#(B
$B$3$3$G(B * $B$OG$0U$NJ8;zNs$K%^%C%A$7$^$9!#(B
@@ -458,7 +460,7 @@
Accept: $B%X%C%@$,(B q $BCM$rA4$/4^$s$G(B$B$$$J$1$l$P(B$B!"(B
$BK>$_$N5sF0$r$9$k$?$a$K!"(B
Apache $B$O(B "*/*" $B$,$"$l$P(B 0.01 $B$N(B q $BCM$r@_Dj$7$^$9!#(B
$B$^$?!"(B"type/*" $B$N7A$N%o%$%k%I%+!<%I$K$O(B 0.02 $B$N(B q $BCM$r@_Dj$7$^$9(B
($B$G$9$+$i$3$l$i$O(B "*/*" $B$N%^%C%A$h$j$bM%@h$5$l$^$9(B)$B!#(B
- $B$b$7(B Accept: $B%X%C%@Cf$N%a%G%#%"%?%$%W$N$I$l$+$,(B q
+ $B$b$7(B Accept: $B%X%C%@Cf$N%a%G%#%"%?%$%W$N$I$l$+$,(B q
$BCM$r4^$s$G$$$l$P!"$3$l$i$NFCAccept-Language $B$K9gCW$9$k%Z!<%8$,0l$D$b(B
$B8+$D$+$i$J$+$C$?>l9g$K!"%5!<%P$O(B "No Acceptable Variant"
$B$+(B "Multiple Choices" $B%l%9%]%s%9$r%/%i%$%"%s%H$KJV$7$^$9!#(B
$B$3$l$i$N%(%i!<%a%C%;!<%8$rJV$5$J$$$h$&$K!"(B
- $B$3$N$h$&$J>l9g$K$O(B Apache $B$,(B Accept-Language $B$rL5;k$7$F!"(B
- $B%/%i%$%"%s%H$N%j%/%(%9%H$KL@<(E*$K(B$B$O9gCW$7$J$$%I%-%e%a%s%H$r(B
+ $B$3$N$h$&$J>l9g$K$O(B Apache $B$,(B Accept-Language $B$rL5;k$7$F!"(B
+ $B%/%i%$%"%s%H$N%j%/%(%9%H$KL@<(E*$K$O9g(B$BCW$7$J$$%I%-%e%a%s%H$r(B
$BDs6!$9$k$h$&$K@_Dj$G$-$^$9!#(B
ForceLanguagePriority
$B%G%#%l%/%F%#%V$O!"$3$l$i$N%(%i!<$N0l$D$+N>J}$r%*!<%P!<%i%$%I$9$k$?$a$K(B
@@ -530,7 +532,7 @@
$BI,MW$G$9!#(Bprefer-language
$B$rG'<1$9$k$h$&$K$J$j$^$7$?!#(B
@@ -554,7 +556,7 @@
$B$K0u$rIU$1$k$?$a$K!"?7$?$K(B {encoding ..}
$BMWAG$r(B variant $B%j%9%HCf$K;H$C$F$$$^$9!#(B
$B%j%9%HCf$N%(%s%3!<%I$5$l$?(B variant $B$rG'<1$7!"(B
-Accept-Encoding $B%j%/%(%9%H%X%C%@$K=>$C$F5vMF$5$l$k(B
+Accept-Encoding $B%j%/%(%9%H%X%C%@$K=>$C$F5vMF$5$l$k(B
$B%(%s%3!<%I$r$b$C$?(B variant $B$O!"$I$l$G$b8uJd(B variant
$B$H$7$F;HMQ$9$k$h$&$K!"(B
RVSA/1.0 $B%"%k%4%j%:%`(B (RFC 2296) $B$Nfoo.html)$B;~$O!"8@8l3HD%;R$O(B
- ($B%(%s%3!<%G%#%s%03HD%;R$b$"$l(B$B$P$=$l$b4^$a$F(B)
+ ($B%(%s%3!<%G%#%s%03HD%;R$b$"$l$P$=(B$B$l$b4^$a$F(B)
MIME $B%?%$%W3HD%;R$N1&B&$K$J$1$l$P$J$j$^$;$s(B
($BNc$($P(B foo.html.en)$B!#(B$BDI2C>pJs(B
@@ -703,7 +714,7 @@ RVSA/1.0 $B$Nlibtool $B$H(B autoconf
$B$r;H$&$h$&$K$J$C$F$$$^$9!#(B
+
$B35MW(B ($B$;$C$+$A$J?M8~$1(B)
$BI,MW$J$b$N(B
$B%$%s%9%H!<%k(B
$B%+%9%?%^%$%:(B
$B%F%9%H(B
$B%"%C%W%0%l!<%I(B$B;2>H(B
@@ -103,7 +107,7 @@
$B%@%&%s%m!<%I(B
- $ lynx
- http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz
+ $ lynx http://httpd.apache.org/download.cgi
/usr/local/apache2 $B$K$J$j$^$9!#(B$ gpg --import KEYS-Idir") $B!#(B
- TARGET=... [$B%G%U%)%k%HCM(B: apache]TARGET=... [$B%G%U%)%k%HCM(B: httpd]
+autoconf $B=PNO%*%W%7%g%s(Bautoconf $B=PNO%*%W%7%g(B$B%s(B
@@ -411,7 +415,7 @@
--help--quietconfig.layout $B%U%!%$%kCf$G$N!"(B
- $B;XDj$5$l$?L>A0$N%l%$%"%&%H$r;HMQ$7$^$9!#(B$B%b%8%e!<%k(B
--disable-MODULE--enable-modules=MODULE-LISTconfigure
- $B%3%^%s%I$GCV$-49$($k$3$H$,$G$-(B$B$^$9!#(B
--with-mpm=NAME$ PREFIX/bin/apachectl stop$B%"%C%W%0%l!<%I(B
+
+ CHANGES $B$rFI$s$G!"(B
+ $B<+?H$N%5%$%H$KBP$7$F1F6A$r5Z$\$9JQ99E@$rC5$9$3$H$G$9!#(B
+ $B%a%8%c!<%j%j!<%94V$NJQ99$r$9$k>l9g(B ($BNc$($P(B 1.3 $B$+$i(B 2.0 $B$X!"(B2.0 $B$+$i(B 2.2 $B$X(B)
+ $B$O!"%3%s%Q%$%k;~$dmake install $B$rconfigure $B%*%W%7%g%s!"(B
+ $Bconfigure $B%3%^%s%I%i%$%s!"(B
+ $BF10l$N@_Dj%U%!%$%k!"%b%8%e!<%kA4$F$,@5>o$KF0:n$9$k$O$:$G$9!#(B
+ (2.0.41 $B0J9_$G$O$=$N$h$&$K$J$C$F$$$^$9!#$=$l0JA0$N%P!<%8%g%s$K$O(B
+ $BIT@09g$,B8:_$7$^$9!#(B)config.nice $B%U%!%$%k$K$O!"A02s%=!<%9%D%j!<$r@_Dj$7$?;~$N(B
+ configure $B%3%^%s%I%i%$%s$,F~$C$F$$$^$9!#(B
+ $Bl9g$O!"(Bconfig.nice
+ $B%U%!%$%k$r?7$7$$%P!<%8%g%s$N%=!<%9%D%j!<$K%3%T!<$7!"(B
+ $B$=$l$rJT=8$7I,MW$JJQ99$r9T$J$C$F!"
+
+
+ $ ./config.nice
+ $ make
+ $ make install
+ $ PREFIX/bin/apachectl stop
+ $ PREFIX/bin/apachectl start
+ Listen $B%G%#%l%/%F%#%V$G@_Dj$7$^$9(B)
+ $B$r;HMQ$9$k$3$H$G!"8E$$%P!<%8%g%s$K1F6A$rM?$($:$K?7$7$$%P!<%8%g%s$r(B
+ $B%$%s%9%H!<%k$7!"<Directory>$B!"(B
- <Location>$B!"(B
- <Files>
- $B$NCf$G!"(B Directory$B!"(BLocation$B!"(BFiles
- $B%;%/%7%g%s$N5!G=(B
+ <Directory>,
+ <Location>,
+ <Files>,
+ <Proxy>
+ $B%3%s%F%J$NCf$G!"(B $B@_Dj%;%/%7%g%s(B
$B$G@bL@$5$l$F$$$k@)8B$N2<$G;HMQ$G$-$k$3$H$r<($7$^$9!#(Bhttpd.conf
$B%U%!%$%k$H(B .htaccess
@@ -253,7 +253,7 @@
$B35MW(B
Action
- $B%G%#%l%/%F%#%V$OFCDj$N%?%$%W$N%U%!%$%k$r%j%/%(%9%H$5$l$?>l9g$K(B
+ $B%G%#%l%/%F%#%V$OFCDj$N(B MIME $B%?%$%W$N%U%!%$%k$r%j%/%(%9%H$5$l$?>l9g$K(B
CGI $B%9%/%j%W%H$,
-$B@bL@(B: $BFCDj$N%O%s%I%i$d%3%s%F%s%H%?%$%W$KBP$7$F(B CGI $B$r
+$B9=J8(B: Action action-type cgi-script$B9=J8(B: Action action-type cgi-script [virtual]$B%3%s%F%-%9%H(B: $B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess $B>e=q$-(B: FileInfo $B%9%F!<%?%9(B: Base
+$B%b%8%e!<%k(B: mod_actions $B8_49@-(B: virtual $B=$>~;R$H%O%s%I%iEO$7$O(B
+Apache 2.1 $B$GF3F~$5$l$^$7$?(BPATH_INFO $B$H(B
+ PATH_TRANSLATED $B$r;H$C$FEA$($i$l$^$9!#(B
+ $BFCDj$N%j%/%(%9%H$KBP$7$F;HMQ$5$l$k%O%s%I%i$X$O!"(B
+ REDIRECT_HANDLER $BJQ?t$r;H$C$FEO$;$^$9!#(B$BNc(B
- # Requests for files of a particular type:
+ # Requests for files of a particular MIME content type:
Action image/gif /cgi-bin/images.cgi
# Files of a particular file extension
@@ -85,12 +89,26 @@ CGI $B%9%/%j%W%H$rimage/gif
- $B$N%U%!%$%k$X$N%j%/%(%9%H$O!"$=$N%U%!%$%k$NBe$o$j$K;XDj$5$l$?%9%/%j%W%H(B
- /cgi-bin/images.cgi $B$,8F$P$l$^$9!#(B/cgi-bin/images.cgi $B$G=hM}$5$l$^$9!#(B.xyz
+ $B$N%U%!%$%k$X$N%j%/%(%9%H$O!";XDj$7$?%9%/%j%W%H(B
+ /cgi-bin/program.cgi $B$G=hM}$5$l$^$9!#(Bvirtual $B=$>~;R$r;HMQ$9$k$H!"(B
+ $B%j%/%(%9%H$5$l$?%U%!%$%k$,.xyz $B$N%U%!%$%k$X$N%j%/%(%9%H$O!"(B
- $B$=$N%U%!%$%k$NBe$o$j$K;XDj$5$l$?%9%/%j%W%H(B
- /cgi-bin/program.cgi $B$,8F$P$l$^$9!#(B$BNc(B
+ <Location /news>
+
+ SetHandler news-handler
+ Action news-handler /cgi-bin/news.cgi virtual
+
+ </Location>
+ $B;2>H(B
@@ -115,19 +133,22 @@ CGI $B%9%/%j%W%H$r
AddHandler $B$K$h$C$F(B
CGI $B%9%/%j%W%H$K@_Dj$5$l$?%j%=!<%9$X$N(B URL-path $B$G$9!#(B
$B%j%/%(%9%H$5$l$?%I%-%e%a%s%H$N(B URL $B$H%U%!%$%k$N%Q%9$OI8=`(B CGI
- $B4D6-JQ?t(B PATH_INFO $B$H(B PATH_TRANSLATED $B$r;H$C$FEA$($i$l$^$9!#(B
+ $B4D6-JQ?t(B PATH_INFO $B$H(B PATH_TRANSLATED
+ $B$r;H$C$FEA$($i$l$^$9!#(B
Script PUT $B$H(B Script put
$B$O$^$C$?$/0c$C$?8z2L$K$J$j$^$9!#(B
Script $B%3%^%s%I$O%G%U%)%k%H$NF0:n$r(B
+ $BDI2C$9$k$@$1$G$"$k$3$H$K(B
$BCm0U$7$F$/$@$5$$!#$b$7(B CGI $B%9%/%j%W%H$,8F$P$l$?$j!"%j%/%(%9%H$5$l$?(B
$B%a%=%C%I$rFbIt$G07$&$3$H$N$G$-$kB>$N%j%=!<%9$,$"$l$P!"$=$l$,9T$J$o$l$^$9!#(B
- GET $B%a%=%C%I$N(B Script $B$OLd9g$;0z?t$,$"$k>l9g$K$N$_(B
+ GET $B%a%=%C%I$N(B Script $B$OLd9g$;(B
+ $B0z?t$,$"$k>l9g$K$N$_(B
($B$?$H$($P(B$B!"(Bfoo.html?hi) $B8F$P$l$k$H$$$&$3$H$K$bCm0U$7$F$/$@$5$$!#(B
$B$=$&$G$J$$>l9g$O!"%j%/%(%9%H$ODL>oDL$j=hM}$5$l$^$9!#(Bfoo.apache.org $B$K$O%^%C%A$7$^$9$,!"(B
fooapache.org $B$K$O%^%C%A$7$^$;$s!#(B
- $B$3$N@_Dj$r$9$k$H!"%5!<%P$O(B
+ $B$3$N@_Dj$r$9$k$H!"(BApache $B$O(B
HostnameLookups
$B$N@_Dj$K4X$o$i$:!"%/%i%$%"%s%H$N(B IP $B%"%I%l%9$KBP$7$F(B
- DNS $B$N5U0z$-$r9T$J$$$^$9!#(B
+ DNS $B$N(B 2 $B=E5U0z$-$r9T$J$$$^$9!#(B
+ $B%[%9%HL>$+$i%*%j%8%J%k$N(B IP $B%"%I%l%9$r=g0z$-$7$^$9!#(B
+ $B=g0z$-$H5U0z$-$,0lCW$7!"%[%9%HL>$,3:Ev$7$?>l9g$K$N$_!"(B
+ $B%"%/%;%9$,5v2D$5$l$^$9!#(B
$BNc(B
Allow from 10.1.0.0/255.255.0.0
KnockKnock/2.0
$B$G;O$^$k%V%i%&%6$N$_$,%"%/%;%9$r5v2D$5$l!"(B
- $BB>$N$b$N$O%"%/%;%9$r5qH]$5$l$^$9!#(BAllow $B$H(B
+ $B4V$K(B$B6u(B$BGr$,$"$C$F$O$$$1$^$;$s(B$B!#$I$N>l9g$G$b!"(BAllow $B$H(B
Deny $BJ8$O(B
$BA4$FI>2A$5$l$k$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#(B
Order
$B%G%#%l%/%F%#%V$O%5!<%P$N@_Dj=hM}$N3FCJ3,$G$@$1(B
$B%"%/%;%9%G%#%l%/%F%#%V$N=hM}$N=gHV$rJQ99$7$^$9!#$3$l$O!"$?$H$($P!"(B
- Order $B%G%#%l%/%F%#%V$N@_Dj$K4X$o(B$B$i$:!"(B
+ Order $B%G%#%l%/%F%#%V$N@_Dj$K4X$o$i$:!"(B
<Location> $B%;%/%7%g%s$N(B
Allow $B%G%#%l%/%F%#%V$d(B
Deny $B%G%#%l%/%F%#%V$O!"(B
diff --git a/docs/manual/mod/mod_include.html.ja.jis b/docs/manual/mod/mod_include.html.ja.jis
index 68958a91531..b4c9b8679fa 100644
--- a/docs/manual/mod/mod_include.html.ja.jis
+++ b/docs/manual/mod/mod_include.html.ja.jis
@@ -154,9 +154,18 @@
+
echomsg (Apache 2.1 $B0J9_(B)echo
+ $BMWAG$,L$Dj5A$NJQ?t$r%(%3!<$7$h$&$H$7$?:]$K!"(B
+ $B%/%i%$%"%s%H$KAw$i$l$k%a%C%;!<%8$K$J$j$^$9!#(B
+ SSIUndefinedEcho
+ $B%G%#%l%/%F%#%V$r>e=q$-$7$^$9!#(BerrmsgSSIErrorMsg
+ $B%G%#%l%/%F%#%V$r>e=q$-$7$^$9!#(B
sizefmtencodingnone $B$K@_Dj$5$l$F$$$k$H!"%(%s%3!<%I$O9T$J$o$l$^$;$s!#(B
+ $B;XDj$7$^$9!#(Bnone $B$K@_Dj$5$l$F$$$k$H!"%(%s%3!<%I$O9T$J$o$l$^$;(B$B$s!#(B
url $B$K@_Dj$5$l$F$$$k$H!"(BURL $B%(%s%3!<%I(B (%-$B%(%s%3!<%I$H$b(B
$B8F$P$l$F$$$^$9!#$3$l$O%j%s%/Ey$N(B URL $B$N;HMQ$KE,@Z$G$9(B) $B$,(B
$B9T$J$o$l$^$9!#(Becho $BMWAG$N3+;O;~$O!"%G%U%)%k%H$O(B
entity $B$K@_Dj$5$l$F$$$^$9!#$3$l$O%(%s%F%#%F%#%(%s%3!<%I(B
- ($BCJMn$d%F%-%9%H$J$I$N%V%m%C%/%l%Y%k$N(B HTML $B%(%l%a%s%H$N%3%s%F(B$B%-%9%H$K(B
+ ($BCJMn$d%F%-%9%H$J$I$N%V%m%C%/%l%Y%k$N(B HTML $B%(%l%a%s%H$N%3%s%F%-%9%H$K(B
$BE,$7$F$$$^$9(B) $B$r9T$J$$$^$9!#$3$l$O(B encoding $BB0@-(B
$B$r2C$($k$3$H$GJQ99$G$-$^$9!#JQ99$Oencoding $BB0@-$+!"(B
$BMWAG$N=*N;$^$G8zNO$r;}$A$^$9!#(BPATH_INFO $B$H%/%(%j!
<!--#exec cgi="/cgi-bin/example.cgi" -->
@@ -309,7 +318,7 @@
$B40A4$J(B URL $B$r;H$C$FIaDL$K(B CGI $B%9%/%j%W%H$,8F$S=P$5$l$^$9!#(B
$BB0@-$,J8=q$N0LCV$r;XDj$7$^$9!#(Binclude $B%3%^%s%I$KM?$($i$l$?$=$l$>$l$N(B - $BB0@-$KBP$7$FA^F~:n6H$,9T$J$o$l$^$9!#M-8z$JB0@-$O + $BB0@-$KBP$7$FA^F~:n6H$,9T$J$o(B$B$l$^$9!#M-8z$JB0@-$O
fileconfig,
exec, flastmod, fsize,
include, echo, set $B$N(B
- $B3F%G%#%l%/%F%#%V$H!">r7oJ,4tMQ$N%*%Z%l!<%?$X$N0z?t$,$"$j$^$9!#(B
+ $B3F%G%#%l%/%F%#%V$H!">r7oJ,4tMQ$N%*%Z%l!<%?$X$N0z?t$,(B$B$"$j$^$9!#(B
$B%I%k5-9f$O%P%C%/%9%i%C%7%e$r;H$&$3$H$G;H$&$3$H$,$G$-$^$9(B:
@@ -469,7 +478,7 @@
$B$+(B if $BMWAG$O%W%m%0%i%_%s%08@8l$N(B
if $BJ8$HF1$8$h$&$KF0:n$7$^$9!#>r7o$,I>2A$5$l!"7k2L$,??$G$"$l$Pelifelse $B$+(B endif
- $BMWAG$^$G$NJ8;zNs$,=PNO$KA^F~$5$l$^$9!#(B
elif $B$d(B else $BJ8$O(B test_condition
$B$,56$N$H$-$K%F%-%9%H$r=PNO$KA^F~$9$k$?$a$K;H$o$l$^$9!#(B
@@ -485,15 +494,18 @@
string1 = string2
+ string1 == string2
string1 != string2string1 $B$H(B string2 $B$rHf3S$7$^$9!#(B
string2 $B$,(B /string/
$B$H$$$&7A<0$G$"$l$P!"@55,I=8=$H$7$FHf3S$5$l$^$9!#@55,I=8=$O(B
PCRE $B%(%s%8%s$G
== $B$OC1$K(B = $B$NJLL>$G!"$^$C$?$/F1$8F0:n$r(B
+ $B$7$^$9!#(B
- $B@5$N%^%C%A%s%0(B (=) $B$N>l9g$O!"(B
+
$B@5$N%^%C%A%s%0(B (= $B$^$?$O(B ==) $B$N>l9g$O!"(B
$B@55,I=8=$G%0%k!<%WJ,$1$5$l$?%Q!<%D$r%-%c%W%A%c$9$k$3$H$,$G$-$^$9!#(B
$B%-%c%W%A%c$5$l$?ItJ,$OFC$9
$B$K3JG<$5$l$^$9!#(B
$B??56CM%*%Z%l!<%?(B && $B$H(B ||
+ $B$OF1$8M%@hEY$G$9!#(B
+ $B$3$l$i$N%*%Z%l!<%?$G0lJ}$K$h$j6/$$M%@hEY$r$D$1$?$$>l9g$K$O!"(B
+ $B3g8L$r;H$&I,MW$,$"$j$^$9!#(B
$BJQ?t$d%*%Z%l!<%?$H$7$FG'<1$5$l$J$$$b$N$O$9$Y$FJ8;zNs$H$7$F(B
$B07$o$l$^$9!#J8;zNs$O0zMQId$G0O$`$3$H$b$G$-$^$9(B: 'string'
$B$N$h$&$K!#0zMQId$G0O$^$l$F$$$J$$J8;zNs$K$O6uGr(B ($B%9%Z!<%9$H%?%V(B)
@@ -556,6 +573,29 @@
'string1 string2' $B$O(B string1 string2
$B$K$J$j$^$9!#(B
$B<0$,$b$C$HJ#;($K$J$j!"=hM}$NB.EYDc2<$,82Cx$K$J$C$?>l9g$O!"(B + $BI>2A%k!<%k$K=>$C$F:GE,2=$7$F$_$k$HNI$$$G$7$g$&!#(B
+&& $B$H(B ||)
+ $B$O!"=PMh$k8B$jC;MmI>2A$5$l$^$9!#$D$^$j7k2L$H$7$F>e5-$N%k!<%k$O!"(B
+ mod_include $B$,:8$NI>2A<0$rI>2A$7$^$9!#(B
+ $B:8B&$G7k2L$r==J,7hDj$G$-$k>l9g$O!"I>2A$O$=$3$GDd;_$7$^$9!#(B
+ $B$=$&$G$J$$>l9g$O1&B&$rI>2A$7$F!":8$H1&$NN>J}$+$i7k2L$r7W;;$7$^$9!#(B$1 .. $9)
+ $B$rKd$a$k$?$a$K!"$BFCDj$N<0$,$I$N$h$&$K07$o$l$k$+$rCN$j$?$$>l9g$O!"(B
+ -DDEBUG_INCLUDE $B%3%s%Q%$%i%*%W%7%g%s$rIU$1$F(B
+ mod_include $B$r%j%3%s%Q%$%k$9$k$HNI$$$G$7$g$&!#(B
+ $B$3$l$K$h$j!"A4$F$N%Q!<%9$5$l$?<0$KBP$7$F!";z6g2r@O>pJs!"(B
+ $B%Q!<%9%D%j!<$H!"(B
+ $B$=$l$,$I$N$h$&$K%/%i%$%"%s%H$KAw$i$l$?=PNO$^$GI>2A$5$l$?$+$r(B
+ $BA^F~$7$^$9!#(B
| $B@bL@(B: | $BF|IU$1$r8=$9(B$BJ8;zNs$N=q<0$r@_Dj$9$k(B |
|---|---|
| $B@bL@(B: | $BF|IU$1$r8=$9J8;zNs$N=q<0$r@_Dj$9$k(B |
| $B9=J8(B: | SSITimeFormat formatstring |
| $B%G%U%)%k%H(B: | SSITimeFormat "%A, %d-%b-%Y %H:%M:%S %Z" |
| $B%3%s%F%-%9%H(B: | $B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess |
| $B@bL@(B: | $BL$Dj5A$NJQ?t$,(B echo $B$5$l$?$H$-$KI=<($5$l$kJ8;zNs(B |
| $B9=J8(B: | SSIUndefinedEcho string |
| $B%G%U%)%k%H(B: | SSIUndefinedEcho "(none)" |
| $B%3%s%F%-%9%H(B: | $B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B |
| $B%3%s%F%-%9%H(B: | $B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess |
| $B>e=q$-(B: | All |
| $B%9%F!<%?%9(B: | Base |
| $B%b%8%e!<%k(B: | mod_include |
| $B8_49@-(B: | 2.0.34 $B0J9_$GMxMQ2DG=(B |
$B$3$N%G%#%l%/%F%#%V$OJQ?t$,Dj5A$5$l$F$$$J$$$K$b4X$o$i$:(B
"echo" $B$5$l$?$H$-$K(B mod_include
- $B$,I=<($9$kJ8;zNs$rJQ99$7$^(B$B$9!#(B
SSIUndefinedEcho "<!-- undef -->"
@@ -721,7 +762,7 @@ directive]"
$B$b$7$=$l$,@_Dj$5$l$F$$$l$P!"JV$5$l$k%U%!%$%k$N(B Last-modified $B$N(B
$BF|IU$r%U%!%$%k$N:G=*=$@5;~9o$K$7$^$9!#$=$l$,@_Dj$5$l$F$$$J$$$H$-$O!"(B
last-modified $B$NF|IU$OAw$i$l$^$;$s!#$3$N%S%C%H$r@_Dj$9$k$H!"(B
- $B%/%i%$%"%s%H$d%W%m%-%7$,%j%/%(%9%H$r%-%c%C%7%e$G$-$k$h$&$K$J$j$^$9!#(B
+ $B%/%i%$%"%s%H$d%W%m%-%7$,%j%/(B$B%(%9%H$r%-%c%C%7%e$G$-$k$h$&$K$J$j$^$9!#(B
#include
$B$9$k$+$b$7$l$J$$$b$N$d!"3F%"%/%;%9$KBP$7$F0c$&=PNO$r@8@.$9$k(B
diff --git a/docs/manual/mod/mod_negotiation.html.ja.jis b/docs/manual/mod/mod_negotiation.html.ja.jis
index 024634ef698..2da3a5b35b2 100644
--- a/docs/manual/mod/mod_negotiation.html.ja.jis
+++ b/docs/manual/mod/mod_negotiation.html.ja.jis
@@ -164,6 +164,11 @@
$B$=$N%U%!%$%kL>$rD>@\;XDj$7$?$H$-$HF1$8$b$N$,3d$jEv$F$i$l$^$9!#(B
$B$=$l$+$i%/%i%$%"%s%H$NMW5a$K0lHV9g$&$b$N$rA*$S!"(B
$B$=$N%I%-%e%a%s%H$rJV$7$^$9!#(B
+
+ $B%U%!%$%k$rA*Br$9$k:]$K!"4XO"$9$k%3%s%F%s%H%M%4%7%(!<%7%g%s$N(B
+ $B%a%?>pJs$r;}$?$J$$%U%!%$%k$K$D$$$F!"H=Dj$r9T$&$+$I$&$+$r(B
+ MultiViewsMatch
+ $B%G%#%l%/%F%#%V$G@_Dj$7$^$9!#(B
$B$3$N%G%#%l%/%F%#%V$,@_Dj$5$l$F$$$k$H!"%3%s%F%s%H%M%4%7%(!<%7%g%s(B $B$r$7$?7k2L$N%I%-%e%a%s%H$N%-%c%C%7%e$r5v2D$7$^$9!#(B $B$3$l$O!"%W%m%-%7$N8e$m$K$$$k%/%i%$%"%s%H$,G=NO$K0lHV9g$C$?(B - $B%I(B$B%-%e%a%s%H$G$O$J$/!"(B + $B%I%-%e%a%s%H$G$O$J$/!"(B $B%-%c%C%7%e$r$h$j8z2LE*$K$9$k$b$N$rF@$k2DG=@-$,$"$k$H$$$&$3$H$G$9!#(B
$B$3$N%G%#%l%/%F%#%V$O(B HTTP/1.0 $B%V%i%&%6$+$i$N%j%/%(%9%H(B @@ -272,14 +277,13 @@
foo.html $B$,%j%/%(%9%H$5$l!"(Bfoo.html.fr
$B$H(B foo.html.de $B$,N>J}B8:_$7!"(B
- $B%V%i%&%6$,8@8l$NM%@h=g0L$rDs6!$7$F$J$$>l9g$O(B
+ $B%V%i%&%6(B$B$,8@8l$NM%@h=g0L$rDs6!$7$F$J$$>l9g$O(B
foo.html.fr $B$,JV$5$l$^$9!#(B
$B$3$N%G%#%l%/%F%#%V$OB>$NJ}K!$G!V:GA1!W(B
$B$N8@8l$,7hDj$G$-$J$$$H$-$+!"(BForceLanguagePriority $B%G%#%l%/%F%#%V$,(B
None $B0J30$N$H$-$K$N$_8z2L$,$"$k$3$H$KCm0U$7$F$/$@$5$$!#(B
- HTTP/1.1 $B%j%/%(%9%H$,@5$7$/
$B$3$l$h$j=@Fp$J%^%C%A%s%0$,I,MW$J>l9g$O!"$3$l$i$N%3%s%F%J$N@55,I=8=(B +
$B$3$l$h$j=@Fp$J%^%C%A%s%0$,I,MW$J>l9g$O!"$3$l$i$N%3%s%F%J$K@55,I=8=(B
(regex) $BHG$G$"$k(B
<DirectoryMatch>,
<FilesMatch>,
@@ -281,8 +281,7 @@ Deny from all
$B$G$9$+$i$G$-$k8B$j%U%!%$%k%7%9%F%`%3%s%F%J$r;HMQ$7$F$/$@$5$$!#(B
$B$7$+$7$J$,$i0l$D$@$1Nc30$,$"$j$^$9!#(B
<Location /> $B%;%/%7%g%s$O$I$s$J(B URL
-$B$K$b4X$o$i$:E,MQ$5$l$k$N$G!"$=$3$K%"%/%;%9$r@)8B$9$k%G%#%l%/%F%#%V$r(B
-$B5o$l$k$3$H$O40A4$K0BA4$G$9!#(B
<VirtualHost>
-$B%3(B$B%s%F%J$OFCDj$N%[%9%H$KE,MQ$9$k%G%#%l%/%F%#%V$r3JG<$7$^$9!#(B
+$B%3%s%F%J$OFCDj$N%[%9%H$KE,MQ$9$k%G%#%l%/%F%#%V$r3JG<$7$^(B$B$9!#(B
$B0lBf$N%^%7%s$GJ#?t$N%[%9%H$r0[$J$k@_Dj$GDs6!$7$?$$$H$-$KM-MQ$G$9!#(B
$B>\:Y$K4X$7$F$O(B$B%P!<%A%c%k%[%9%H%I%-%e%a%s%H(B$B$r(B
$B$4Mw2<$5$$!#(B
<Proxy>
$B$H(B <ProxyMatch>
-$B%3%s%F%J$O!"(Bmod_proxy
-$B%W%m%/%7%5!<%P$r7PM3$7$F%"%/%;%9$5$l$kFCDj$N(B URL $B$K%^%C%A$9$k%5%$%H$K(B
-$BBP$7$F$N$_E,MQ$5$l$k(B
-$B@_Dj%G%#%l%/%F%#%V$r3JG<$7$^$9!#Nc$($Pcnn.com $B%&%'%V%5%$%H$r%"%/%;%9$9$k$?$a$K$O;H$($J$$$h$&$K$7$^$9!#(B
mod_proxy
+$B%W%m%/%7%5!<%P$r7PM3$7$F%"%/%;%9$7$?%5%$%H$KBP$7$F$N$_E,MQ$5$l$k(B
+$B@_Dj%G%#%l%/%F%#%V$r3JG<$7$^$9!#Nc$($Pcnn.com
+$B%&%'%V%5%$%H$K%"%/%;%9$9$k$?$a$KMQ$$$i$l$k%W%m%/%7%5!<%P$r(B
+$B@)8B$7$^$9!#(B
$B8e$N%;%/%7%g%s$N%G%#%l%/%F%#%V$,A0$N%;%/%7%g%s$N$b$N$r>e=q$-$7$^$9!#(B $B$b$C$H6qBNE*$J!"<Directory>
<Proxy http://cnn.com/*>
-$B%;%/%7%g%s$K@_CV$5$l$?(B$B%"%/%;%9@)8B$K4X$o$i$:!"(B
+$B%;%/%7%g%s$K@_CV$5$l$?%"%/%;%9@)8B$K4X$o$i$:!"(B
@@ -353,7 +352,7 @@ Deny from all
<Directory> ($B@55,I=8=L5$7(B) $B$H(B
- .htaccess $B$rF1;~$K(B (.htaccess $B$,5v2D$5$l$F$$$l$P!"$=$l$,(B
+ .htaccess $B$rF1;~$K(B (.htaccess $B$,5v2D$5$l$F$$$l$P!"$=$l$,(B
<Directory> $B$r>e=q$-$7$^$9(B)
<Directory>
- $B0J30$O!"$=$l$>$l$N%0%k!<%W$O@_Dj%U%!%$%k$K8=$l$?=gHV$K=hM}$5$l$^$9!#(B
+ $B0J30$O!"$=$l$>$l$N%0%k!<%W(B$B$O@_Dj%U%!%$%k$K8=$l$?=gHV$K=hM}$5$l$^$9!#(B
<Directory> ($B>e$N%0%k!<%W(B 1)
$B$O%G%#%l%/%H%j$,C;$$$b$N$+$iD9$$$b$N$X$H=hM}$5$l$^$9!#$G$9$+$i!"(B
$BNc$($P(B <Directory /var/web/dir1> $B$O(B
@@ -386,6 +385,11 @@ Deny from all
$B8e(B$B$KE,MQ$5$l$^$9!#$3$l$K$h$j%P!<%A%c%k%[%9%H$,(B
$B%a%$%s$N%5!<%P@_Dj$r>e=q$-$G$-$k$h$&$J$j$^$9!#(Bmod_proxy $B$G%j%/%(%9%H$,=hM}$5$l$k>l9g$O!"(B
+ $B=hM}=gHV$N$&$A!"(B<Directory> $B%3%s%F%J$NItJ,$,(B
+ <Proxy>
+ $B%3%s%F%J$K
<Location>
$B%;%/%7%g%s$,:G8e$KI>2A$5$l$F!"%5!<%P$X$N%"%/%;%9$O@)8B$5$l$^$;$s!#(B
-$B$D$^$j!"%^!<%8$N=gHV$O=EMW$G$9$N$G!"Cm0U$7$F;HMQ$7$F$/$@$5$$(B!
Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.1
+ $B$3$l$O!"(Bwrapper $B$r
- $B$3$l$O!"(Bwrapper $B$r
- $BBP>]$N%W%m%0%i%`$,(B '/' $B$+$i;O$^$k!"$^$?$O(B
+ $BBP>]$N(B CGI, SSI $B%W%m%0%i%`$,(B '/' $B$+$i;O$^$k!"$^$?$O(B
'..' $B$K$h$k;2>H$r9T$J$C$F$$$^$9$+(B? $B$3$l$i$O5v2D$5$l$^$;$s!#(B
- $BBP>]$N%W%m%0%i%`$O(B Apache $B$N(B web $B6u4VFb$K$J$1$l$P$J$j$^$;$s!#(B
+ $BBP>]$N%W%m%0%i%`$O(B suEXEC $B$N%I%-%e%a%s%H%k!<%H(B
+ ($B2<5-$N(B
- $BBP>]$H$J$k%f!<%6L>$O(B$BB8:_$7$F$$$^$9$+(B?
+ $BBP>]$H$J$k%f!<%6L>$OB8:_$7$F$$$^$9$+(B?
- $B:#$N$H$3$m!"(BsuEXEC $B$O(B 'root' $B$K$h$k(B CGI/SSI
+ $B:#$N$H$3$m!"(BsuEXEC $B$O(B
- $B$3$3$G!"(Bsetuid $B$H(B setgid
+ $B$3$3(B$B$G!"(Bsetuid $B$H(B setgid
$B$N5/F0$K$h$j%W%m%0%i%`$OBP>]$H$J$k%f!<%6$H%0%k!<%W$K$J$j$^$9!#(B
- $B%0%k!<%W%"%/%;(B$B%9%j%9%H$O!"(B
+ $B%0%k!<%W%"%/%;%9%j%9%H$O!"(B
$B%f!<%6$,B0$7$F$$$k$9$Y$F$N%0%k!<%W$G=i4|2=$5$l$^$9!#(B
$B%G%#%l%/%H%j$,B8:_$7$J$$$J$i!"$=$N%U%!%$%k$bB8:_$7$J$$$+$b$7$l$^$;$s!#(B
+ $B%G%#%l%/%H%j$K0\F0$G$-$J$$$N$G$"$l$P!"$*$=$i$/B8:_$b$7$J$$$G$7$g$&!#(B
$B%j%/%(%9%H$,%5!<%PFb$N$b$N$G$"$l$P!"(B
- $BMW5a$5$l$?%G%#%l%/%H%j$,%5!<%P$N%I%-%e%a%s%H%k!<%HG[2<$K$"$j$^$9$+(B?
- $B%j%/%(%9%H$,(B UserDir $B$N$b$N$G$"$l$P!"(B
- $BMW5a$5$l$?%G%#%l%/%H%j$,%f!<%6$N%I%-%e%a%s%H%k!<%HG[2<$K$"$j$^$9$+(B?
+ $BMW5a$5$l$?%G%#%l%/%H%j$,(B suEXEC $B$N%I%-%e%a%s%H%k!<%HG[2<$K$"$j$^$9$+(B?
+ $B%j%/%(%9%H$,(B UserDir $B$N$b$N$G$"$l$P!"MW5a$5$l$?%G%#%l%/%H%j$,(B suEXEC
+ $B$N%f!<%6$N%I%-%e%a%s%H%k!<%HG[2<$K$"$j$^$9$+(B?
+ (suEXEC $B@_Dj%*%W%7%g%s(B $B;2>H(B)
$BB8:_$7$J$1$l$P
- $B=jM-
@@ -323,7 +327,7 @@
@@ -360,13 +364,13 @@
suEXEC $B@_Dj$N3NG'(B
suEXEC wrapper
$B$N%3%s%Q%$%k$H%$%s%9%H!<%k(B $B0BA4$J%Q!<%_%C%7%g%s$r@_Dj$9$k(B $B$?$H$($P!"
+
+ $B$3$l$G(B Apache $B$, $B5/F0;~$K!"(BApache $B$O(B "sbin" $B%G%#%l%/%H%j$G(B
- "suexec" $B$rC5$7$^$9(B
+ $B5/F0;~$K!"(BApache $B$O(B suEXEC $B$N;EAH$_$r;HMQ$9$k$N$,=i$a$F$G!"(BApache $B$,4{$KF0:nCf$G$"$l$P!"(B
Apache $B$r(B kill $B$7$F!":F5/F0$7$J$1$l$P$J$j$^$;$s!#(BHUP $B%7%0%J%k$d(B
USR1 $B%7%0%J%k$K$h$kC1=c$J:F5/F0$G$OIT==J,$G$9!#(B suEXEC $B$rL58z$K$9$k>l9g$O!"(B"suexec" $B%U%!%$%k$r:o=|$7$F$+$i(B
+ suEXEC $B$rL58z$K$9$k>l9g$O!"(B suEXEC wrapper $B$O!">e5-$G=R$Y$?(B --with-suexec-logfile
+ suEXEC wrapper $B$O!">e5-$G=R$Y$?(B
- $B%;%-%e%j%F%#$H8zN($NM}M3$+$i!"(BsuEXEC $B$NA4$F$N%j%/%(%9%H$O(B
+ $B%;%-%e%j%F%#$H8zN($NM}M3$+$i!"(B $B$O(B
<Location />
diff --git a/docs/manual/sitemap.html.ja.jis b/docs/manual/sitemap.html.ja.jis
index 983c28c05aa..598ba4bab82 100644
--- a/docs/manual/sitemap.html.ja.jis
+++ b/docs/manual/sitemap.html.ja.jis
@@ -137,6 +137,7 @@
Apache $B%b%8%e!<%k(B
diff --git a/docs/manual/ssl/index.html.ja.jis b/docs/manual/ssl/index.html.ja.jis
index bc40bdcf0fb..44c3ad5aa33 100644
--- a/docs/manual/ssl/index.html.ja.jis
+++ b/docs/manual/ssl/index.html.ja.jis
@@ -14,7 +14,7 @@

Apache $B$N(B SSL/TLS $B0E9f2=(B
--with-suexec-docroot=DIR $B$r;2>H(B)
+ $BFb$KB8:_$7$J$1$l$P$J$j$^$;$s!#(B
root $B$K$h$k(B CGI/SSI
$B%W%m%0%i%`$N--enable-suexec
+ $B%*%W%7%g%s$K$"$o$;$F>/$J$/$H$b0l$D$O(B --with-suexec-xxxxx
$B%*%W%7%g%s$,;XDj$5$l$J$1$l$P$J$j$^$;$s!#(B--with-suexec-bin=PATHsuexec $B%P%$%J%j$N%Q%9$O%5!<%P$K(B
$B%O!<%I%3!<%I$5$l$F$$$kI,MW$,$"$j$^$9!#%G%U%)%k%H$N%Q%9$r(B
$BJQ$($?$$$H$-$O$3$N%*%W%7%g%s$r;H$C$F$/$@$5$$!#(B$BNc$($P(B$B!"(B
--with-suexec-bin=/usr/sbin/suexec $B$N$h$&$K!#(B--datedir $B$K(B "/htdocs"
$B$H$$$&%5%U%#%C%/%9$r$D$1$?$b$N$G$9!#(B
"--datadir=/home/apache" $B$H$7$F@_Dj$9$k$H!"(B
suEXEC wrapper $B$K$H$C$F(B "/home/apache/htdocs"
@@ -421,7 +425,7 @@
--logfiledir) $B$KCV$+$l$^$9!#(B
--with-suexec-safepath=PATH
suEXEC wrapper $B$r%3%s%Q%$%k$7$F%$%s%9%H!<%k$9$kA0$K!"@_DjFbMF$r(B
- --layout $B%*%W%7%g%s$G3NG'$G$-$^$9!#(B
+ --layout $B%*%W%7%g%s$G3NG'$G$-$^$9!#(B
$B=PNONc(B:
suEXEC setup: $B%*%W%7%g%s$G(B suEXEC $B5!G=$rM-8z$K$9$k$H!"(B
+ "make" $B%3%^%s%I$r
- suexec binary: /usr/local/apache/sbin/suexec
- document root: /usr/local/apache/share/htdocs
+ suexec binary: /usr/local/apache2/sbin/suexec
+ document root: /usr/local/apache2/share/htdocs
userdir suffix: public_html
- logfile: /usr/local/apache/var/log/suexec_log
+ logfile: /usr/local/apache2/var/log/suexec_log
safe path: /usr/local/bin:/usr/bin:/bin
caller ID: www
minimum user ID: 100
@@ -450,13 +454,13 @@
- --enable-suexec $B%*%W%7%g%s$G(B suEXEC $B5!G=$rM-8z$K$9$k$H!"(B
- "make" $B%3%^%s%I$r
$B$9$Y$F$N9=@.MWAG$,:n@.$5$l$k$H!"$=$l$i$N%$%s%9%H!<%k$K$O(B
- "make install" $B%3%^%s%I$,--sbindir $B%*%W%7%g%s$G;XDj$5$l$?%G%#%l%/%H%j$K%$%s%9%H!<%k$5$l$^$9!#(B
$B%G%U%)%k%H$N>l=j$O(B "/usr/local/apache/sbin/suexec" $B$G$9!#(B
$B%$%s%9%H!<%k;~$K$O(B root
$B8"8B$,I,MW$J$N$GCm0U$7$F$/$@$5$$!#(Bwrapper $B$,%f!<%6(B ID
@@ -464,16 +468,47 @@
$B$G$N%;%C%H%f!<%6(B ID
$B%S%C%H$r$=$N%U%!%$%k$N%b!<%I$K@_Dj$7$J$1$l$P$J$j$^$;$s!#(B
+ suEXEC $B%i%C%Q!<$O!"(B--with-suexec-caller configure
+ $B%*%W%7%g%s$G;XDj$7$?@5$7$$%f!<%6$G5/F0$5$l$F$$$k$3$H$r3NG'$7$^$9$,!"(B
+ $B%7%9%F%`>e$G$3$N%A%'%C%/$,9T$J$o$l$kA0$K!"(B
+ suEXEC $B$,8F$V%7%9%F%`$d%i%$%V%i%j$,@H
+ User www
+ Group webgroup
+suexec $B$,(B "/usr/local/apache2/sbin/suexec"
+ $B$K%$%s%9%H!<%k$5$l$F$$$?>l9g!"
+
+
+ chgrp webgroup /usr/local/apache2/bin/suexec
+ chmod 4750 /usr/local/apache2/bin/suexec
+suEXEC
$B$NM-8z2=$HL58z2=(B
- --sbindir
+ $B%*%W%7%g%s$G@_Dj$5$l$?%G%#%l%/%H%j$G(B
+ suexec $B$rC5$7$^$9(B
($B%G%U%)%k%H$O(B "/usr/local/apache/sbin/suexec") $B!#(B
$BE,@Z$K@_Dj$5$l$?(B suEXEC $B$,$_$D$+$k$H!"(B
$B%(%i!<%m%0$K0J2<$N%a%C%;!<%8$,=PNO$5$l$^$9!#(B
[notice] suEXEC mechanism enabled (wrapper: /path/to/suexec)
suexec $B%U%!%$%k$r:o=|$7$F$+$i(B
Apache $B$r(B kill $B$7$F:F5/F0$7$^$9!#(B
suEXEC $B$N%G%P%C%0(B
- --with-suexec-logfile
$B%*%W%7%g%s$G;XDj$5$l$?%U%!%$%k$K%m%0>pJs$r5-O?$7$^$9!#(B
wrapper $B$rE,@Z$K@_Dj!"%$%s%9%H!<%k$G$-$F$$$k$H;W$&>l9g!"(B
$B$I$3$GLB$C$F$$$k$+8+$h$&$H$9$k$J$i$3$N%m%0$H%5!<%P$N(B
@@ -542,7 +577,7 @@
suEXEC $B$NA4$F$N%j%/%(%9%H$O(B
$B2>A[%[%9%H$X$N%j%/%(%9%H$K$*$1$k:G>e0L$N%I%-%e%a%s%H%k!<%HFb$+!"(B
$B%f!<%6%G%#%l%/%H%j$X$N%j%/%(%9%H$K$*$1$k8D!9$N%f!<%6$N:G>e0L$N(B
$B%I%-%e%a%s%H%k!<%HFb$K;D$i$J$1$l$P$J$j$^$;$s!#(B
diff --git a/docs/manual/urlmapping.html.ja.jis b/docs/manual/urlmapping.html.ja.jis
index 7e128ffe982..3c0a41c25ea 100755
--- a/docs/manual/urlmapping.html.ja.jis
+++ b/docs/manual/urlmapping.html.ja.jis
@@ -96,7 +96,7 @@
$B$r;H$C$F6/NO$J@55,I=8=$K4p$E$$$?%^%C%A$HCV49$r9T$J$&$3$H$,$G$-$^$9!#(B
$B$?$H$($P!"(BScriptAliasMatch ^/~([a-zA-Z0-9]*)/cgi-bin/(.*)
+ScriptAliasMatch ^/~([a-zA-Z0-9]+)/cgi-bin/(.+)
/home/$1/cgi-bin/$2http://example.com/~user/cgi-bin/script.cgi $B$X$N(B
@@ -139,7 +139,7 @@
/home/user/public_html/file.html $B$K%^%C%W$5$l$k$h$&$K$9$k$K$O!"(B
$B0J2<$N$h$&$K(B AliasMatch $B%G%#%l%/%F%#%V$r;H$$$^$9(B:AliasMatch ^/upages/([a-zA-Z0-9]*)/?(.*)
+AliasMatch ^/upages/([a-zA-Z0-9]+)/?(.*)
/home/$1/public_html/$2