From: André Malo
Apache $B$,;HMQ$9$k%"%I%l%9$H%]!<%H$N@_Dj$r$7$^$9!#(B
@@ -57,7 +55,7 @@ $B$9$Y$F$N%$%s%?!<%U%'!<%9$NM?$($i$l$?%]!<%HHV9f$r(B listen $B$7$^$9!#(B IP $B%"%I%l%9$,%]!<%HHV9f$HF1;~$KM?$($i$l$?>l9g$O!"(B $B%5!<%P$OM?$($i$l$?%]!<%H$H%$%s%?!<%U%'!<%9$r(B listen $B$7$^$9!#(B - $BJ#?t$N(B Listen $B%G%#%l%/%F%#%V$rMQ$$$F(B + $BJ#?t$N(BListen
$B%G%#%l%/%F%#%V$rMQ$$$F(B
$B$$$/$D$+$N(B listen $B$9$k%"%I%l%9$H%]!<%H$r;XDj$G$-$^$9!#(B
$B%5!<%P$O%j%9%H$5$l$?%"%I%l%9$d%]!<%H$+$i$N$9$Y$F$N%j%/%(%9%H$K(B
$BBP$7$F1~Ez$7$^$9!#(B
@@ -108,7 +106,8 @@
$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$^$9!#(B
+ --enable-v4-mapped
configure
+ $B%*%W%7%g%s$r;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
@@ -117,7 +116,7 @@
$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
+ Listen
$B%G%#%l%/%F(B$B%#%V$G(B
IPv4 $B%"%I%l%9$r;XDj$7$F$/$@$5$$!#(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
@@ -128,7 +127,8 @@
$B%G%#%l%/%F%#%V$r;HMQ$7$F$/$@$5$$!#(B
@@ -139,7 +139,8 @@
--disable-v4-mapped
configure
+ $B$O!"(B--disable-v4-mapped
+ configure
$B%*%W%7%g%s$r;XDj$7$F!"Listen
Listen $B$G%P!<%A%c%k%[%9%H$,Listen
+ $B$G%P!<%A%c%k%[%9%H$,
- ScriptAlias /cgi-bin/ /usr/local/apache/cgi-bin/
+ ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
$B%G%U%)%k%H0LCV$K(B Apache $B$r%$%s%9%H!<%k$7$?$J$i$P!"(B
@@ -88,12 +86,12 @@
URL $B$O(B CGI $B%W%m%0%i%`$H$_$J$5$l$k$H$$$&DI2C$N0UL#$r4^$s$G$$$k$3$H$G$9!#(B
$B=>$C$F!">e5-$NNc$G$O!"(B/cgi-bin/
$B$G;O$^$k%j%=!<%9$X$N$"$i$f$k%j%/%(%9%H$KBP$7$F!"%G%#%l%/%H%j(B
- /usr/local/apache/cgi-bin/
$B$+$iDs6!$7!"$=$l$i$r(B
+ /usr/local/apache2/cgi-bin/
$B$+$iDs6!$7!"$=$l$i$r(B
CGI $B%W%m%0%i%`$H$7$F07$&$h$&(B Apache $B$K<($7$^$9!#(B
$BNc$($P!"(BURL http://dev.rcbowen.com/cgi-bin/test.pl
$B$,MW5a$5$l$?>l9g!"(BApache $B$O(B $B%U%!%$%k(B
- /usr/local/apache/cgi-bin/test.pl
+ /usr/local/apache2/cgi-bin/test.pl
$B$rcgi-bin
$B%G%#%l%/%H%j$X$N%"%/%;%9$,$G$-$J$$>l9g!"(B
CGI $B%W%m%0%i%`$r
$BG$0U$N%G%#%l%/%H%j$G(B CGI $B$NSetHandler
$B%G%#%l%/%F%#%V$K$h$C$F(B
+ cgi-script
$B%O%s%I%i$,2DG=$K$J$C$F$$$kI,MW$,$"$j$^$9!#(B
+ $BOptions $B%G%#%l%/%F%#%V$G(B
+ ExecCGI
$B$,;XDj$5$l$F$$$J$1$l$P$J$j$^$;$s!#(B
- <Directory /usr/local/apache/htdocs/somedir>
+ <Directory /usr/local/apache2/htdocs/somedir>
Options +ExecCGI
@@ -139,43 +143,46 @@
$B%W%m%0%i%`$H$7$F$_$J$9$3$H$r%5!<%P$KEA$($^$9(B:
- AddHandler cgi-script cgi pl
+ AddHandler cgi-script .cgi .pl
.htaccess
- $B%U%!%$%k(B$B$O!"%G%#%l%/%H%jKh$K%G%#%l%/%F%#%V$r;XDj$9$kJ}K!$G$9!#(B
- Apache $B$O!"%j%=!<%9$rDs6!$9$k$H$-$K!"(B
- $BDs6!$9$k%U%!%$%k$,CV$+$l$F$$$k%G%#%l%/%H%jCf$N(B .htaccess
- $B$H$$$&%U%!%$%k$r;2>H$7$^$9!#$=$N%U%!%$%k$rH/8+$7$?$i!"(B
- $B$=$NCf$GH/8+$5$l$?%G%#%l%/%F%#%V$,E,MQ$5$l$^$9!#(B
+
.htaccess
$B%A%e!<%H%j%"%k(B
+ $B$O(B httpd.conf
$B$rJQ99$G$-$J$$>l9g$K$I$&$d$C$F(B CGI $B%W%m%0%i%`$r(B
+ $B;H$($k$h$&$K$9$k$+$r@bL@$7$F$$$^$9!#(B
.htaccess
$B%U%!%$%k$O!"(B
- AllowOverride
- $B%G%#%l%/%F%#%V$N;XDj$K$h$j;H$($k$h$&$K$J$j$^$9!#(B
- AllowOverride
- $B%G%#%l%/%F%#%V$O!"(B.htaccess
- $B%U%!%$%k$G!"$I$N%?%$%W$N%G%#%l%/%F%#%V$,@_Dj$G$-$k$+!"(B
- $B$"$k$$$OA4$/;XDj$G$-(B$B$J$$$+$r;XDj$7$^$9!#(B
- $B$3$NL\E*$KI,MW$K$J$k%G%#%l%/%F%#%V$r;HMQ$G$-$k$h$&$K$9$k$K$O!"(B
- $B%5!<%P$N%a%$%s$N@_Dj$G!"0J2<$N@_Dj$,I,MW$K$J$j$^$9(B:
+
+ $B%f!<%6%G%#%l%/%H%j$N(B $B$3$N@_Dj$G$O!"$3$N%G%#%l%/%H%j$K$*$1$k(B CGI
- $B%W%m%0%i%`$N.cgi
$B$G=*$o$k$9$Y$F$N%U%!%$%k$KBP$7$F(B CGI $B%W%m%0%i%`$N(B
+ $B
- AllowOverride Options
+ <Directory /home/*/public_html>
+
+ Options +ExecCGI
+ AddHandler cgi-script .cgi
+
+ </Directory>
.htaccess
- $B%U%!%$%k$G$O!"
+ cgi-bin
$B%5%V%G%#%l%/%H%j$N(B
+ $B$9$Y$F$N%U%!%$%k$r(B CGI $B%W%m%0%i%`$H$7$F;XDj$7$?$$>l9g$K$O(B
+ $B0J2<$N$h$&$J$b$N$r;H$$$^$9!#(B
- Options +ExecCGI
+ <Directory /home/*/public_html/cgi-bin>
+
+ Options ExecCGI
+ SetHandler cgi-script
+
+ </Directory>
Content-Type
$B$r(B CGI $B%W%m%0%i%`Fb$G(B
+ $B%;%C%H$7$?$+$r3NG'$7$F$/$@$5$$!#(B$B$3$l$KBP$9$kNc30$O!"%5!<%P$,(B suexec
- $B$r;HMQ$9$k$h$&@_Dj$5$l$F$$$k>l9g$G$9!#(Bsuexec $B$O!"(BCGI
- $B%W%m%0%i%`$,CV$+$l$F$$$k%P!<%A%c%k%[%9%H$^$?$O%f!<%6$N(B
- $B%[!<%`%G%#%l%/%H%j$K$h$C$F!"0[$J$k%f!<%68"8B$G
$B%3%^%s%I%i%$%s$+$i%W%m%0%i%`$r
PATH
$B$,$"$j$^$9!#(B
$B%W%m%0%i%`$,(B CGI $B%W%m%0%i%`$H$7$F%&%'%V%5!<%P$K$h$C$F $B$3$l$,%$%s%?!<%W%j%?$X$N CGI
$B%W%m%0%i%`$,<:GT$9$k$N$OBgDq!"%W%m%0%i%`<+?H$KLdBj$,$"$k>l9g$G$9!#(B
$B0lEY(B CGI $B$N;H$$J}$rM}2r$7!"A0=R$NFs$D$N8m$j$rHH$7$F$$$J$$$J$i$P!"(B
- $B$^$:4V0c$$$J$/$=$&$G$7$g$&!#%V%i%&%6$rDL$7$F%F%9%H$r9T$&A0$KI,$:!"(B
- $B%3%^%s%I%i%$%s$+$i%W%m%0%i%`$N ( $B:G=i$K%W%m%0%i%`$+$i=PNO$5$l$k$N$O(B suexec $B%5%]!<%H%W%m%0%i%`$O(B
+ $B%P!<%A%c%k%[%9%H$d%f!<%6$N%[!<%`%G%#%l%/%H%j$N>l=j$K0M$C$F(B
+ CGI $B%W%m%0%i%`$r0c$&%f!<%68"8B$N2<$GAv$i$;$k$3$H$r2DG=$K$7$^$9!#(B
+ Suexec $B$N8"8B$N%A%'%C%/$OHs>o$K87$7$/!"$=$l$rK~$?$5$J$$>l9g$O(B
+ CGI $B%W%m%0%i%`$,(B suexec $B$r;H$C$F$$$k$+$I$&$+$rD4$Y$?$a$K$O(B suexec $B$r40A4$KM}2r$7$F$$$J$$8B$j!";H$&$Y$-$G$O$"$j$^$;$s!#(B
+ suexec $B$rL58z$K$9$k$K$O!"(Bsendmail
$B$N$h$&$J$b$N(B) $B$O!"(B
$B%U%k%Q%9$G;XDj$9$kI,MW$,$"$k$G$7$g$&!#$=$l$K$h$j!"(BCGI
$B%W%m%0%i%`$r$B9=J8%(%i!<(B
+ $B%W%m%0%i%`%(%i!<(B
+ cd /usr/local/apache2/cgi-bin
+ ./first.pl
+ perl
$B%$%s%?%W%j%?$O8F$P$J$$$G$/$@$5$$!#(B
+ $B%7%'%k$H(B Apache $B$,%9%/%j%W%H$N:G=i$N9T$N(B $B%Q%9>pJs(B $B$r;H$C$F8+$D$1$^$9!#(B)Content-Type
$B$r4^$_!"(B
+ $B8e$K6u9T$NB3$/(B HTTP $B%X%C%@$G$J$1$l$P$J$j$^$;$s!#B>$N$b$N$,=PNO$5$l$F$$$k(B
+ $B>l9g$O!"(BApache $B$O$3$N%W%m%0%i%`$r%5!<%P7PM3$G$B%(%i!<%m%0(B
@@ -350,7 +366,31 @@
$B$b$7!"$"$J$?$,%&%'%V%5%$%H$rSuexec
+
+
+ Premature end of script headers
$B%(%i!<$G(B
+ $Bapachectl
+ -V
$B$rSUEXEC_BIN
$B$+$i;X$5$l$F$$$k(B
+ suexec
$B%P%$%J%j$r:o=|(B ($B$+L>A0$rJQ99(B) $B$9$k$@$1$G$9!#(B
+ suexec $B$rFI$s$@8e$G!"$^$@$=$l$r(B
+ $B;H$$$?$$$N$G$"$l$P!"(Bsuexec -V
$B$r
CGI $B%W%m%0%i%_%s%0$K=,=O$9$k$H!"(B $BN"$G5/$3$C$F$$$k$3$H$K$D$$$F99$KM}2r$9$k$3$HLr$KN)$A$^$9!#(B - $B%V%i%&%6$H%5!<%P$,$I$N$h$&$KAj8_DL?.$9$k$+$K$D$$$F$OFC$K$=$&$G$9!#(B + $B%V%i%&%6$H%5!<%P$,$I$N(B$B$h$&$KAj8_DL?.$9$k$+$K$D$$$F$OFC$K$=$&$G$9!#(B $B$J$<$J$i!"(B"Hello, World." $B$r0u;z$9$k%W%m%0%i%`$r=q$/$3$H$O$*$*$$$K7k9=$G$9$,!"(B $B$=$l$OFC$KM-1W$G$O$"$j$^$;$s!#(B
@@ -393,7 +433,7 @@ $B$=$7$F!"8x<0$N%j%9%H$K$O$J$$$$$/$D$+$NJQ?t$,I=<($5$l$F$$$k$+$b$7$l$^$;$s!#(B $B$5$i$K!"(BApache $B$O%G%U%)%k%H$GMQ0U$5$l$F$$$k4pK\E*$J$b$N$K(B $B$"$J$?<+?H$N4D6-JQ?t$r2C$($k(B$B$?$a$N!"(B - $BB?$/(B$B$N0[$J$kJ}K!$rMQ0U$7$F$7$^$9!#(B + $BB?$/$N0[$J$kJ}K!$rMQ0U$7$F$7$^$9!#(B
#!/usr/bin/perl
@@ -441,7 +481,7 @@
METHOD
$BB0@-$N@_Dj$G;XDj$7$^$9!#(B
CGI $B%W%m%0%i%`$O!"$=$NJ8;zNs$rLr$KN)$D>pJs$KJ,3d$9$k@UG$$,$"$j$^$9!#(B - $B9,$$$K$b!"$=$N%G!<%?=hM}$r=u$1$k%i%$%V%i%j$d%b%8%e!<%k$,B8:_$7$^$9!#(B + $B9,$$$K$b!"$=$N%G!<%?(B$B=hM}$r=u$1$k%i%$%V%i%j$d%b%8%e!<%k$,B8:_$7$^$9!#(B $B$3$l$i$O!"(BCGI $B%W%m%0%i%`$NB>$NLL$G$bF1MM$KLr$KN)$A$^$9!#(B
CGI $B$NLdBj$K$D$$$F!"2C$o$C$F$$$k%a!<%j%s%0%j%9%H$^$?$O%K%e!<%9(B
$B%0%k!<%W$K
suEXEC
$B5!G=$K$h$j!"(BApache $B%f!<%6$O(B Web $B%5!<%P$r suEXEC $B@_Dj$N3NG'(B
- suEXEC wrapper
$B$N%3%s%Q%$%k$H%$%s%9%H!<%k(B $B5/F0;~$K!"(BApache $B$O(B
$B$3$l$rJQ99$9$k$N$O4m81$G$9!#$3$N;XDj$K4^$^$l$k3F%Q%9$,(B
$B?.Mj$G$-$k(B
- $B%G%#%l%/%H%j$G$"$k$3$H$r3NG'$7$F$/$@$5$$!#(B
+ $B%G%#%l%/%H%j$G$"$k$3$H$r3NG'(B$B$7$F$/$@$5$$!#(B
$B@$3&$+$i$N%"%/%;%9$K$h$j!"C/$+$,%[%9%H>e$G%H%m%$$NLZGO(B
$B$r
- 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
- $B=PNONc(B:
- suEXEC setup:
- suexec binary: /usr/local/apache2/sbin/suexec
- document root: /usr/local/apache2/share/htdocs
- userdir suffix: public_html
- logfile: /usr/local/apache2/var/log/suexec_log
- safe path: /usr/local/bin:/usr/bin:/bin
- caller ID: www
- minimum user ID: 100
- minimum group ID: 100
-
--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@_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
+ ($B%G%U%)%k(B$B%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
$B$3$NJ8=q$G$OL>A0%Y!<%9$N%P!<%A%c%k%[%9%H$r$I$s$J$H$-!"(B $B$I$&$d$C$F;H$&$+$r@bL@$7$^$9!#(B
-NameVirtualHost
$B%G%#%l%/%F%#%V$G@_Dj$7$^$9!#DL>o!"(BNameVirtualHost
$B$G(B
*
$B$NB0@-$r;H$C$F%5!<%P$NA4$F$N(B IP $B%"%I%l%9$r;H$$$^$9!#(B
+ ($BNc$($P(B SSL $B$N;HMQ$J$I$G(B) $BJ#?t$N%]!<%H$r;H$&$3$H$r7W2h$7$F$$$k$N$G$"$l$P!"(B
+ $B0z?t$K(B *:80
$B$N$h$&$K%]!<%H$b4^$a$k$h$&$K$7$F$/$@$5$$!#(B
NameVirtualHost
$B%G%#%l%/%F%#%V$G(B
IP $B%"%I%l%9$r=q$$$F$b!"(B
$B<+F0E*$K%5!<%P$,$=$N(B IP $B%"%I%l%9$r%j%C%9%s$9$k$H$$$&$3$H$O$J$$$3$H$K(B
@@ -98,21 +96,21 @@
$B%G%#%l%/%F%#%V$N0z?t$O(B NameVirtualHost
$B%G%#%l%/%F%#%V$N0z?t$HF1$8$K$7$F$/$@$5$$(B ($B$9$J$o$A!"(BIP $B%"%I%l%9$+!"A4$F$N%"%I%l%9$r0UL#$9$k(B
*
)$B!#$=$l$>$l$N(B <VirtualHost>
- $B%G%#%l%/%F%#%V$NCf$K$O!":GDc8B!"$I$N%[%9%H$,07$o$l$k$+$r<($9(B ServerName
$B%G%#%l%/%F%#%V$H!"(B
+ $B%G%#%l%/%F%#%V$NCf$K$O!":GDc8B!"$I$N%[%9%H$,07$o$l$k$+$r<($9(B ServerName
$B%G%#%l%/%F%#%V$H(B$B!"(B
$B$=$N%[%9%HMQ$N%3%s%F%s%D$,%U%!%$%k%7%9%F%`>e$N$I$3$K$"$k$+$r<($9(B
DocumentRoot
$B%G%#%l%/%F%#%V$r(B
$B=q$/I,MW$,$"$j$^$9!#(B
$B4{$K$"$k%&%'%V%5!<%P$K%P!<%A%c%k%[%9%H$rDI2C$9$k>l9g!"(B
- $B4{B8$N%&%'%V%5!<%P$KBP$7$F$b(B <VirtualHost>
- $B%V%m%C%/$r:n$i$J$1$l$P$J$j$^$;$s!#$3$N%P!<%A%c%k%[%9%H$N(B
- ServerName
$B$H(B
- DocumentRoot
- $B$O!"%0%m!<%P%k$J(B ServerName
$B$H(B
- DocumentRoot
- $B$HF1$8$b$N$K$7$^$9!#$^$?!"$3$N%P!<%A%c%k%[%9%H$r@_Dj%U%!%$%k$NCf$G(B
- $B@hF,$KCV$$$F!"%G%U%)%k%H%[%9%H$H$7$FF0:n$9$k$h$&$K$7$^$9!#(B
$B4{$K$"$k%&%'%V%5!<%P$K%P!<%A%c%k%[%9%H$rDI2C$9$k>l9g!"(B
+ $B4{B8$N%&%'%V%5!<%P$KBP$7$F$b(B <VirtualHost>
+ $B%V%m%C%/$r:n$i$J$1$l$P$J$j$^$;$s!#$3$N%P!<%A%c%k%[%9%H$N(B
+ ServerName
$B$H(B
+ DocumentRoot
+ $B$O!"%0%m!<%P%k$J(B ServerName
$B$H(B
+ DocumentRoot
+ $B$HF1$8$b$N$K$7$^$9!#$^$?!"$3$N%P!<%A%c%k%[%9%H$r@_Dj%U%!%$%k$NCf$G(B
+ $B@hF,$KCV$$$F!"%G%U%)%k%H%[%9%H$H$7$FF0:n$9$k$h$&$K$7$^$9!#(B
$B$?$H$($P!"(Bwww.domain.tld
$B$rF0$+$7$F$$$F!"(B
@@ -122,26 +120,30 @@
$B$K0J2<$N$h$&$J%3!<%I$rDI2C$9$k$@$1$G$9(B
- NameVirtualHost *
-
- <VirtualHost *>
-
- ServerName www.domain.tld
- DocumentRoot /www/domain
-
- </VirtualHost>
-
- <VirtualHost *>
-
- ServerName www.otherdomain.tld
- DocumentRoot /www/otherdomain
-
- </VirtualHost>
+ NameVirtualHost *:80
+
+ <VirtualHost *:80>
+
+ ServerName www.domain.tld
+ ServerAlias domain.tld *.domain.tld
+ DocumentRoot /www/domain
+
+ </VirtualHost>
+
+ <VirtualHost *:80>
+ ServerName www.otherdomain.tld
+ DocumentRoot /www/otherdomain
+
+ </VirtualHost>
NameVirtualHost
$B5Z$S(B
VirtualHost
$B$N$I$A$i$N>l9g$b!"(B
- * $B$NItJ,$K$OL@<(E*$K(B IP $B%"%I%l%9$r;XDj$9$k$3$H$,$G$-$^$9!#(B
$BJ#?t$NL>A0$G%5!<%P%"%/%;%9$,$G$-$k$h$&$K$7$?$$$3$H$bB?$$$G$7$g$&!#(B
$B$3$N$h$&$J$3$H$O!"(BServerAlias
$B%G%#%l%/%F%#%V$r(B <VirtualHost>
@@ -150,10 +152,10 @@
$BA0$,!"(B
$B%f!<%6$,F10l$N%&%'%V%5%$%H$H$7$FL\$K$7$F;HMQ$G$-$k%5!<%PL>$G$"$k!"(B
$B$H(B ServerAlias
- $B%G%#%l%/%F%#%V$G;XDj$G$-(B$B$^$9!#(B
- ServerAlias domain.tld *.domain.tld
+ ServerAlias domain.tld *.domain.tld
domain.tld
$B%I%a%$%s$X$NA4$F$N%[%9%H$X$N%j%/%(%9%H$O(B
@@ -221,15 +223,15 @@
$B@_DjNc(B
- NameVirtualHost 111.22.33.44
-
- <VirtualHost 111.22.33.44>
-
- ServerName www.domain.tld
- ServerPath /domain
- DocumentRoot /web/domain
-
- </VirtualHost>
+ NameVirtualHost 111.22.33.44
+
+ <VirtualHost 111.22.33.44>
+
+ ServerName www.domain.tld
+ ServerPath /domain
+ DocumentRoot /web/domain
+
+ </VirtualHost>
$B$3$NNc$K$O$I$&$$$&0UL#$,$"$k$G$7$g$&$+(B? $B$3$l$O(B @@ -242,7 +244,7 @@ $B$H$$$&0UL#$G$9!#(B
$B$3$l$,F0:n$9$k$h$&$K$9$k$K$O!"(B
- $B%W(B$B%i%$%^%j$N%P!<%A%c%k%[%9%H$N%Z!<%8$K(B
+ $B%W%i%$%^%j$N%P!<%A%c%k%[%9%H$N%Z!<%8$K(B
http://www.domain.tld/domain/
$B$X$N%j%s%/$r@_CV$7$^$9!#(B
$B$=$7$F!"%P!<%A%c%k%[%9%H$N%Z!<%8$G$O!"=c?h$JAjBP%j%s%/(B ($BNc(B:
"file.html
" $B$d(B "../icons/image.gif
")$B!"(B
diff --git a/docs/manual/vhosts/name-based.xml.meta b/docs/manual/vhosts/name-based.xml.meta
index 3630d30c9e..5c011302e2 100644
--- a/docs/manual/vhosts/name-based.xml.meta
+++ b/docs/manual/vhosts/name-based.xml.meta
@@ -8,7 +8,7 @@