diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2002-10-07 21:04:45 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2002-10-07 21:04:45 +0000 |
| commit | 908fe14881fb9d53bfe0f1cc94945b82cb9dd485 (patch) | |
| tree | 08908fbaf1eab7220021f47bbc84e53f0c7e4a82 /usr.sbin/httpd | |
| parent | 07c8ffe3d5afa52d20a30be91dccc111fbc1824f (diff) | |
merge apache 1.3.27
Diffstat (limited to 'usr.sbin/httpd')
34 files changed, 818 insertions, 238 deletions
diff --git a/usr.sbin/httpd/htdocs/manual/bind.html.ja.jis b/usr.sbin/httpd/htdocs/manual/bind.html.ja.jis index 719fb654ac6..b012c00c7c0 100644 --- a/usr.sbin/httpd/htdocs/manual/bind.html.ja.jis +++ b/usr.sbin/httpd/htdocs/manual/bind.html.ja.jis @@ -9,8 +9,8 @@ </head> <!-- English revision: 1.17 --> <!-- Background white, links blue (unvisited), navy (visited), red (active) --> - <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" - vlink="#000080" alink="#FF0000"> + <body bgcolor="#ffffff" text="#000000" link="#0000ff" + vlink="#000080" alink="#ff0000"> <div align="CENTER"> <img src="images/sub.gif" alt="[APACHE DOCUMENTATION]" /> @@ -87,15 +87,15 @@ <p>$BJ#?t$N(B Listen $B%G%#%l%/%F%#%V$K$h$j!"(Blisten $B$9$k%"%I%l%9$H%]!<%H$r(B $B$$$/$D$b;XDj$9$k$3$H$b=PMh$^$9!#(B - $B%j%9%H$5$l$?%"%I%l%9$H%]!<%HA4$F$KBP$7$F1~Ez$7$^$9!#(B</p> + $B%j%9%H$5$l$?%"%I%l%9$H%]!<%H$9$Y$F$KBP$7$F1~Ez$7$^$9!#(B</p> - <p>$BNc$($P!"%]!<%H(B 80 $B$H(B 8000 $B$NN>J}$KBP$7$F$N@\B3$r<u$1IU$1$k$K$O(B</p> + <p>$B$?$H$($P!"%]!<%H(B 80 $B$H(B 8000 $B$NN>J}$KBP$7$F$N@\B3$r<u$1IU$1$k$K$O(B</p> <pre> Listen 80 Listen 8000 </pre> $B$H$7$^$9!#(B - 2 $B$D$N;XDj$5$l$?%$%s%?%U%'!<%9$H%]!<%HHV9f$KBP$7$F$N@\B3$r<u$1IU$1$k$K$O(B + $BFs$D$N;XDj$5$l$?%$%s%?%U%'!<%9$H%]!<%HHV9f$KBP$7$F$N@\B3$r<u$1IU$1$k$K$O(B <pre> Listen 192.170.2.1:80 Listen 192.170.2.5:8000 @@ -108,7 +108,7 @@ $B$o$1$G$O$"$j$^$;$s!#$=$l$i$O%a%$%s$N(B Apache $B%G!<%b%s%W%m%;%9$,$I$N%"%I%l%9(B $B$r%P%$%s%I$7!"$I$N%]!<%H$r(B listen $B$9$k$N$+$H$$$&$3$H$r;XDj$7$^$9!#(B <VirtualHost> - $B%G%#%l%/%F%#%V$,A4$/;H$o$l$J$$>l9g$O!"<u$1IU$1$?%j%/%(%9%HA4$F$KBP$7$F(B + $B%G%#%l%/%F%#%V$,A4$/;H$o$l$J$$>l9g$O!"<u$1IU$1$?%j%/%(%9%H$9$Y$F$KBP$7$F(B $BF1$8F0:n$r$7$^$9!#$7$+$7!"(B<VirtualHost> $B$r;H$C$F0l$D$"$k$$$OJ#?t$N(B $B%"%I%l%9$*$h$S%]!<%H$KBP$7$F0[$J$kF0:n$r$5$;$k$3$H$b=PMh$^$9!#(B $B%P!<%A%c%k%[%9%H$r9T$J$&$K$O!"%5!<%P$K$O<!$N$3$H$,I,MW$G$9!#(B diff --git a/usr.sbin/httpd/htdocs/manual/cygwin.html b/usr.sbin/httpd/htdocs/manual/cygwin.html index 3943a90efbf..e41b7eb45c8 100644 --- a/usr.sbin/httpd/htdocs/manual/cygwin.html +++ b/usr.sbin/httpd/htdocs/manual/cygwin.html @@ -353,7 +353,7 @@ <code>/bin/httpd</code> is started it has to dynamicly link <code>cyghttpd.dll</code> while runtime. That is why you have to place the shared core DLL - <code>cyghttpd.dll</code> to the same direcotry where + <code>cyghttpd.dll</code> to the same directory where <code>httpd.exe</code> resides, i.e. <code>/usr/local/apache/bin</code> or an other place in your <code>$PATH</code>.</p> diff --git a/usr.sbin/httpd/htdocs/manual/env.html.en b/usr.sbin/httpd/htdocs/manual/env.html.en index b01b47af28b..88dad998deb 100644 --- a/usr.sbin/httpd/htdocs/manual/env.html.en +++ b/usr.sbin/httpd/htdocs/manual/env.html.en @@ -264,6 +264,21 @@ <p>This disables <a href="mod/core.html#keepalive">KeepAlive</a> when set.</p> + + <h2>suppress-error-charset</h2> + <p><i>Available in versions after 1.3.26 and 2.0.40</i></p> + <p>When Apache issues a redirect in response to a client request, + the response includes some actual text to be displayed in case + the client can't (or doesn't) automatically follow the redirection. + Apache ordinarily labels this text according to the character set + which it uses, which is ISO-8859-1.</p> + <p> However, if the redirection is to a page that uses a different + character set, some broken browser versions will try to use the + character set from the redirection text rather than the actual page. + This can result in Greek, for instance, being incorrectly rendered.</p> + <p>Setting this environment variable causes Apache to omit the character + set for the redirection text, and these broken browsers will then correctly + use that of the destination page.</p> <hr /> <h2><a id="examples" name="examples">Examples</a></h2> diff --git a/usr.sbin/httpd/htdocs/manual/env.html.html b/usr.sbin/httpd/htdocs/manual/env.html.html index 80f44cad6db..3572a6f6079 100644 --- a/usr.sbin/httpd/htdocs/manual/env.html.html +++ b/usr.sbin/httpd/htdocs/manual/env.html.html @@ -266,6 +266,21 @@ <p>This disables <a href="mod/core.html#keepalive">KeepAlive</a> when set.</p> + + <h2>suppress-error-charset</h2> + <p><i>Available in versions after 1.3.26 and 2.0.40</i></p> + <p>When Apache issues a redirect in response to a client request, + the response includes some actual text to be displayed in case + the client can't (or doesn't) automatically follow the redirection. + Apache ordinarily labels this text according to the character set + which it uses, which is ISO-8859-1.</p> + <p> However, if the redirection is to a page that uses a different + character set, some broken browser versions will try to use the + character set from the redirection text rather than the actual page. + This can result in Greek, for instance, being incorrectly rendered.</p> + <p>Setting this environment variable causes Apache to omit the character + set for the redirection text, and these broken browsers will then correctly + use that of the destination page.</p> <hr /> <h2><a id="examples" name="examples">Examples</a></h2> diff --git a/usr.sbin/httpd/htdocs/manual/howto/auth.html b/usr.sbin/httpd/htdocs/manual/howto/auth.html index 4ff92033543..6966d536a24 100644 --- a/usr.sbin/httpd/htdocs/manual/howto/auth.html +++ b/usr.sbin/httpd/htdocs/manual/howto/auth.html @@ -314,9 +314,10 @@ htpasswd /usr/local/apache/passwd/passwords sungo that the web server itself can read the file. For example, if your server is configured to run as user <tt>nobody</tt> and group <tt>nogroup</tt>, then you should set permissions on the - file so that only that user can read the file:</p> + file so that only the webserver can read the file and only + root can write to it:</p> <pre> -chown nobody.nogroup /usr/local/apache/passwd/passwords +chown root.nogroup /usr/local/apache/passwd/passwords chmod 640 /usr/local/apache/passwd/passwords </pre> diff --git a/usr.sbin/httpd/htdocs/manual/howto/ssi.html.ja.jis b/usr.sbin/httpd/htdocs/manual/howto/ssi.html.ja.jis index f5250b492cd..f911aaab916 100644 --- a/usr.sbin/httpd/htdocs/manual/howto/ssi.html.ja.jis +++ b/usr.sbin/httpd/htdocs/manual/howto/ssi.html.ja.jis @@ -7,7 +7,7 @@ <title>Apache $B%A%e!<%H%j%"%k(B: Server Side Includes $BF~Lg(B</title> </head> - <!-- English revision: 1.9 --> + <!-- English revision: 1.11 --> <!-- Background white, links blue (unvisited), navy (visited), red (active) --> <body bgcolor="#ffffff" text="#000000" link="#0000ff" @@ -157,7 +157,12 @@ </pre> <p>$B$3$N;XDj$O!"%U%!%$%k$r(B SSI $B%G%#%l%/%F%#%V$G2r@O$5$;$k$3$H$r5v2D$9$k(B - $B$H$$$&$3$H$r(B Apache $B$KEA$($^$9!#(B</p> + $B$H$$$&$3$H$r(B Apache $B$KEA$($^$9!#(B + $B$[$H$s$I$N@_Dj$G$O$*8_$$$r>e=q$-$G$-$k!"J#?t$N(B + <a href="../mod/core.html#options">Options</a> $B$,$"$k$3$H$K(B + $BCm0U$7$F$/$@$5$$!#$*$=$i$/!"@_Dj$,:G8e$KI>2A$5$l$k$3$H$r(B + $BJ]>Z$5$l$k$?$a$K!"(BSSI $B$r;HMQ$7$?$$%G%#%l%/%H%j$K(B <code>Options</code> + $B%G%#%l%/%F%#%V$rE,MQ$9$kI,MW$,$"$k$G$7$g$&!#(B</p> <p>$BA4$F$N%U%!%$%k$,(B SSI $B%G%#%l%/%F%#%V$G2r@O$5$l$k$H$$$&$o$1$G$O$"$j$^$;$s!#(B $B$I$N%U%!%$%k$,2r@O$5$l$k$+$r(B Apache $B$KEA$($kI,MW$,$"$j$^$9!#(B @@ -320,7 +325,7 @@ <p><code>timefmt</code> $B=q<0$K$D$$$F$N$h$j>\:Y$K$D$$$F$O!"$*9%$_$N8!:w%5%$%H$K9T$-!"(B - <code>ctime</code> $B$G8!:w$7$F$_$F$/$@$5$$!#J8K!$OF1$8$G$9!#(B</p> + <code>strftime</code> $B$G8!:w$7$F$_$F$/$@$5$$!#J8K!$OF1$8$G$9!#(B</p> <hr /> <h2><a id="includingastandardfooter" diff --git a/usr.sbin/httpd/htdocs/manual/misc/FAQ.html b/usr.sbin/httpd/htdocs/manual/misc/FAQ.html index 8d731d68613..b44edbb2ae5 100644 --- a/usr.sbin/httpd/htdocs/manual/misc/FAQ.html +++ b/usr.sbin/httpd/htdocs/manual/misc/FAQ.html @@ -320,6 +320,10 @@ messages periodically, when I did not restart the server?</a></li> + <li><a href="#modulemagic">Why am I getting "module + <em>module-name</em> is not compatible with this version of + Apache" messages in my error log?</a></li> + </ol> </li> @@ -418,6 +422,11 @@ <li><a href="#options">Why do my Options directives not have the desired effect?</a></li> + <li><a href="#serverheader">How can I change the information + that Apache returns about itself in the headers?</a></li> + + <li><a href="#proxyscan">Why do I see requests for other sites + appearing in my log files?</a></li> </ol> </li> @@ -1891,10 +1900,10 @@ can safely ignore these error messages as they do not affect Apache. ApacheWeek has an <a href="http://www.apacheweek.com/features/codered">article</a> - with more information.</p> + with more information.</p><hr /> </li> - <li<a id="restart" name="restart"><b>Why am I getting server restart + <li><a id="restart" name="restart"><b>Why am I getting server restart messages periodically, when I did not restart the server?</b></a> <p>Problem: You are noticing restart messages in your error log, @@ -1909,7 +1918,26 @@ <p>Check your cron jobs to see when/if your server logs are being rotated. Compare the time of rotation to the error menage time. If they are the same, you can somewhat safely assume that the - restart is due to your server logs being rotated.</p> + restart is due to your server logs being rotated.</p><hr /> + </li> + + <li><a id="modulemagic" name="modulemagic"><b>Why am I getting + "module <em>module-name</em> is not compatible with this version + of Apache" messages in my error log?</b></a> + + <p>Module Magic Number (MMN) is a constant defined in Apache + source that is associated with binary compatibility of + modules. It is changed when internal Apache structures, + function calls and other significant parts of API change in + such a way that binary compatiblity cannot be guaranteed any + more. On MMN change, all third party modules have to be at + least recompiled, sometimes even slightly changed in order + to work with the new version of Apache.</p> + + <p>If you're getting the above error messages, contact the + vendor of the module for the new binary, or compile it if + you have access to the source code.</p><hr /> + </li> </ol> @@ -2520,9 +2548,25 @@ NameVirtualHost *<br /> <p>To turn on automatic directory indexing, find the <a href="../mod/core.html#options">Options</a> directive that applies to the directory and add the <code>Indexes</code> - keyword. To turn off automatic directory indexing, remove + keyword. For example:</p> + + <blockquote><code> + <Directory /path/to/directory><br /> + Options +Indexes<br /> + </Directory> + </code></blockquote> + + <p>To turn off automatic directory indexing, remove the <code>Indexes</code> keyword from the appropriate - <code>Options</code> line.</p> + <code>Options</code> line. To turn off directory listing + for a particular subdirectory, you can use + <code>Options -Indexes</code>. For example:</p> + + <blockquote><code> + <Directory /path/to/directory><br /> + Options -Indexes<br /> + </Directory> + </code></blockquote> <hr /></li> @@ -2561,6 +2605,132 @@ Options Includes ExecCGI<br /> <hr /></li> + + <li><a id="serverheader" name="servername"><strong>How can I change + the information that Apache returns about itself in the + headers?</strong></a> + + <p>When a client connects to Apache, part of the information returned in + the headers is the name "Apache" Additional information that can be sent + is the version number, such as "1.3.26", the operating system, and a + list of non-standard modules you have installed.</p> + + <p>For example:</p> + +<blockquote><code> +Server: Apache/1.3.26 (Unix) mod_perl/1.26 +</code></blockquote> + + <p>Frequently, people want to remove this information, under the mistaken + understanding that this will make the system more secure. This is + probably not the case, as the same exploits will likely be attempted + regardless of the header information you provide.</p> + + <p>There are, however, two answers to this question: the correct answer, + and the answer that you are probably looking for.</p> + + <p>The correct answer to this question is that you should use the + ServerTokens directive to alter the quantity of information which is + passed in the headers. Setting this directive to <code>Prod</code> will + pass the least possible amount of information:</p> + +<blockquote><code> +Server: Apache +</code></blockquote> + + <p>The answer you are probably looking for is how to make Apache lie + about what what it is, ie send something like:</p> + +<blockquote><code> +Server: Bob's Happy HTTPd Server +</code></blockquote> + + <p>In order to do this, you will need to modify the Apache source code and + rebuild Apache. This is not advised, as it is almost certain not to + provide you with the added security you think that you are gaining. The + exact method of doing this is left as an exercise for the reader, as we + are not keen on helping you do something that is intrinsically a bad + idea.</p> + + <hr /></li> + + <li><a id="proxyscan" name="proxyscan"><strong>Why do I see requests + for other sites appearing in my log files?</strong></a> + + <p>A an access_log entry showing this situation could look + like this:</p> + + <blockquote><code> 63.251.56.142 - - + [25/Jul/2002:12:48:04 -0700] "GET http://www.yahoo.com/ + HTTP/1.0" 200 1456 </code></blockquote> + + <p>The question is: why did a request for + <code>www.yahoo.com</code> come to your server instead of + Yahoo's server? And why does the response have a status + code of 200 (success)?</p> + + <p>This is usually the result of malicious clients trying to + exploit open proxy servers to access a website without + revealing their true location. If you find entries like this + in your log, the first thing to do is to make sure you have + properly configured your server not to proxy for unknown + clients. If you don't need to provide a proxy server at all, + you should simply assure that the <a + href="../mod/mod_proxy.html#proxyrequests">ProxyRequests</a> + directive is <strong>not</strong> set <code>on</code>. + If you do need to run a proxy server, then you must ensure + that you <a href="../mod/mod_proxy.html#access">secure your + server properly</a> so that only authorized clients can use + it.</p> + + <p>If your server is configured properly, then the attempt to + proxy through your server will fail. If you see a status + code of <code>404</code> (file not found) in the log, then + you know that the request failed. If you see a status code + of <code>200</code> (success), that does not necessarily mean + that the attempt to proxy succeeded. RFC2616 section 5.1.2 + mandates that Apache must accept requests with absolute URLs + in the request-URI, even for non-proxy requests. Since + Apache has no way to know all the different names that your + server may be known under, it cannot simply reject hostnames + it does not recognize. Instead, it will serve requests for + unknown sites locally by stripping off the hostname and using + the default server or virtual host. Therefore you can + compare the size of the file (1456 in the above example) to + the size of the corresponding file in your default server. + If they are the same, then the proxy attempt failed, since a + document from your server was delivered, not a document from + <code>www.yahoo.com</code>.</p> + + <p>If you wish to prevent this type of request entirely, then + you need to let Apache know what hostnames to accept and what + hostnames to reject. You do this by configuring name-virtual + hosts, where the first listed host is the default host that + will catch and reject unknown hostnames. For example:</p> + +<blockquote> +<pre> +NameVirtualHost * + +<VirtualHost *> + ServerName default.only + <Location /> + Order allow,deny + Deny from all + </Location> +</VirtualHost> + +<VirtualHost *> + ServerName realhost1.example.com + ServerAlias alias1.example.com alias2.example.com + DocumentRoot /path/to/site1 +</VirtualHost> + +... +</pre> +</blockquote> + <hr /></li> + </ol> diff --git a/usr.sbin/httpd/htdocs/manual/misc/fin_wait_2.html b/usr.sbin/httpd/htdocs/manual/misc/fin_wait_2.html index c4774dd3d71..5b4b8faa017 100644 --- a/usr.sbin/httpd/htdocs/manual/misc/fin_wait_2.html +++ b/usr.sbin/httpd/htdocs/manual/misc/fin_wait_2.html @@ -6,7 +6,6 @@ <meta name="generator" content="HTML Tidy, see www.w3.org" /> <title>Connections in FIN_WAIT_2 and Apache</title> - <link rev="made" href="mailto:marc@apache.org" /> </head> <!-- Background white, links blue (unvisited), navy (visited), red (active) --> @@ -254,10 +253,7 @@ patch available</a> for adding a timeout to the FIN_WAIT_2 state; it was originally intended for BSD/OS, but should be adaptable to most systems using BSD networking code. You - need kernel source code to be able to use it. If you do - adapt it to work for any other systems, please drop me a - note at <a - href="mailto:marc@apache.org">marc@apache.org</a>.</p> + need kernel source code to be able to use it. <h3>Compile without using <code>lingering_close()</code></h3> @@ -332,16 +328,9 @@ Off".</p> </li> - <li> - Feedback If you have any information to add to this page, - please contact me at <a - href="mailto:marc@apache.org">marc@apache.org</a>. - - <h2><a id="appendix" name="appendix"></a></h2> - </li> <li> - Appendix + <h2><a id="appendix" name="appendix">Appendix</a></h2> <p>Below is a message from Roy Fielding, one of the authors of HTTP/1.1.</p> diff --git a/usr.sbin/httpd/htdocs/manual/misc/perf.html b/usr.sbin/httpd/htdocs/manual/misc/perf.html index 506129bb232..24b345a1ba6 100644 --- a/usr.sbin/httpd/htdocs/manual/misc/perf.html +++ b/usr.sbin/httpd/htdocs/manual/misc/perf.html @@ -37,6 +37,8 @@ <li><a href="perf-hp.html">HPUX</a></li> + <li><a href="#irix">IRIX</a></li> + <li><a href="#Linux">Linux</a></li> <li><a href="#Solaris">Solaris</a></li> @@ -75,6 +77,14 @@ </ul> <hr /> + <h3><a id="irix" name="irix">IRIX</a></h3> + + <p>An SGI document covering tuning of IRIX 6.2 through 6.5 is + available from <a + href="http://gea.stanford.edu/SGI_tuning/">Stanford</a>.</p> + + <hr /> + <h3><a id="Linux" name="Linux">Linux</a></h3> There are no known problems with heavily loaded systems running Linux kernels 2.0.32 or later. Earlier kernels have some @@ -82,6 +92,7 @@ eliminate various security and denial of service attacks. <hr /> + <h3><a id="Solaris" name="Solaris">Solaris 2.4</a></h3> The Solaris 2.4 TCP implementation has a few inherent limitations that only became apparent under heavy loads. This @@ -165,8 +176,10 @@ <hr /> <h3>More welcome!</h3> - If you have tips to contribute, send mail to <a - href="mailto:apache@apache.org">apache@apache.org</a> + If you have tips to contribute, please submit them to + the <a href="http://www.apache.org/bug_report.html">Apache Bug + Database</a>. + <hr /> <h3 align="CENTER">Apache HTTP Server Version 1.3</h3> diff --git a/usr.sbin/httpd/htdocs/manual/misc/rewriteguide.html b/usr.sbin/httpd/htdocs/manual/misc/rewriteguide.html index 78642802323..345a9188bc2 100644 --- a/usr.sbin/httpd/htdocs/manual/misc/rewriteguide.html +++ b/usr.sbin/httpd/htdocs/manual/misc/rewriteguide.html @@ -1686,7 +1686,7 @@ HREF="*" <dd>How can we transform a static page <code>foo.html</code> into a dynamic variant - <code>foo.cgi</code> in a seemless way, i.e. without notice + <code>foo.cgi</code> in a seamless way, i.e. without notice by the browser/user.</dd> <dt><strong>Solution:</strong></dt> diff --git a/usr.sbin/httpd/htdocs/manual/misc/tutorials.html b/usr.sbin/httpd/htdocs/manual/misc/tutorials.html index 3c2771ccefd..f2938f25957 100644 --- a/usr.sbin/httpd/htdocs/manual/misc/tutorials.html +++ b/usr.sbin/httpd/htdocs/manual/misc/tutorials.html @@ -32,14 +32,6 @@ <h2>Installation & Getting Started</h2> <ul> - <li><a - href="http://apachetoday.com/news_story.php3?ltsn=2000-06-1-001-01-NW-DP-LF"> - Getting Started with Apache 1.3</a> (ApacheToday)</li> - - <li><a - href="http://apachetoday.com/news_story.php3?ltsn=2000-07-10-001-01-NW-LF-SW"> - Configuring Your Apache Server Installation</a> - (ApacheToday)</li> <li><a href="http://www.onlamp.com/pub/a/apache/2000/02/24/installing_apache.html"> @@ -54,6 +46,11 @@ href="http://www.devshed.com/Server_Side/Administration/APACHE/"> How to Build the Apache of Your Dreams</a> (Developer Shed)</li> + + <li><a + href="http://apache-server.com/tutorials/ATgetting-started.html">Getting + Started with Apache 1.3</a> (Ken Coar)</li> + </ul> <h2>Basic Configuration</h2> @@ -65,20 +62,17 @@ Apache DevCenter)</li> <li><a - href="http://apachetoday.com/news_story.php3?ltsn=2000-07-19-002-01-NW-LF-SW"> - Using .htaccess Files with Apache</a> (ApacheToday)</li> - - <li><a - href="http://apachetoday.com/news_story.php3?ltsn=2000-07-17-001-01-PS"> - Setting Up Virtual Hosts</a> (ApacheToday)</li> - - <li><a href="http://www.builder.com/Servers/Apache/ss02.html">Maximum Apache: Configure Apache</a> (CNET Builder.com)</li> <li><a href="http://www.devshed.com/Server_Side/Administration/MoreApache/"> Getting More Out of Apache</a> (Developer Shed)</li> + + <li><a + href="http://apache-server.com/tutorials/ATusing-htaccess.html">Using + .htaccess Files with Apache</a> (Ken Coar)</li> + </ul> <h2>Security</h2> @@ -104,19 +98,10 @@ href="http://linux.com/security/newsitem.phtml?sid=12&aid=3667"> Securing Apache - Access Control</a> (Linux.com)</li> - <li>Apache Authentication <a - href="http://apachetoday.com/news_story.php3?ltsn=2000-07-24-002-01-NW-LF-SW"> - Part 1</a> - <a - href="http://apachetoday.com/news_story.php3?ltsn=2000-07-31-001-01-NW-DP-LF"> - Part 2</a> - <a - href="http://apachetoday.com/news_story.php3?ltsn=2000-08-07-001-01-NW-LF-SW"> - Part 3</a> - <a - href="http://apachetoday.com/news_story.php3?ltsn=2000-08-14-001-01-NW-LF-SW"> - Part 4</a> (ApacheToday)</li> - <li><a - href="http://apachetoday.com/news_story.php3?ltsn=2000-11-13-003-01-SC-LF-SW"> - mod_access: Restricting Access by Host</a> (ApacheToday)</li> + href="http://apache-server.com/tutorials/LPsuexec.html">Using + Apache with suexec on Linux</a> (Ken Coar)</li> + </ul> <h2>Logging</h2> @@ -131,25 +116,11 @@ Visitor Information: Customising Your Logfiles</a> (Apacheweek)</li> - <li>Apache Guide: Logging <a - href="http://apachetoday.com/news_story.php3?ltsn=2000-08-21-003-01-NW-LF-SW"> - Part 1</a> - <a - href="http://apachetoday.com/news_story.php3?ltsn=2000-08-28-001-01-NW-LF-SW"> - Part 2</a> - <a - href="http://apachetoday.com/news_story.php3?ltsn=2000-09-05-001-01-NW-LF-SW"> - Part 3</a> - <a - href="http://apachetoday.com/news_story.php3?ltsn=2000-09-18-003-01-NW-LF-SW"> - Part 4</a> - <a - href="http://apachetoday.com/news_story.php3?ltsn=2000-09-25-001-01-NW-LF-SW"> - Part 5</a> (ApacheToday)</li> </ul> <h2>CGI and SSI</h2> <ul> - <li><a - href="http://apachetoday.com/news_story.php3?ltsn=2000-06-05-001-10-NW-LF-SW"> - Dynamic Content with CGI</a> (ApacheToday)</li> <li><a href="http://www.cpan.org/doc/FAQs/cgi/idiots-guide.html"> @@ -163,19 +134,13 @@ <li><a href="http://www.htmlhelp.org/faq/cgifaq.html">CGI Programming FAQ</a> (Web Design Group)</li> - <li>Introduction to Server Side Includes <a - href="http://apachetoday.com/news_story.php3?ltsn=2000-06-12-001-01-PS"> - Part 1</a> - <a - href="http://apachetoday.com/news_story.php3?ltsn=2000-06-19-002-01-NW-LF-SW"> - Part 2</a> (ApacheToday)</li> - - <li><a - href="http://apachetoday.com/news_story.php3?ltsn=2000-06-26-001-01-NW-LF-SW"> - Advanced SSI Techniques</a> (ApacheToday)</li> - <li><a href="http://www.builder.com/Servers/ApacheFiles/082400/">Setting up CGI and SSI with Apache</a> (CNET Builder.com)</li> + + <li><a + href="http://www.opendeveloper.org/modules.php?op=modload&name=Sections&file=index&req=viewarticle&artid=1&page=1">How + to Set Up Server Side Includes in Apache</a> (OpenDeveloper.org)</li> </ul> <h2>Other Features</h2> @@ -190,13 +155,12 @@ Apache Imagemaps</a> (Apacheweek)</li> <li><a - href="http://apachetoday.com/news_story.php3?ltsn=2000-06-14-002-01-PS"> - Keeping Your Images from Adorning Other Sites</a> - (ApacheToday)</li> - - <li><a href="http://ppewww.ph.gla.ac.uk/~flavell/www/lang-neg.html">Language Negotiation Notes</a> (Alan J. Flavell)</li> + + <li><a + href="http://apache-server.com/tutorials/ATimage-theft.html">Preventing + Image 'Theft'</a> (Ken Coar)</li> </ul> <p>If you have a pointer to an accurate and well-written diff --git a/usr.sbin/httpd/htdocs/manual/mod/core.html.en b/usr.sbin/httpd/htdocs/manual/mod/core.html.en index 7c1a58750da..c146201e064 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/core.html.en +++ b/usr.sbin/httpd/htdocs/manual/mod/core.html.en @@ -140,6 +140,8 @@ <li><a href="#port">Port</a></li> + <li><a href="#protocolreqcheck">ProtocolReqCheck</a></li> + <li><a href="#require">Require</a></li> <li><a href="#resourceconfig">ResourceConfig</a></li> @@ -175,6 +177,8 @@ <li><a href="#servertype">ServerType</a></li> + <li><a href="#shmemuidisuser">ShmemUIDisUser</a></li> + <li><a href="#startservers">StartServers</a></li> <li><a href="#threadsperchild">ThreadsPerChild</a></li> @@ -267,7 +271,7 @@ <a href="directive-dict.html#Syntax" rel="Help"><strong>Syntax:</strong></a> AccessConfig - <em>file-path</em>|<em>directory-path</em><br /> + <em>file-path</em>|<em>directory-path</em>|<em>wildcard-path</em><br /> <a href="directive-dict.html#Default" rel="Help"><strong>Default:</strong></a> <code>AccessConfig conf/access.conf</code><br /> @@ -306,9 +310,16 @@ <p>If <code>AccessConfig</code> points to a directory, rather than a file, Apache will read all files in that directory, and any - subdirectory, and parse those as configuration files. Note that - <emph>any</emph> file in the specified directory will be loaded as a - configuration file, so make sure that you don't have stray files in + subdirectory, and parse those as configuration files. + </p> + <p>Alternatively you can use a wildcard to limit the scope; i.e + to only *.conf files. + </p> + <p>Note that by default <emph>any</emph> file in the specified + directory will be loaded as a configuration file. + <p> + </p> + So make sure that you don't have stray files in this directory by mistake, such as temporary files created by your editor, for example.</p> @@ -390,6 +401,13 @@ <code>AddDefaultCharset utf-8</code> </blockquote> + <p><b>Note:</b> This will <b>not</b> have any effect on the + Content-Type and character set for default Apache-generated + status pages (such as '404 Not Found' or '301 Moved Permanently') + because those have an <i>actual</i> character set (that in which the + hard-coded page content is written) and don't need to have a default + applied.</p> + <hr /> <h2><a id="addmodule" name="addmodule">AddModule @@ -553,7 +571,7 @@ <blockquote><code>AuthName "Top Secret"</code></blockquote> - <p>The string provided for the <code>AuthRealm</code> is what will + <p>The string provided for the <code>AuthName</code> is what will appear in the password dialog provided by most browsers.</p> <p><strong>See also:</strong> <a @@ -1370,7 +1388,7 @@ subdirectory's includes '<code>FileETag -INode</code>', the setting for that subdirectory (which will be inherited by any sub-subdirectories that don't override it) will be equivalent to - '<code>FileETag MTime Size</code>'. + '<code>FileETag MTime Size</code>'. </p> <hr /> @@ -1592,8 +1610,7 @@ <p>This directive enables RFC1413-compliant logging of the remote user name for each connection, where the client machine runs identd or something similar. This information is logged in - the access log. <em>Boolean</em> is either <code>on</code> or - <code>off</code>.</p> + the access log.</p> <p>The information should not be trusted in any way except for rudimentary usage tracking.</p> @@ -1710,7 +1727,7 @@ <h2><a id="include" name="include">Include directive</a></h2> <strong>Syntax:</strong> Include - <em>file-path</em>|<em>directory-path</em><br /> + <em>file-path</em>|<em>directory-path</em>|<em>wildcard-path</em><br /> <a href="directive-dict.html#Context" rel="Help"><strong>Context:</strong></a> server config<br /> <a href="directive-dict.html#Status" @@ -1730,9 +1747,10 @@ <code>Include</code> points to a directory, rather than a file, Apache will read all files in that directory, and any subdirectory, and parse those as configuration files.</p> - + <p>By using a wildcard this can be further limited to, say, + just the '*.conf' files. + </p> <p>Examples:</p> - <blockquote> <code>Include /usr/local/apache/conf/ssl.conf<br /> Include /usr/local/apache/conf/vhosts/ @@ -2158,7 +2176,7 @@ Syntax OK <strong>See Also:</strong> <a href="../bind.html">Setting which addresses and ports Apache uses</a><br /> <strong>See Also:</strong> <a - href="http://www.apache.org/info/known_bugs.html#listenbug">Known + href="http://httpd.apache.org/info/known_bugs.html#listenbug">Known Bugs</a></p> <hr /> @@ -2906,6 +2924,34 @@ Syntax OK major security attack.</p> <hr /> + <h2><a id="protocolreqcheck" name="protocolreqcheck">ProtocolReqCheck + directive</a></h2> + + <a href="directive-dict.html#Syntax" + rel="Help"><strong>Syntax:</strong></a> ProtocolReqCheck + on|off<br /> + <a href="directive-dict.html#Default" + rel="Help"><strong>Default:</strong></a> <code>ProtocolReqCheck + on</code><br /> + <a href="directive-dict.html#Context" + rel="Help"><strong>Context:</strong></a> server config + <br /> + <a href="directive-dict.html#Status" + rel="Help"><strong>Status:</strong></a> core<br /> + <a href="directive-dict.html#Compatibility" + rel="Help"><strong>Compatibility:</strong></a> + ProtocolReqCheck is only available in Apache 1.3.27 and later. + + <p>This directive enables strict checking of the Protocol field + in the Request line. Versions of Apache prior to 1.3.26 would + silently accept bogus Protocols (such as <code>HTTP-1.1</code>) + and assume <code>HTTP/1.0</code>. Instead, now the Protocol field + must be valid. If the pre-1.3.26 behavior is desired or required, + it can be enabled via setting <code>ProtocolReqCheck off</code>. + </p> + + <hr /> + <h2><a id="require" name="require">Require directive</a></h2> <a href="directive-dict.html#Syntax" @@ -2975,7 +3021,7 @@ Syntax OK <a href="directive-dict.html#Syntax" rel="Help"><strong>Syntax:</strong></a> ResourceConfig - <em>file-path</em>|<em>directory-path</em><br /> + <em>file-path</em>|<em>directory-path</em>|<em>wildcard-path</em><br /> <a href="directive-dict.html#Default" rel="Help"><strong>Default:</strong></a> <code>ResourceConfig conf/srm.conf</code><br /> @@ -3013,11 +3059,19 @@ Syntax OK <p>If <code>ResourceConfig</code> points to a directory, rather than a file, Apache will read all files in that directory, and any - subdirectory, and parse those as configuration files. Note that - <emph>any</emph> file in the specified directory will be loaded as a - configuration file, so make sure that you don't have any stray files - in this directory by mistake, such as temporary files created by - your editor, for example.</p> + subdirectory, and parse those as configuration files. + </p> + <p>Alternatively you can use a wildcard to limit the scope; i.e + to only *.conf files. + </p> + <p>Note that by default <emph>any</emph> file in the specified + directory will be loaded as a configuration file. + <p> + </p> + So make sure that you don't have stray files in + this directory by mistake, such as temporary files created by your + editor, for example.</p> + <p>See also <a href="#accessconfig">AccessConfig</a>.</p> <hr /> @@ -3546,6 +3600,39 @@ Syntax OK only option.</p> <hr /> + <h2><a id="shmemuidisuser" name="shmemuidisuser">ShmemUIDisUser + directive</a></h2> + + <a href="directive-dict.html#Syntax" + rel="Help"><strong>Syntax:</strong></a> ShmemUIDisUser + <em>on|off</em><br /> + <a href="directive-dict.html#Default" + rel="Help"><strong>Default:</strong></a> <code>ShmemUIDisUser + off</code><br /> + <a href="directive-dict.html#Context" + rel="Help"><strong>Context:</strong></a> server config<br /> + <a href="directive-dict.html#Status" + rel="Help"><strong>Status:</strong></a> core<br /> + <a href="directive-dict.html#Compatibility" + rel="Help"><strong>Compatibility:</strong></a> + ShmemUIDisUser directive is only available in Apache 1.3.27 and later. + + <p>The ShmemUIDisUser directive controls whether Apache will change + the <code>uid</code> and <code>gid</code> ownership of System V shared memory + based scoreboards to the server settings of <a href="#user">User</a> and + <a href="#group">Group</a>. Releases of Apache up to 1.3.26 would do + this by default. Since the child processes are already attached to the + shared memory segment, this is not required for normal usage of Apache and + so to prevent possible abuse, Apache will no longer do that. The old + behavior may be required for special cases, however, which can be implemented + by setting this directive to <code>on</code>.</p> + + <p>This directive has no effect on non-System V based scoreboards, such as + <code>mmap</code>. + </p> + + <hr /> + <h2><a id="startservers" name="startservers">StartServers directive</a></h2> @@ -3682,20 +3769,27 @@ Syntax OK to the same server. With <code>UseCanonicalName on</code> (and in all versions prior to 1.3) Apache will use the <a href="#servername">ServerName</a> and <a href="#port">Port</a> - directives to construct a canonical name for the server. This + directives to construct the canonical name for the server. This name is used in all self-referential URLs, and for the values of <code>SERVER_NAME</code> and <code>SERVER_PORT</code> in CGIs.</p> + <p>For example, if <a href="#servername">ServerName</a> is set to + <code>www.example.com</code> and <a href="#port">Port</a> is set to + <code>9090</code>, then the <em>canonical name</em> of the server is + <code>www.example.com:9090</code>. In the event that + <code>Port</code> has its default value of <code>80</code>, the + <code>:80</code> is ommitted from the <em>canonical name</em>. + <p>With <code>UseCanonicalName off</code> Apache will form self-referential URLs using the hostname and port supplied by the client if any are supplied (otherwise it will use the - canonical name). These values are the same that are used to - implement <a href="../vhosts/name-based.html">name based - virtual hosts</a>, and are available with the same clients. The - CGI variables <code>SERVER_NAME</code> and - <code>SERVER_PORT</code> will be constructed from the client - supplied values as well.</p> + canonical name, as defined above). These values are the same + that are used to implement <a + href="../vhosts/name-based.html">name based virtual hosts</a>, + and are available with the same clients. The CGI variables + <code>SERVER_NAME</code> and <code>SERVER_PORT</code> will be + constructed from the client supplied values as well.</p> <p>An example where this may be useful is on an intranet server where you have users connecting to the machine using short @@ -3705,10 +3799,12 @@ Syntax OK slash</em> then Apache will redirect them to <code>http://www.domain.com/splat/</code>. If you have authentication enabled, this will cause the user to have to - reauthenticate twice (once for <code>www</code> and once again - for <code>www.domain.com</code>). But if - <code>UseCanonicalName</code> is set off, then Apache will - redirect to <code>http://www/splat/</code>.</p> + authenticate twice (once for <code>www</code> and once again + for <code>www.domain.com</code> -- see <a + href="../misc/FAQ.html#prompted-twice">the FAQ on this subject for + more information</a>). But if <code>UseCanonicalName</code> + is set off, then Apache will redirect to + <code>http://www/splat/</code>.</p> <p>There is a third option, <code>UseCanonicalName DNS</code>, which is intended for use with mass IP-based virtual hosting to diff --git a/usr.sbin/httpd/htdocs/manual/mod/core.html.fr b/usr.sbin/httpd/htdocs/manual/mod/core.html.fr index 9850bd7725f..9ad34f43d6b 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/core.html.fr +++ b/usr.sbin/httpd/htdocs/manual/mod/core.html.fr @@ -2114,7 +2114,7 @@ Listen 192.170.2.5:8000 <strong>Voir aussi:</strong> <a href="../bind.html">Configurer les ports et adresses utilisée par Apache</a><br /> <strong>Voir aussi :</strong> <a - href="http://www.apache.org/info/known_bugs.html#listenbug">Bogues + href="http://httpd.apache.org/info/known_bugs.html#listenbug">Bogues connus</a></p> <hr /> diff --git a/usr.sbin/httpd/htdocs/manual/mod/core.html.html b/usr.sbin/httpd/htdocs/manual/mod/core.html.html index b00e22245c7..34ec33b29de 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/core.html.html +++ b/usr.sbin/httpd/htdocs/manual/mod/core.html.html @@ -142,6 +142,8 @@ <li><a href="#port">Port</a></li> + <li><a href="#protocolreqcheck">ProtocolReqCheck</a></li> + <li><a href="#require">Require</a></li> <li><a href="#resourceconfig">ResourceConfig</a></li> @@ -177,6 +179,8 @@ <li><a href="#servertype">ServerType</a></li> + <li><a href="#shmemuidisuser">ShmemUIDisUser</a></li> + <li><a href="#startservers">StartServers</a></li> <li><a href="#threadsperchild">ThreadsPerChild</a></li> @@ -269,7 +273,7 @@ <a href="directive-dict.html#Syntax" rel="Help"><strong>Syntax:</strong></a> AccessConfig - <em>file-path</em>|<em>directory-path</em><br /> + <em>file-path</em>|<em>directory-path</em>|<em>wildcard-path</em><br /> <a href="directive-dict.html#Default" rel="Help"><strong>Default:</strong></a> <code>AccessConfig conf/access.conf</code><br /> @@ -308,9 +312,16 @@ <p>If <code>AccessConfig</code> points to a directory, rather than a file, Apache will read all files in that directory, and any - subdirectory, and parse those as configuration files. Note that - <emph>any</emph> file in the specified directory will be loaded as a - configuration file, so make sure that you don't have stray files in + subdirectory, and parse those as configuration files. + </p> + <p>Alternatively you can use a wildcard to limit the scope; i.e + to only *.conf files. + </p> + <p>Note that by default <emph>any</emph> file in the specified + directory will be loaded as a configuration file. + <p> + </p> + So make sure that you don't have stray files in this directory by mistake, such as temporary files created by your editor, for example.</p> @@ -392,6 +403,13 @@ <code>AddDefaultCharset utf-8</code> </blockquote> + <p><b>Note:</b> This will <b>not</b> have any effect on the + Content-Type and character set for default Apache-generated + status pages (such as '404 Not Found' or '301 Moved Permanently') + because those have an <i>actual</i> character set (that in which the + hard-coded page content is written) and don't need to have a default + applied.</p> + <hr /> <h2><a id="addmodule" name="addmodule">AddModule @@ -555,7 +573,7 @@ <blockquote><code>AuthName "Top Secret"</code></blockquote> - <p>The string provided for the <code>AuthRealm</code> is what will + <p>The string provided for the <code>AuthName</code> is what will appear in the password dialog provided by most browsers.</p> <p><strong>See also:</strong> <a @@ -1372,7 +1390,7 @@ subdirectory's includes '<code>FileETag -INode</code>', the setting for that subdirectory (which will be inherited by any sub-subdirectories that don't override it) will be equivalent to - '<code>FileETag MTime Size</code>'. + '<code>FileETag MTime Size</code>'. </p> <hr /> @@ -1594,8 +1612,7 @@ <p>This directive enables RFC1413-compliant logging of the remote user name for each connection, where the client machine runs identd or something similar. This information is logged in - the access log. <em>Boolean</em> is either <code>on</code> or - <code>off</code>.</p> + the access log.</p> <p>The information should not be trusted in any way except for rudimentary usage tracking.</p> @@ -1712,7 +1729,7 @@ <h2><a id="include" name="include">Include directive</a></h2> <strong>Syntax:</strong> Include - <em>file-path</em>|<em>directory-path</em><br /> + <em>file-path</em>|<em>directory-path</em>|<em>wildcard-path</em><br /> <a href="directive-dict.html#Context" rel="Help"><strong>Context:</strong></a> server config<br /> <a href="directive-dict.html#Status" @@ -1732,9 +1749,10 @@ <code>Include</code> points to a directory, rather than a file, Apache will read all files in that directory, and any subdirectory, and parse those as configuration files.</p> - + <p>By using a wildcard this can be further limited to, say, + just the '*.conf' files. + </p> <p>Examples:</p> - <blockquote> <code>Include /usr/local/apache/conf/ssl.conf<br /> Include /usr/local/apache/conf/vhosts/ @@ -2160,7 +2178,7 @@ Syntax OK <strong>See Also:</strong> <a href="../bind.html">Setting which addresses and ports Apache uses</a><br /> <strong>See Also:</strong> <a - href="http://www.apache.org/info/known_bugs.html#listenbug">Known + href="http://httpd.apache.org/info/known_bugs.html#listenbug">Known Bugs</a></p> <hr /> @@ -2908,6 +2926,34 @@ Syntax OK major security attack.</p> <hr /> + <h2><a id="protocolreqcheck" name="protocolreqcheck">ProtocolReqCheck + directive</a></h2> + + <a href="directive-dict.html#Syntax" + rel="Help"><strong>Syntax:</strong></a> ProtocolReqCheck + on|off<br /> + <a href="directive-dict.html#Default" + rel="Help"><strong>Default:</strong></a> <code>ProtocolReqCheck + on</code><br /> + <a href="directive-dict.html#Context" + rel="Help"><strong>Context:</strong></a> server config + <br /> + <a href="directive-dict.html#Status" + rel="Help"><strong>Status:</strong></a> core<br /> + <a href="directive-dict.html#Compatibility" + rel="Help"><strong>Compatibility:</strong></a> + ProtocolReqCheck is only available in Apache 1.3.27 and later. + + <p>This directive enables strict checking of the Protocol field + in the Request line. Versions of Apache prior to 1.3.26 would + silently accept bogus Protocols (such as <code>HTTP-1.1</code>) + and assume <code>HTTP/1.0</code>. Instead, now the Protocol field + must be valid. If the pre-1.3.26 behavior is desired or required, + it can be enabled via setting <code>ProtocolReqCheck off</code>. + </p> + + <hr /> + <h2><a id="require" name="require">Require directive</a></h2> <a href="directive-dict.html#Syntax" @@ -2977,7 +3023,7 @@ Syntax OK <a href="directive-dict.html#Syntax" rel="Help"><strong>Syntax:</strong></a> ResourceConfig - <em>file-path</em>|<em>directory-path</em><br /> + <em>file-path</em>|<em>directory-path</em>|<em>wildcard-path</em><br /> <a href="directive-dict.html#Default" rel="Help"><strong>Default:</strong></a> <code>ResourceConfig conf/srm.conf</code><br /> @@ -3015,11 +3061,19 @@ Syntax OK <p>If <code>ResourceConfig</code> points to a directory, rather than a file, Apache will read all files in that directory, and any - subdirectory, and parse those as configuration files. Note that - <emph>any</emph> file in the specified directory will be loaded as a - configuration file, so make sure that you don't have any stray files - in this directory by mistake, such as temporary files created by - your editor, for example.</p> + subdirectory, and parse those as configuration files. + </p> + <p>Alternatively you can use a wildcard to limit the scope; i.e + to only *.conf files. + </p> + <p>Note that by default <emph>any</emph> file in the specified + directory will be loaded as a configuration file. + <p> + </p> + So make sure that you don't have stray files in + this directory by mistake, such as temporary files created by your + editor, for example.</p> + <p>See also <a href="#accessconfig">AccessConfig</a>.</p> <hr /> @@ -3548,6 +3602,39 @@ Syntax OK only option.</p> <hr /> + <h2><a id="shmemuidisuser" name="shmemuidisuser">ShmemUIDisUser + directive</a></h2> + + <a href="directive-dict.html#Syntax" + rel="Help"><strong>Syntax:</strong></a> ShmemUIDisUser + <em>on|off</em><br /> + <a href="directive-dict.html#Default" + rel="Help"><strong>Default:</strong></a> <code>ShmemUIDisUser + off</code><br /> + <a href="directive-dict.html#Context" + rel="Help"><strong>Context:</strong></a> server config<br /> + <a href="directive-dict.html#Status" + rel="Help"><strong>Status:</strong></a> core<br /> + <a href="directive-dict.html#Compatibility" + rel="Help"><strong>Compatibility:</strong></a> + ShmemUIDisUser directive is only available in Apache 1.3.27 and later. + + <p>The ShmemUIDisUser directive controls whether Apache will change + the <code>uid</code> and <code>gid</code> ownership of System V shared memory + based scoreboards to the server settings of <a href="#user">User</a> and + <a href="#group">Group</a>. Releases of Apache up to 1.3.26 would do + this by default. Since the child processes are already attached to the + shared memory segment, this is not required for normal usage of Apache and + so to prevent possible abuse, Apache will no longer do that. The old + behavior may be required for special cases, however, which can be implemented + by setting this directive to <code>on</code>.</p> + + <p>This directive has no effect on non-System V based scoreboards, such as + <code>mmap</code>. + </p> + + <hr /> + <h2><a id="startservers" name="startservers">StartServers directive</a></h2> @@ -3684,20 +3771,27 @@ Syntax OK to the same server. With <code>UseCanonicalName on</code> (and in all versions prior to 1.3) Apache will use the <a href="#servername">ServerName</a> and <a href="#port">Port</a> - directives to construct a canonical name for the server. This + directives to construct the canonical name for the server. This name is used in all self-referential URLs, and for the values of <code>SERVER_NAME</code> and <code>SERVER_PORT</code> in CGIs.</p> + <p>For example, if <a href="#servername">ServerName</a> is set to + <code>www.example.com</code> and <a href="#port">Port</a> is set to + <code>9090</code>, then the <em>canonical name</em> of the server is + <code>www.example.com:9090</code>. In the event that + <code>Port</code> has its default value of <code>80</code>, the + <code>:80</code> is ommitted from the <em>canonical name</em>. + <p>With <code>UseCanonicalName off</code> Apache will form self-referential URLs using the hostname and port supplied by the client if any are supplied (otherwise it will use the - canonical name). These values are the same that are used to - implement <a href="../vhosts/name-based.html">name based - virtual hosts</a>, and are available with the same clients. The - CGI variables <code>SERVER_NAME</code> and - <code>SERVER_PORT</code> will be constructed from the client - supplied values as well.</p> + canonical name, as defined above). These values are the same + that are used to implement <a + href="../vhosts/name-based.html">name based virtual hosts</a>, + and are available with the same clients. The CGI variables + <code>SERVER_NAME</code> and <code>SERVER_PORT</code> will be + constructed from the client supplied values as well.</p> <p>An example where this may be useful is on an intranet server where you have users connecting to the machine using short @@ -3707,10 +3801,12 @@ Syntax OK slash</em> then Apache will redirect them to <code>http://www.domain.com/splat/</code>. If you have authentication enabled, this will cause the user to have to - reauthenticate twice (once for <code>www</code> and once again - for <code>www.domain.com</code>). But if - <code>UseCanonicalName</code> is set off, then Apache will - redirect to <code>http://www/splat/</code>.</p> + authenticate twice (once for <code>www</code> and once again + for <code>www.domain.com</code> -- see <a + href="../misc/FAQ.html#prompted-twice">the FAQ on this subject for + more information</a>). But if <code>UseCanonicalName</code> + is set off, then Apache will redirect to + <code>http://www/splat/</code>.</p> <p>There is a third option, <code>UseCanonicalName DNS</code>, which is intended for use with mass IP-based virtual hosting to diff --git a/usr.sbin/httpd/htdocs/manual/mod/directives.html.en b/usr.sbin/httpd/htdocs/manual/mod/directives.html.en index c363dba392a..8bc8dc53877 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/directives.html.en +++ b/usr.sbin/httpd/htdocs/manual/mod/directives.html.en @@ -220,6 +220,8 @@ <li><a href="core.html#defaulttype">DefaultType</a></li> + <li><a href="mod_define.html#define">Define</a> + <li><a href="mod_access.html#deny">Deny</a></li> <li><a href="core.html#directory"><Directory></a></li> @@ -400,6 +402,8 @@ <li><a href="core.html#port">Port</a></li> + <li><a href="core.html#protocolreqcheck">ProtocolReqCheck</a></li> + <li><a href="mod_proxy.html#proxyblock">ProxyBlock</a></li> <li><a href="mod_proxy.html#proxydomain">ProxyDomain</a></li> @@ -535,6 +539,30 @@ <li><a href="mod_mime.html#sethandler">SetHandler</a></li> + <li><a href="core.html#shmemuidisuser">ShmemUIDisUser</a></li> + + <li><a href="mod_ssl/ssl_reference.html#SSLPassPhraseDialog">SSLPassPhraseDialog</a> + <li><a href="mod_ssl/ssl_reference.html#SSLMutex">SSLMutex</a> + <li><a href="mod_ssl/ssl_reference.html#SSLRandomSeed">SSLRandomSeed</a> + <li><a href="mod_ssl/ssl_reference.html#SSLSessionCache">SSLSessionCache</a> + <li><a href="mod_ssl/ssl_reference.html#SSLSessionCacheTimeout">SSLSessionCacheTimeout</a> + <li><a href="mod_ssl/ssl_reference.html#SSLEngine">SSLEngine</a> + <li><a href="mod_ssl/ssl_reference.html#SSLProtocol">SSLProtocol</a> + <li><a href="mod_ssl/ssl_reference.html#SSLCipherSuite">SSLCipherSuite</a> + <li><a href="mod_ssl/ssl_reference.html#SSLCertificateFile">SSLCertificateFile</a> + <li><a href="mod_ssl/ssl_reference.html#SSLCertificateKeyFile">SSLCertificateKeyFile</a> + <li><a href="mod_ssl/ssl_reference.html#SSLCACertificatePath">SSLCACertificatePath</a> + <li><a href="mod_ssl/ssl_reference.html#SSLCACertificateFile">SSLCACertificateFile</a> + <li><a href="mod_ssl/ssl_reference.html#SSLCARevocationPath">SSLCARevocationPath</a> + <li><a href="mod_ssl/ssl_reference.html#SSLCARevocationFile">SSLCARevocationFile</a> + <li><a href="mod_ssl/ssl_reference.html#SSLVerifyClient">SSLVerifyClient</a> + <li><a href="mod_ssl/ssl_reference.html#SSLVerifyDepth">SSLVerifyDepth</a> + <li><a href="mod_ssl/ssl_reference.html#SSLLog">SSLLog</a> + <li><a href="mod_ssl/ssl_reference.html#SSLLogLevel">SSLLogLevel</a> + <li><a href="mod_ssl/ssl_reference.html#SSLOptions">SSLOptions</a> + <li><a href="mod_ssl/ssl_reference.html#SSLRequireSSL">SSLRequireSSL</a> + <li><a href="mod_ssl/ssl_reference.html#SSLRequire">SSLRequire</a> + <li><a href="core.html#startservers">StartServers</a></li> <li><a diff --git a/usr.sbin/httpd/htdocs/manual/mod/directives.html.html b/usr.sbin/httpd/htdocs/manual/mod/directives.html.html index 5f8025b502a..ac29ce7a470 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/directives.html.html +++ b/usr.sbin/httpd/htdocs/manual/mod/directives.html.html @@ -402,6 +402,8 @@ <li><a href="core.html#port">Port</a></li> + <li><a href="core.html#protocolreqcheck">ProtocolReqCheck</a></li> + <li><a href="mod_proxy.html#proxyblock">ProxyBlock</a></li> <li><a href="mod_proxy.html#proxydomain">ProxyDomain</a></li> @@ -537,6 +539,8 @@ <li><a href="mod_mime.html#sethandler">SetHandler</a></li> + <li><a href="core.html#shmemuidisuser">ShmemUIDisUser</a></li> + <li><a href="core.html#startservers">StartServers</a></li> <li><a diff --git a/usr.sbin/httpd/htdocs/manual/mod/directives.html.ja.jis b/usr.sbin/httpd/htdocs/manual/mod/directives.html.ja.jis index dcf484d8d85..7f1d0f27765 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/directives.html.ja.jis +++ b/usr.sbin/httpd/htdocs/manual/mod/directives.html.ja.jis @@ -7,7 +7,7 @@ <title>Apache $B%G%#%l%/%F%#%V(B</title> </head> - <!-- English revision: 1.74 --> + <!-- English revision: 1.75 --> <!-- Background white, links blue (unvisited), navy (visited), red (active) --> <body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#000080" alink="#ff0000"> @@ -398,6 +398,8 @@ <li><a href="core.html#port">Port</a></li> + <li><a href="core.html#protocolreqcheck">ProtocolReqCheck</a></li> + <li><a href="mod_proxy.html#proxyblock">ProxyBlock</a></li> <li><a href="mod_proxy.html#proxydomain">ProxyDomain</a></li> diff --git a/usr.sbin/httpd/htdocs/manual/mod/index-bytype.html.en b/usr.sbin/httpd/htdocs/manual/mod/index-bytype.html.en index c5c8d7998fc..b211f866f46 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/index-bytype.html.en +++ b/usr.sbin/httpd/htdocs/manual/mod/index-bytype.html.en @@ -254,6 +254,11 @@ <dd>Experimental file caching, mapping files into memory to improve performace</dd> + + <dt><a href="mod_ssl/index.html">mod_ssl</a> Apache 1.3 with mod_ssl + applied</dt> + + <dd>Apache SSL interface to OpenSSL</dd> </dl> <h2>Development</h2> diff --git a/usr.sbin/httpd/htdocs/manual/mod/index.html.en b/usr.sbin/httpd/htdocs/manual/mod/index.html.en index e8008f91558..1773eab64fb 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/index.html.en +++ b/usr.sbin/httpd/htdocs/manual/mod/index.html.en @@ -101,6 +101,10 @@ <dd>Support for Netscape-like cookies. Replaced in Apache 1.2 by mod_usertrack</dd> + <dt><a href="mod_define.html">mod_define</a></dt> + + <dd>Variable Definition for Arbitrary Directives</dd> + <dt><a href="mod_digest.html">mod_digest</a> Apache 1.1 and up</dt> @@ -215,6 +219,11 @@ <dt><a href="mod_speling.html">mod_speling</a> Apache 1.3 and up</dt> + <dt><a href="mod_ssl/index.html">mod_ssl</a> Apache 1.3 with mod_ssl + applied</dt> + + <dd>Apache SSL interface to OpenSSL</dd> + <dd>Automatically correct minor typos in URLs</dd> <dt><a href="mod_status.html">mod_status</a> Apache 1.1 and diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_access.html.en b/usr.sbin/httpd/htdocs/manual/mod/mod_access.html.en index a55cd16f226..c99341eb799 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_access.html.en +++ b/usr.sbin/httpd/htdocs/manual/mod/mod_access.html.en @@ -52,7 +52,7 @@ <p>Both host-based access restrictions and password-based authentication may be implemented simultaneously. In that case, - the <a href="core.html#satsify">Satisfy</a> directive is used + the <a href="core.html#satisfy">Satisfy</a> directive is used to determine how the two sets of restrictions interact.</p> <p>In general, access restriction directives apply to all diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_access.html.html b/usr.sbin/httpd/htdocs/manual/mod/mod_access.html.html index af0b80cc74c..cdf076cee45 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_access.html.html +++ b/usr.sbin/httpd/htdocs/manual/mod/mod_access.html.html @@ -54,7 +54,7 @@ <p>Both host-based access restrictions and password-based authentication may be implemented simultaneously. In that case, - the <a href="core.html#satsify">Satisfy</a> directive is used + the <a href="core.html#satisfy">Satisfy</a> directive is used to determine how the two sets of restrictions interact.</p> <p>In general, access restriction directives apply to all diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html.en b/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html.en index d35fd74ca1e..642e8c8c70f 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html.en +++ b/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html.en @@ -30,7 +30,7 @@ mod_actions.c<br /> <a href="module-dict.html#ModuleIdentifier" rel="Help"><strong>Module Identifier:</strong></a> - actions_module<br /> + action_module<br /> <a href="module-dict.html#Compatibility" rel="Help"><strong>Compatibility:</strong></a> Available in Apache 1.1 and later.</p> diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html.html b/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html.html index d605c880dfb..e813007011f 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html.html +++ b/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html.html @@ -32,7 +32,7 @@ mod_actions.c<br /> <a href="module-dict.html#ModuleIdentifier" rel="Help"><strong>Module Identifier:</strong></a> - actions_module<br /> + action_module<br /> <a href="module-dict.html#Compatibility" rel="Help"><strong>Compatibility:</strong></a> Available in Apache 1.1 and later.</p> diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html.ja.jis b/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html.ja.jis index b76688444ff..f3a5449b0d8 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html.ja.jis +++ b/usr.sbin/httpd/htdocs/manual/mod/mod_actions.html.ja.jis @@ -7,7 +7,7 @@ <title>Module mod_actions</title> </head> - <!-- English revision: 1.18 --> + <!-- English revision: 1.19 --> <!-- Background white, links blue (unvisited), navy (visited), red (active) --> <body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#000080" alink="#ff0000"> @@ -30,7 +30,7 @@ mod_actions.c<br /> <a href="module-dict.html#moduleidentifier" rel="help"><strong>$B%b%8%e!<%k<1JL;R(B:</strong></a> - actions_module<br /> + action_module<br /> <a href="module-dict.html#compatibility" rel="help"><strong>$B8_49@-(B:</strong></a> Apache 1.1 $B0J9_$G$N$_;HMQ2DG=!#(B</p> diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_headers.html b/usr.sbin/httpd/htdocs/manual/mod/mod_headers.html index 41a230f0b3e..c2984d99dab 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_headers.html +++ b/usr.sbin/httpd/htdocs/manual/mod/mod_headers.html @@ -43,6 +43,7 @@ <ul> <li><a href="#header">Header</a></li> + <li><a href="#errorheader">ErrorHeader</a></li> </ul> <hr /> @@ -61,10 +62,14 @@ <a href="directive-dict.html#Status" rel="Help"><strong>Status:</strong></a> Extension<br /> <a href="directive-dict.html#Module" - rel="Help"><strong>Module:</strong></a> mod_header + rel="Help"><strong>Module:</strong></a> mod_headers <p>This directive can replace, merge or remove HTTP response - headers. The action it performs is determined by the first + headers during 1xx and 2xx series replies. For 3xx, 4xx and 5xx + use the ErrorHeader directive. + </p> + <p> + The action it performs is determined by the first argument. This can be one of the following values:</p> <ul> @@ -133,6 +138,32 @@ Header unset Author overridden. This includes headers such as "Date" and "Server".</p> + <h2><a id="errorheader" name="errorheader">ErrorHeader</a> directive</h2> + <a href="directive-dict.html#Syntax" + rel="Help"><strong>Syntax:</strong></a> ErrorHeader set|append|add + <em>header</em> <em>value</em><br /> + <a href="directive-dict.html#Syntax" + rel="Help"><strong>Syntax:</strong></a> ErrorHeader unset + <em>header</em><br /> + <a href="directive-dict.html#Context" + rel="Help"><strong>Context:</strong></a> server config, virtual + host, access.conf, .htaccess<br /> + <a href="directive-dict.html#Override" + rel="Help"><strong>Override:</strong></a> FileInfo<br /> + <a href="directive-dict.html#Status" + rel="Help"><strong>Status:</strong></a> Extension<br /> + <a href="directive-dict.html#Module" + rel="Help"><strong>Module:</strong></a> mod_headers + + <p>This directive can replace, merge or remove HTTP response + headers during 3xx, 4xx and 5xx replies. For normal replies + use the Header directive. + </p> + <p>This directive is identical to the <a href="#header">Header</a> + directive in all other respects. Consult this directive for + more information on the syntax. + </P> + <p> <hr /> <h3 align="CENTER">Apache HTTP Server Version 1.3</h3> diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_info.html.en b/usr.sbin/httpd/htdocs/manual/mod/mod_info.html.en index 0bb36eb6d57..4a0b92a73ab 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_info.html.en +++ b/usr.sbin/httpd/htdocs/manual/mod/mod_info.html.en @@ -74,6 +74,14 @@ SetHandler server-info files, including <em>per</em>-directory files (<em>e.g.</em>, <samp>.htaccess</samp>). This may have security-related ramifications for your site.</strong></p> + + <p>In particular, this module can leak sensitive information + from the configuration directives of other Apache modules such as + system paths, usernames/passwords, database names, etc. Due to + the way this module works there is no way to block information + from it. Therefore, this module should ONLY be used in a controlled + environment and always with caution.</p> + </blockquote> <hr /> diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_info.html.html b/usr.sbin/httpd/htdocs/manual/mod/mod_info.html.html index bd60de7d41b..8bfc88ba822 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_info.html.html +++ b/usr.sbin/httpd/htdocs/manual/mod/mod_info.html.html @@ -76,6 +76,14 @@ SetHandler server-info files, including <em>per</em>-directory files (<em>e.g.</em>, <samp>.htaccess</samp>). This may have security-related ramifications for your site.</strong></p> + + <p>In particular, this module can leak sensitive information + from the configuration directives of other Apache modules such as + system paths, usernames/passwords, database names, etc. Due to + the way this module works there is no way to block information + from it. Therefore, this module should ONLY be used in a controlled + environment and always with caution.</p> + </blockquote> <hr /> diff --git a/usr.sbin/httpd/htdocs/manual/mod/mod_mime.html.ja.jis b/usr.sbin/httpd/htdocs/manual/mod/mod_mime.html.ja.jis index 55261131a97..131cca441cf 100644 --- a/usr.sbin/httpd/htdocs/manual/mod/mod_mime.html.ja.jis +++ b/usr.sbin/httpd/htdocs/manual/mod/mod_mime.html.ja.jis @@ -7,7 +7,7 @@ <title>Apache module mod_mime</title> </head> - <!-- English revision: 1.48 --> + <!-- English revision: 1.49 --> <!-- Background white, links blue (unvisited), navy (visited), red (active) --> <body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#000080" alink="#ff0000"> diff --git a/usr.sbin/httpd/htdocs/manual/new_features_1_1.html b/usr.sbin/httpd/htdocs/manual/new_features_1_1.html index c7fa49e542e..2b2f85dcd11 100644 --- a/usr.sbin/httpd/htdocs/manual/new_features_1_1.html +++ b/usr.sbin/httpd/htdocs/manual/new_features_1_1.html @@ -77,7 +77,7 @@ and its resource consumption. It also gives the current state of each server process including the current URL being processed. For an example, check out <a - href="http://www.apache.org/status">the status of the + href="http://www.apache.org/server-status">the status of the www.apache.org server</a>.</li> <li><strong><a href="mod/mod_info.html">Server Information @@ -85,7 +85,7 @@ information about the other modules installed, their directives, and their configurations. It is extremely helpful in debugging configuration problems. For an example, check - out <a href="http://www.apache.org/serv-info">information + out <a href="http://www.apache.org/server-info">information about the www.apache.org server</a>.</li> <li><strong><a href="mod/mod_proxy.html">Experimental Caching diff --git a/usr.sbin/httpd/htdocs/manual/readme-tpf.html b/usr.sbin/httpd/htdocs/manual/readme-tpf.html index d63723afdd6..5f1c27cbb3c 100644 --- a/usr.sbin/httpd/htdocs/manual/readme-tpf.html +++ b/usr.sbin/httpd/htdocs/manual/readme-tpf.html @@ -17,11 +17,12 @@ <hr /> <center> - [ <a href="#configuration_files">Configuration - Files</a> | <a href="#whats_available">What's - Available</a> | <a href="#cgi">CGI Scripts</a> | - <a href="#options">Options</a> | <a - href="#porting_notes">Porting Notes</a> ] + [ <a href="#configuration_files">Configuration Files</a> + | <a href="#whats_available">What's Available</a> + | <a href="#cgi">CGI Scripts</a> + | <a href="#options">Options</a> + | <a href="#syslog">Syslog</a> + | <a href="#porting_notes">Porting Notes</a> ] </center> <hr /> @@ -207,6 +208,9 @@ <li>rotatelogs.c <em>(requires PUT10; if PJ27214 implemented be sure to apply PJ28367) </em></li> + <li>syslog <em>(requires PUT13; see <a href="install-tpf.html#syslog">install</a> + and <a href="#syslog">usage</a> instructions) </em></li> + <li>util.c </li> <li>util_date.c </li> @@ -225,6 +229,8 @@ <li>lib/expat-lite </li> + <li>lib/sdbm </li> + <li>mod_auth_digest.c </li> <li>mod_rewrite.c </li> @@ -350,65 +356,106 @@ <a id="options" name="options"></a> <center> - <h2>How to Use Apache Command Line Options</h2> + <h2>How to Use Apache's "Dash" Options</h2> </center> - <p>You cannot run Apache from the command line on TPF. However - you can use those Apache command line options which don't - actually start the server. This requires PJ27277 which shipped - on PUT13.</p> - - <h3>Supported Apache options:</h3> - - <div style="margin-left: 2em"> - <p>-d <i>directory</i><br /> - Specify an alternate initial ServerRoot <i>directory</i>. - Default is <tt>/usr/local/apache</tt>.</p> - - <p>-f <i>file</i><br /> - Specify an alternate server configuration <i>file</i>. - Default is <tt>conf/httpd.conf</tt>.</p> + <h3>Overview of Apache's "dash" options:</h3> - <p>-h<br /> - List a short summary of available command line options. - (Note that this outputs all options, not just those supported - on TPF.)</p> + <p>Apache can be invoked with various options, such as "-f". + Some of these options display information about the server or perform syntax checks + but they don't actually start the server. + These "information only" options are useful with TPF's ZFILE command line feature: + -h, -l, -L, -S, -t, -T, -v, and -V. + </p> - <p>-l<br /> - List modules compiled into the server.</p> + <p>Another option, -X, is used when actually running the server. + It is passed to Apache through the ZINET XPARM field since ZINET is the only way to start the server on TPF.</p> - <p>-L<br /> - List available configuration directives. (Note that this - outputs all configuration directives, not just those - supported on TPF.)</p> + <p>A third group of options apply to both the informational displays (ZFILE) and + running the server (ZINET XPARM): -d, -D and -f.</p> - <p>-S<br /> - Show the settings as parsed from the configuration file. - Currently only shows the virtualhost settings.</p> + <p>The rest of Apache's options are either not applicable or are not supported on TPF.</p> - <p>-t<br /> - Run syntax tests for configuration files (with document root - checks)</p> + <p>Using dash options requires PJ27277 which shipped on PUT13.</p> - <p>-T<br /> - Run syntax tests for configuration files (without document - root checks)</p> + <h3>Table of supported Apache options</h3> - <p>-v<br /> - Show the version number.</p> - - <p>-V<br /> - Show the version number and various compile settings.</p> - - <p>See <a - href="http://httpd.apache.org/docs/programs/httpd.html">http://httpd.apache.org/docs/programs/httpd.html</a> - for more information about these command line options.</p> - - <p>Note: On TPF Apache arguments are supported only on the - command line, not through the ZINET XPARM field.</p> + <div style="margin-left: 2em"> + <table border="1" cellpadding="5"> + <tr><td><b>Option </b> + </td><td><b>ZFILE</b></td> + <td><b>ZINET</b> + </td><td><b>Description</b></td></tr> + + <tr><td valign="top"><b>-d</b> <i>path</i></td> + <td valign="top">ZFILE</td> + <td valign="top">ZINET</td> + <td valign="top">Set the initial value for the ServerRoot directive.</td></tr> + + <tr><td valign="top"><b>-D</b> <i>define</i></td> + <td valign="top">ZFILE</td> + <td valign="top">ZINET</td> + <td valign="top">Set a configuration parameter which can be used with <IfDefine>...</IfDefine> sections in the configuration file to conditionally skip or process commands.</td></tr> + + <tr><td valign="top"><b>-f</b> <i>filename</i></td> + <td valign="top">ZFILE</td> + <td valign="top">ZINET</td> + <td valign="top">Use an alternate configuration file instead of the default conf/httpd.conf file.</td></tr> + + <tr><td valign="top"><b>-h</b></td> + <td valign="top">ZFILE</td> + <td valign="top"> </td> + <td valign="top">List a short summary of available command line options then exit. + Note that this outputs all options, not just those supported on TPF.</td></tr> + + <tr><td valign="top"><b>-l</b></td> + <td valign="top">ZFILE</td> + <td valign="top"> </td> + <td valign="top">List modules compiled into the server then exit.</td></tr> + + <tr><td valign="top"><b>-L</b></td> + <td valign="top">ZFILE</td> + <td valign="top"> </td> + <td valign="top">List available configuration directives then exit. Note that this outputs all configuration directives, not just those supported on TPF.</td></tr> + + <tr><td valign="top"><b>-S</b></td> + <td valign="top">ZFILE</td> + <td valign="top"> </td> + <td valign="top">Show the settings as parsed from the configuration file then exit. Currently Apache only shows the virtual host settings.</td></tr> + + <tr><td valign="top"><b>-t</b></td> + <td valign="top">ZFILE</td> + <td valign="top"> </td> + <td valign="top">Run syntax tests for configuration files with document root checks then exit.</td></tr> + + <tr><td valign="top"><b>-T</b></td> + <td valign="top">ZFILE</td> + <td valign="top"> </td> + <td valign="top">Run syntax tests for configuration files <i>without</i> document root checks then exit.</td></tr> + + <tr><td valign="top"><b>-v</b></td> + <td valign="top">ZFILE</td> + <td valign="top"> </td> + <td valign="top">Show the version number then exit.</td></tr> + + <tr><td valign="top"><b>-V</b></td> + <td valign="top">ZFILE</td> + <td valign="top"> </td> + <td valign="top">Show the version number and various compile settings then exit.</td></tr> + + <tr><td valign="top"><b>-X</b></td> + <td valign="top"> </td> + <td valign="top">ZINET</td> + <td valign="top">Run in single-process mode for internal debugging purposes only. + The parent process does not fork any children.</td></tr> + + </table> + + <p>See <a href="http://httpd.apache.org/docs/programs/httpd.html">http://httpd.apache.org/docs/programs/httpd.html</a> + for more information about these command line options.</p> </div> - <h3>Setup</h3> + <h3>Setup for ZFILE examples</h3> <div style="margin-left: 2em"> <p>Ensure Apache (CHTA) is loaded</p> @@ -431,7 +478,6 @@ <tt>zfile chmod 755 /bin/httpd</tt> </div> <br /> - <br /> <p>(See "<em>ZFILE-Activate a TPF Segment or Script</em>" in @@ -439,7 +485,7 @@ href="http://www.ibm.com/tpf/pubs/tpfpubs.htm">http://www.ibm.com/tpf/pubs/tpfpubs.htm</a>.)</p> </div> - <h3>Example 1</h3> + <h3>ZFILE example 1</h3> <div style="margin-left: 2em"> <p><tt>zfile httpd -v</tt></p> @@ -451,17 +497,75 @@ END OF DISPLAY</tt></p> </div> - <h3>Example 2</h3> + <h3>ZFILE example 2</h3> <div style="margin-left: 2em"> <p><tt>zfile httpd -t -f - /usr/local/apache/conf/httpd.conf.new</tt></p> + /usr/local/apache/conf/alt.conf</tt></p> <p><tt>FILE0002I 11.47.26 START OF ERROR DISPLAY FROM httpd -t ...<br /> Syntax OK<br /> END OF DISPLAY</tt></p> </div> + + <h3>ZINET XPARM example</h3> + <div style="margin-left: 2em"> + + This example uses an alternate configuration file called /usr/local/apache/conf/alt.conf.<br /> + Transfer the alternate configuration file to your TPF test system.<br /> + <tt>zinet add s-apache pgm-chta model-daemon user-root xparm--f conf/alt.conf</tt><br /> + <tt>zinet start s-apache</tt> + + <p>(See "<em>ZINET ADD-Add an Internet Server Application Entry</em>" and + "<em>ZINET ALTER-Change an Internet Server Application Entry</em>" in + the <em>Operations</em> guide for more information about using the XPARM field: + <a href="http://www.ibm.com/tpf/pubs/tpfpubs.htm">http://www.ibm.com/tpf/pubs/tpfpubs.htm</a>.)</p> + </div> + + + <a id="syslog" name="syslog"></a> + + <center> + <h2>Syslog Daemon</h2> + </center> + + <h3>Syslog overview:</h3> + + <p>The syslog daemon is a server process that provides a message logging facility for application and system processes. + It can be used to write messages to log files or to tapes. + See <em>TPF Transmission Control Protocol/Internet Protocol</em> for detailed information about using the syslog daemon on TPF: + <a href="http://www.ibm.com/tpf/pubs/tpfpubs.htm">http://www.ibm.com/tpf/pubs/tpfpubs.htm</a>. + And see the Apache <a href="http://httpd.apache.org/docs/mod/core.html#errorlog">ErrorLog directive documentation</a> + for details on how to use syslog with Apache.</p> + + <p>Syslog capabilities were added with PJ27214 which shipped with PUT13. + You must follow the <a href="install-tpf.html#syslog">syslog specific installation instructions</a> + in order to have the option of using syslog with Apache.</p> + + + <h3>Tips on using syslog with your Apache error log:</h3> + + <p>This section provides some tips on using syslog with Apache. + It is not meant to replace the syslog documentation in the TPF TCP/IP publication.</p> + + <ul> +<li>The syslog daemon will not create files. If you are logging to a file (as specified in the <tt>syslog.conf</tt> configuration file) that file must already exist and + have permissions that allow the syslog daemon to write to it.</li> +<li>You must restart the syslog daemon for it to recognize changes to its <tt>syslog.conf</tt> configuration file.</li> +<li>The syslog daemon must be active prior to starting Apache.</li> +<li>To indicate you want to use syslog with your Apache error log add the following directive to your <tt>httpd.conf</tt> file: + "<tt>ErrorLog syslog:</tt><i>facility</i>" where <i>facility</i> is "local0" through "local7".</li> +<li>Apache will default the facility to "local7" if you omit the facility name from the ErrorLog directive (that is "<tt>ErrorLog syslog</tt>").</li> +<li>The syslog facility name must be one that is recognized by both Apache and the syslog.h header file. + The facility names "local0" through "local7" are explicitly set aside for your use.</li> +<li>Although "local0" through "local7" are recommended user facility names, here is the complete list of names recognized + by both Apache and TPF's syslog.h: auth, cron, daemon, kern, local0, local1, local2, local3, local4, local5, local6, local7, + lpr, mail, news, syslog, user, and uucp.</li> +<li>You won't see the normal Apache startup/shutdown messages when you use syslog with your Apache error log.</li> +<li>Syslog does not support TCP/IP Offload devices (ZCLAW)</li> +</ul> + <a id="porting_notes" name="porting_notes"></a> <center> @@ -514,12 +618,13 @@ <hr /> <center> - [ <a href="#top">top</a> | <a - href="#configuration_files">Configuration Files</a> | - <a href="#whats_available">What's Available</a> | <a - href="#cgi">CGI Scripts</a> | <a - href="#options">Options</a> | <a - href="#porting_notes">Porting Notes</a> ] + [ <a href="#top">top</a> + | <a href="#configuration_files">Configuration Files</a> + | <a href="#whats_available">What's Available</a> + | <a href="#cgi">CGI Scripts</a> + | <a href="#options">Options</a> + | <a href="#syslog">Syslog</a> + | <a href="#porting_notes">Porting Notes</a> ] </center> </body> </html> diff --git a/usr.sbin/httpd/htdocs/manual/urlmapping.html b/usr.sbin/httpd/htdocs/manual/urlmapping.html index 587f54bff51..64a2e80d074 100644 --- a/usr.sbin/httpd/htdocs/manual/urlmapping.html +++ b/usr.sbin/httpd/htdocs/manual/urlmapping.html @@ -125,7 +125,7 @@ with</p> <blockquote> - <code>Alias /docs /var/web/</code> + <code>Alias /docs /var/web</code> </blockquote> <p>the URL diff --git a/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html.en b/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html.en index 0356198a023..38d36ef4419 100644 --- a/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html.en +++ b/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html.en @@ -111,11 +111,18 @@ designate which host is served and a <a href="../mod/core.html#documentroot">DocumentRoot</a> directive to show where in the filesystem the content for that host lives.</p> -<p>For example, suppose that both <samp>www.domain.tld</samp> and -<samp>www.otherdomain.tld</samp> point at an IP address -that the server is listening to. Then you simply add the following -to <code>httpd.conf</code>:</p> - +<p>If you are adding virtual hosts to an existing web server, you +must also create a <VirtualHost> block for the existing host. +The <code>ServerName</code> and <code>DocumentRoot</code> included in +this virtual host should be the same as the global +<code>ServerName</code> and <code>DocumentRoot</code>. List this +virtual host first in the configuration file so that it will act as +the default host.</p> + +<p>For example, suppose that you are serving the domain +<samp>www.domain.tld</samp> and you wish to add the virtual host +<samp>www.otherdomain.tld</samp>, which points at the same IP address. +Then you simply add the following to <code>httpd.conf</code>:</p> <pre> NameVirtualHost * @@ -160,7 +167,7 @@ by placing other directives inside the placed in these containers and will then change the configuration only of the relevant virtual host. To find out if a particular directive is allowed, check the <a -href="../mod/directive-dist.html#Context">Context</a> of the +href="../mod/directive-dict.html#Context">Context</a> of the directive. Configuration directives set in the <em>main server context</em> (outside any <code><VirtualHost></code> container) will be used only if they are not overriden by the virtual host diff --git a/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html.html b/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html.html index 3f52df57871..8940a29c191 100644 --- a/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html.html +++ b/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html.html @@ -113,11 +113,18 @@ designate which host is served and a <a href="../mod/core.html#documentroot">DocumentRoot</a> directive to show where in the filesystem the content for that host lives.</p> -<p>For example, suppose that both <samp>www.domain.tld</samp> and -<samp>www.otherdomain.tld</samp> point at an IP address -that the server is listening to. Then you simply add the following -to <code>httpd.conf</code>:</p> - +<p>If you are adding virtual hosts to an existing web server, you +must also create a <VirtualHost> block for the existing host. +The <code>ServerName</code> and <code>DocumentRoot</code> included in +this virtual host should be the same as the global +<code>ServerName</code> and <code>DocumentRoot</code>. List this +virtual host first in the configuration file so that it will act as +the default host.</p> + +<p>For example, suppose that you are serving the domain +<samp>www.domain.tld</samp> and you wish to add the virtual host +<samp>www.otherdomain.tld</samp>, which points at the same IP address. +Then you simply add the following to <code>httpd.conf</code>:</p> <pre> NameVirtualHost * @@ -162,7 +169,7 @@ by placing other directives inside the placed in these containers and will then change the configuration only of the relevant virtual host. To find out if a particular directive is allowed, check the <a -href="../mod/directive-dist.html#Context">Context</a> of the +href="../mod/directive-dict.html#Context">Context</a> of the directive. Configuration directives set in the <em>main server context</em> (outside any <code><VirtualHost></code> container) will be used only if they are not overriden by the virtual host diff --git a/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html.ja.jis b/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html.ja.jis index 3eaa34fbe78..e1f0286d30f 100644 --- a/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html.ja.jis +++ b/usr.sbin/httpd/htdocs/manual/vhosts/name-based.html.ja.jis @@ -97,6 +97,7 @@ $B$3$l$O(B <a href="../mod/core.html#namevirtualhost">NameVirtualHost</a> $B%G%#%l%/%F%#%V$G@_Dj$7$^$9!#DL>o!"(B<code>NameVirtualHost</code> $B$G(B <code>*</code> $B$NB0@-$r;H$C$F%5!<%P$NA4$F$N(B IP $B%"%I%l%9$r;H$$$^$9!#(B + (<code>NameVirtualHost *</code> $B$O%P!<%8%g%s(B 1.3.13 $B0J9_$N$_$GF0:n$7$^$9!#(B) <code>NameVirtualHost</code> $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 $BCm0U$7$F$/$@$5$$!#>\:Y$O(B <a href="../bind.html">Apache $B$N;H$&%"%I%l%9$H(B @@ -136,7 +137,8 @@ <p><code>NameVirtualHost</code> $B5Z$S(B <code><VirtualHost></code> $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</p> + * $B$NItJ,$K$OL@<(E*$K(B IP $B%"%I%l%9$r;XDj$9$k$3$H$,$G$-$^$9!#(B + $B%P!<%8%g%s(B 1.3.12 $B0JA0$G$O(B IP $B%"%I%l%9$N;XDj$,I,MW$G$7$?!#(B</p> <p>$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!"(B<a href="../mod/core.html#serveralias" |