diff options
| -rw-r--r-- | docs/manual/howto/htaccess.xml.ja | 49 | ||||
| -rw-r--r-- | docs/manual/logs.xml.ja | 8 | ||||
| -rw-r--r-- | docs/manual/vhosts/ip-based.xml.ja | 10 |
3 files changed, 55 insertions, 12 deletions
diff --git a/docs/manual/howto/htaccess.xml.ja b/docs/manual/howto/htaccess.xml.ja index d88bc9663c..0c29239f3b 100644 --- a/docs/manual/howto/htaccess.xml.ja +++ b/docs/manual/howto/htaccess.xml.ja @@ -1,11 +1,11 @@ <?xml version='1.0' encoding='iso-2022-jp' ?> <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?> -<!-- English Revision: 151408:167970 (outdated) --> +<!-- English Revision: 167970 --> <!-- - Copyright 2003-2005 The Apache Software Foundation or its licensors, - as applicable. + Copyright 2003-2005 The Apache Software Foundation or its licensors, as + applicable. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -256,6 +256,49 @@ <code>/www/htdocs/example1/example2</code> $B$G$O(B CGI $B$N<B9T$O(B $B5v2D$5$l$^$;$s!#$3$l$O!"(B<code>Options Includes</code> $B$N$_$,(B $B8zNO$r;}$A!"$=$l$,$9$Y$F$N0JA0$N@_Dj$r>e=q$-$9$k$+$i$G$9!#(B</p> + + <section id="merge"><title>$B%a%$%s@_Dj%U%!%$%k$KBP$9$k(B + .htaccess $B$N%^!<%8(B</title> + + <p>As discussed in the documentation on <a + href="../sections.html">Configuration Sections</a>, + <code>.htaccess</code> files can override the <directive + type="section" module="core">Directory</directive> sections for + the corresponding directory, but will be overriden by other types + of configuration sections from the main configuration files. This + fact can be used to enforce certain configurations, even in the + presence of a liberal <directive + module="core">AllowOverride</directive> setting. For example, to + prevent script execution while allowing anything else to be set in + <code>.htaccess</code> you can use:</p> + <p><a href="../sections.html">$B%;%/%7%g%s$N@_Dj(B</a> + $B$K5-:\$5$l$F$$$k$h$&$K!"(B<code>.htaccess</code> $B%U%!%$%k$r;H$C$F(B + <directive type="section" module="core">Directory</directive> + $B%;%/%7%g%s$N@_Dj$r%G%#%l%/%H%jKh$K>e=q$-$G$-$^$9$,!"(B + $B%a%$%s@_Dj%U%!%$%kCf$K$"$k!"B>$N<oN`$N@_Dj%;%/%7%g%s$K$h$C$F(B + $B$5$i$K>e=q$-$5$l$k$3$H$b$"$j$^$9!#(B + $B$3$NFCD'$r;H$C$F!"(B + <directive module="core">AllowOverride</directive> + $B$G<+M3EY$N9b$$@_Dj$,$"$C$?$H$7$F$b!"$"$kFCDj$N@_Dj$,3N<B$K(B + $BH?1G$5$l$k$h$&$K$G$-$^$9!#Nc$($P!"(BCGI $B%9%/%j%W%H$N<B9T$O(B + $BIT5v2D$K!"$+$D!"(B<code>.htaccess</code> $B$G$=$NB>$N9`L\$O(B + $B@_Dj$G$-$k$h$&$K!"$H$$$&>l9g$O<!$N$h$&$K$G$-$^$9(B :</p> + + <example> +<Directory /><br /> +<indent> +Allowoverride All<br /> +</indent> +</Directory><br /> +<br /> +<Location /><br /> +<indent> +Options +IncludesNoExec -ExecCGI<br /> +</indent> +</Location> + </example> +</section> + </section> <section id="auth"><title>$BG'>Z$NNc(B</title> diff --git a/docs/manual/logs.xml.ja b/docs/manual/logs.xml.ja index e47fc9946a..ccf6cda4f9 100644 --- a/docs/manual/logs.xml.ja +++ b/docs/manual/logs.xml.ja @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="iso-2022-jp"?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?> -<!-- English Revision: 151408:165671 (outdated) --> +<!-- English Revision: 165671 --> <!-- - Copyright 2002-2005 The Apache Software Foundation or its licensors, - as applicable. + Copyright 2002-2005 The Apache Software Foundation or its licensors, as + applicable. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -242,7 +242,7 @@ (<code>%t</code>)</dt> <dd> - $B%5!<%P$,%j%/%(%9%H$N=hM}$r=*$($?;~9o$G$9!#=q<0$O(B: + $B%5!<%P$,%j%/%(%9%H$r<u$1<h$C$?;~9o$G$9!#=q<0$O(B: <p class="indent"> <code>[day/month/year:hour:minute:second zone]<br /> diff --git a/docs/manual/vhosts/ip-based.xml.ja b/docs/manual/vhosts/ip-based.xml.ja index 01c13eab5d..03efa3a1a3 100644 --- a/docs/manual/vhosts/ip-based.xml.ja +++ b/docs/manual/vhosts/ip-based.xml.ja @@ -1,11 +1,11 @@ <?xml version='1.0' encoding='iso-2022-jp' ?> <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?> -<!-- English Revision: 151408 --> +<!-- English Revision: 169327 --> <!-- - Copyright 2004-2005 The Apache Software Foundation or its licensors, - as applicable. + Copyright 2004-2005 The Apache Software Foundation or its licensors, as + applicable. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -143,8 +143,8 @@ $BMs$rD4$Y$F$/$@$5$$!#(B</p> <p><a href="../suexec.html">suEXEC$B%i%C%Q!<(B</a>$B$r;H$C$F$$$k>l9g$O!"(B - <directive module="mpm_common">User</directive> $B$H(B <directive - module="mpm_common">Group</directive> $B%G%#%l%/%F%#%V$r(B VirtualHost + <directive module="mod_suexec">SuexecUserGroup</directive> + $B%G%#%l%/%F%#%V$r(B VirtualHost $B%G%#%l%/%F%#%V$NCf$G;HMQ$9$k$3$H$,$G$-$^$9!#(B</p> <p><em>$B%;%-%e%j%F%#(B:</em> $B%m%0%U%!%$%k$r=q$/>l=j$r;XDj$9$k$H$-$O!"(B |