You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dg...@hyperreal.org on 1997/11/02 01:19:49 UTC
cvs commit: apache/htdocs/manual/mod core.html mod_actions.html mod_auth_anon.html mod_auth_dbm.html mod_cern_meta.html mod_cgi.html mod_env.html mod_example.html mod_imap.html mod_include.html mod_mime.html mod_negotiation.html mod_proxy.html mod_status.html
dgaudet 97/11/01 16:19:48
Modified: htdocs/manual Tag: APACHE_1_2_X LICENSE
content-negotiation.html custom-error.html
dns-caveats.html env.html host.html index.html
install.html invoking.html man-template.html
multilogs.html new_features_1_0.html
new_features_1_1.html new_features_1_2.html
process-model.html suexec.html vhosts-in-depth.html
virtual-host.html
htdocs/manual/misc Tag: APACHE_1_2_X API.html FAQ.html
client_block_api.html compat_notes.html
fin_wait_2.html nopgp.html perf-bsd44.html
perf-dec.html perf.html security_tips.html
vif-info.html
htdocs/manual/mod Tag: APACHE_1_2_X core.html
mod_actions.html mod_auth_anon.html
mod_auth_dbm.html mod_cern_meta.html mod_cgi.html
mod_env.html mod_example.html mod_imap.html
mod_include.html mod_mime.html mod_negotiation.html
mod_proxy.html mod_status.html
Removed: htdocs/manual/misc Tag: APACHE_1_2_X
known_client_problems.html
Log:
forget it, revert the last two changes
Revision Changes Path
No revision
No revision
1.3.2.2 +1 -2 apache/htdocs/manual/LICENSE
Index: LICENSE
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/LICENSE,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- LICENSE 1997/11/02 00:15:58 1.3.2.1
+++ LICENSE 1997/11/02 00:19:04 1.3.2.2
@@ -20,8 +20,7 @@
*
* 4. The names "Apache Server" and "Apache Group" must not be used to
* endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * apache@apache.org.
+ * prior written permission.
*
* 5. Redistributions of any form whatsoever must retain the following
* acknowledgment:
1.10.2.2 +11 -11 apache/htdocs/manual/content-negotiation.html
Index: content-negotiation.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/content-negotiation.html,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- content-negotiation.html 1997/11/01 23:39:18 1.10.2.1
+++ content-negotiation.html 1997/11/02 00:19:05 1.10.2.2
@@ -22,7 +22,7 @@
couple of features to give more intelligent handling of requests from
browsers which send incomplete negotiation information. <p>
-Content negotiation is provided by the
+Content negotiation is provided by the
<a href="mod/mod_negotiation.html">mod_negotiation</a> module,
which is compiled in by default.
@@ -47,7 +47,7 @@
</pre>
Note that this preference will only be applied when there is a choice
-of representations and they vary by language.
+of representations and they vary by language.
<p>
As an example of a more complex request, this browser has been
@@ -78,12 +78,12 @@
In order to negotiate a resource, the server needs to be given
information about each of the variants. This is done in one of two
-ways:
+ways:
<ul>
<li> Using a type map (i.e., a <code>*.var</code> file) which
names the files containing the variants explicitly
- <li> Or using a 'MultiViews' search, where the server does an implicit
+ <li> Or using a 'MultiViews' search, where the server does an implicit
filename pattern match, and chooses from among the results.
</ul>
@@ -154,7 +154,7 @@
interpreted as URLs relative to the map file; they must be on
the same server (!), and they must refer to files to which the
client would be granted access if they were to be requested
- directly.
+ directly.
<dt> <code>Content-type:</code>
<dd> media type --- charset, level and "qs" parameters may be given. These
are often referred to as MIME types; typical media types are
@@ -244,7 +244,7 @@
<tr><th>Dimension
<th>Notes
<tr><td>Media Type
-<td>Browser indicates preferences on Accept: header. Each item
+<td>Browser indicates preferences on Accept: header. Each item
can have an associated quality factor. Variant description can also
have a quality factor.
<tr><td>Language
@@ -292,7 +292,7 @@
else the order of languages on the Accept-Language header.
<li>Select the variants with the highest 'level' media parameter
- (used to give the version of text/html media types).
+ (used to give the version of text/html media types).
<li>Select only unencoded variants, if there is a mix of encoded
and non-encoded variants. If either all variants are encoded
@@ -366,7 +366,7 @@
The explicit types have no quality factor, so they default to a
preference of 1.0 (the highest). The wildcard */* is given
a low preference of 0.01, so other types will only be returned if
-no variant matches an explicitly listed type.
+no variant matches an explicitly listed type.
<p>
If the Accept: header contains <i>no</i> q factors at all, Apache sets
@@ -386,7 +386,7 @@
The reason for setting this language quality factor for
variant with no language to a very low value is to allow
for a default variant which can be supplied if none of the
-other variants match the browser's language preferences.
+other variants match the browser's language preferences.
For example, consider the situation with three variants:
@@ -409,9 +409,9 @@
document, provided it is still within date. But if the resource is
subject to content negotiation at the server, this would result in
only the first requested variant being cached, and subsequent cache
-hits could return the wrong response. To prevent this,
+hits could return the wrong response. To prevent this,
Apache normally marks all responses that are returned after content negotiation
-as non-cacheable by HTTP/1.0 clients. Apache also supports the HTTP/1.1
+as non-cacheable by HTTP/1.0 clients. Apache also supports the HTTP/1.1
protocol features to allow caching of negotiated responses. <P>
For requests which come from a HTTP/1.0 compliant client (either a
1.8.2.3 +8 -7 apache/htdocs/manual/custom-error.html
Index: custom-error.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/custom-error.html,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- custom-error.html 1997/11/01 23:39:18 1.8.2.2
+++ custom-error.html 1997/11/02 00:19:06 1.8.2.3
@@ -29,12 +29,13 @@
response, then this response can be replaced with either some
friendlier text or by a redirection to another URL (local or
external).
+
<P>
-
+
<DT>Old behavior
- <DD>NCSA httpd 1.3 would return some boring old error/problem message
- which would often be meaningless to the user, and would provide no
+ <DD>NCSA httpd 1.3 would return some boring old error/problem message
+ which would often be meaningless to the user, and would provide no
means of logging the symptoms which caused it.<BR>
<P>
@@ -68,7 +69,7 @@
REDIRECT_URL=/cgi-bin/buggy.pl <br>
</code></blockquote>
- <P>note the <code>REDIRECT_</code> prefix.
+ <P>note the <code>REDIRECT_</code> prefix.
<P>At least <code>REDIRECT_URL</code> and <code>REDIRECT_QUERY_STRING</code> will
be passed to the new URL (assuming it's a cgi-script or a cgi-include). The
@@ -93,16 +94,16 @@
ErrorDocument 401 /Subscription/how_to_subscribe.html
</code></blockquote>
- <P>The syntax is,
+ <P>The syntax is,
<P><code><A HREF="mod/core.html#errordocument">ErrorDocument</A></code>
-<3-digit-code> action
+<3-digit-code> action
<P>where the action can be,
<OL>
<LI>Text to be displayed. Prefix the text with a quote ("). Whatever
- follows the quote is displayed. <em>Note: the (") prefix isn't
+ follows the quote is displayed. <em>Note: the (") prefix isn't
displayed.</em>
<LI>An external URL to redirect to.
1.5.2.2 +1 -1 apache/htdocs/manual/dns-caveats.html
Index: dns-caveats.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/dns-caveats.html,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- dns-caveats.html 1997/11/01 23:39:19 1.5.2.1
+++ dns-caveats.html 1997/11/02 00:19:06 1.5.2.2
@@ -188,7 +188,7 @@
than not booting at all depending on what the webserver is supposed
to accomplish.
-<p>As HTTP/1.1 is deployed and browsers and proxies start issuing the
+<p>As HTTP/1.1 is deployed and browsers and proxies start issuing the
<code>Host</code> header it will become possible to avoid the use of
IP-based virtual hosts entirely. In this event a webserver has no requirement
to do DNS lookups during configuration. But as of March 1997 these
1.4.2.2 +4 -9 apache/htdocs/manual/env.html
Index: env.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/env.html,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- env.html 1997/11/01 23:39:19 1.4.2.1
+++ env.html 1997/11/02 00:19:07 1.4.2.2
@@ -17,9 +17,9 @@
<P>Interoperability problems have led to the introduction of
mechanisms to modify the way Apache behaves when talking to particular
clients. To make these mechanisms as flexible as possible, they
-are invoked by defining environment variables, typically with
-<A HREF="mod/mod_browser.html#browsermatch">BrowserMatch</A>, though
-<A HREF="mod/mod_env.html#setenv">SetEnv</A> and
+are invoked by defining environment variables, typically with
+<A HREF="mod/mod_browser.html#browsermatch">BrowserMatch</A>, though
+<A HREF="mod/mod_env.html#setenv">SetEnv</A> and
<A HREF="mod/mod_env.html#passenv">PassEnv</A> could also be used, for
example.</P>
@@ -30,16 +30,11 @@
<BLOCKQUOTE><CODE>
BrowserMatch Mozilla/2 nokeepalive
</CODE></BLOCKQUOTE>
-
<H2>force-response-1.0</H2>
This forces an HTTP/1.0 response when set. It was originally implemented as a
-result of a problem with AOL's proxies. Some clients may not behave correctly
+result of a problem with AOL's proxies. Some clients may not behave correctly
when given an HTTP/1.1 response, and this can be used to interoperate with
them.
-
-<H2>downgrade-1.0</H2>
-<p>This forces the request to be treated as a HTTP/1.0 request even if it
-was in a later dialect.
<!--#include virtual="footer.html" -->
</BODY>
1.9.2.2 +2 -1 apache/htdocs/manual/host.html
Index: host.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/host.html,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- host.html 1997/11/01 23:39:20 1.9.2.1
+++ host.html 1997/11/02 00:19:07 1.9.2.2
@@ -165,8 +165,9 @@
be directly taken to the Apache pages. Older browsers will be able to
click on the link from the main server, go to
<code>http://www.apache.org/apache/</code>, and then access the
-pages.</p>
+pages.</p>
<!--#include virtual="footer.html" -->
</BODY>
</HTML>
+
1.14.2.4 +1 -1 apache/htdocs/manual/index.html
Index: index.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/index.html,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -r1.14.2.3 -r1.14.2.4
--- index.html 1997/11/01 23:39:20 1.14.2.3
+++ index.html 1997/11/02 00:19:08 1.14.2.4
@@ -32,7 +32,7 @@
<H3><a name="ref">Apache Reference Manual</a></h3>
<UL>
<LI><A
- HREF="http://www.apache.org/manual-index.cgi/docs"
+ HREF="http://www.apache.org/manual-index/docs"
><STRONG>Search</STRONG></A>
the master manual pages for key words
</LI>
1.9.2.3 +7 -12 apache/htdocs/manual/install.html
Index: install.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/install.html,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- install.html 1997/11/02 00:15:59 1.9.2.2
+++ install.html 1997/11/02 00:19:08 1.9.2.3
@@ -28,7 +28,7 @@
web server at <A
HREF="http://www.apache.org/">http://www.apache.org/</A>. This will
list the current release, any more recent beta-test release, together
-with details of mirror web and anonymous ftp sites.
+with details of mirror web and anonymous ftp sites.
<P>
@@ -51,7 +51,7 @@
<LI>
Select modules to compile into Apache in the
<CODE>Configuration</CODE> file. Uncomment lines corresponding to
- those optional modules you wish to include (among the AddModule lines
+ those optional modules you wish to include (among the Module lines
at the bottom of the file), or add new lines corresponding to
additional modules you have downloaded or written. (See <A
HREF="misc/API.html">API.html</A> for preliminary docs on how to
@@ -83,12 +83,7 @@
+ configured for <whatever> platform
+ setting C compiler to <whatever> *
+ setting C compiler optimization-level to <whatever> *
- + Adding selected modules
- + doing sanity check on compiler and options
- Creating Makefile in support
- Creating Makefile in main
- Creating Makefile in os/unix
- Creating Makefile in modules/standard
+ %
</PRE>
</BLOCKQUOTE>
@@ -158,13 +153,13 @@
In addition to these three files, the server behavior can be configured
on a directory-by-directory basis by using <CODE>.htaccess</CODE>
-files in directories accessed by the server.
+files in directories accessed by the server.
<H3>Starting and Stopping the Server</H3>
To start the server, simply run <CODE>httpd</CODE>. This will look for
<CODE>httpd.conf</CODE> in the location compiled into the code (by
-default <CODE>/usr/local/apache/conf/httpd.conf</CODE>). If
+default <CODE>/usr/locale/etc/httpd/conf/httpd.conf</CODE>). If
this file is somewhere else, you can give the real
location with the -f argument. For example:
@@ -175,7 +170,7 @@
If all goes well this will return to the command prompt almost
immediately. This indicates that the server is now up and running. If
anything goes wrong during the initialization of the server you will
-see an error message on the screen.
+see an error message on the screen.
If the server started ok, you can now use your browser to
connect to the server and read the documentation. If you are running
@@ -192,7 +187,7 @@
<i>child</i> processes to handle the requests. If you started Apache
as the root user, the parent process will continue to run as root
while the children will change to the user as given in the httpd.conf
-file.
+file.
<P>
1.11.2.3 +4 -4 apache/htdocs/manual/invoking.html
Index: invoking.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/invoking.html,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -r1.11.2.2 -r1.11.2.3
--- invoking.html 1997/11/02 00:16:00 1.11.2.2
+++ invoking.html 1997/11/02 00:19:09 1.11.2.3
@@ -18,10 +18,10 @@
<h2>Invoking Apache</h2>
The <code>httpd</code> program is usually run as a daemon which executes
continuously, handling requests. It is possible to invoke Apache by
-the Internet daemon <code>inetd</code> each time a connection to the HTTP
-service is made (use the
+the Internet daemon <code>inetd</code> each time a connection to the HTTP
+service is made (use the
<A HREF="mod/core.html#servertype">ServerType</A> directive)
-but this is not recommended.
+but this is not recommended.
<h2>Command line options</h2>
The following options are recognized on the httpd command line:
@@ -30,7 +30,7 @@
<dd>Set the initial value for the
<A HREF="mod/core.html#serverroot">ServerRoot</A> variable to
<em>serverroot</em>. This can be overridden by the ServerRoot command in the
-configuration file. The default is <code>/usr/local/apache</code>.
+configuration file. The default is <code>/usr/local/etc/httpd</code>.
<dt><code>-f</code> <em>config</em>
<dd>Execute the commands in the file <em>config</em> on startup. If
1.6.2.2 +53 -63 apache/htdocs/manual/man-template.html
Index: man-template.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/man-template.html,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- man-template.html 1997/11/01 23:39:22 1.6.2.1
+++ man-template.html 1997/11/02 00:19:09 1.6.2.2
@@ -1,79 +1,69 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<HTML>
- <HEAD>
- <TITLE>Apache module mod_foobar</TITLE>
- </HEAD>
+<HEAD>
+<TITLE>Apache module mod_foobar</TITLE>
+</HEAD>
+
<!-- read and delete all blockquotes, and this comment -->
+
<!-- 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"
+>
<!--#include virtual="header.html" -->
- <H1 ALIGN="CENTER">Module mod_foobar</h1>
+<H1 ALIGN="CENTER">Module mod_foobar</h1>
+
+<blockquote><em>Add this file as a link in modules.html</em></blockquote>
+
+This module is contained in the <code>mod_foobar.c</code> file, and
+<strong>is/is not</strong> compiled in by default. It provides for
+<strong>the foobar feature</strong>. Any document with the mime type
+<code>foo/bar</code> will be processed by this module.
+
+<blockquote><em>Add the magic mime type to the list in
+magic_types.html</em></blockquote>
+
+<h2>Summary</h2>
+General module documentation here.
-<BLOCKQUOTE><EM>Add this file as a link in modules.html</EM></BLOCKQUOTE>
+<h2>Directives</h2>
+<ul>
+<li><A HREF="#adirective">ADirective</A>
+</ul>
- <P>
- This module is contained in the <code>mod_foobar.c</code> file, and
- <STRONG>is/is not</STRONG> compiled in by default. It provides for
- <STRONG>the foobar feature</STRONG>. Any document with the mime type
- <SAMP>foo/bar</SAMP> will be processed by this module.
- </P>
-
-<BLOCKQUOTE><EM>Add the magic mime type to the list in
-magic_types.html</EM></BLOCKQUOTE>
-
- <H2>Summary</H2>
- <P>
- <EM>General module documentation here.</EM>
- </P>
-
- <H2>Directives</H2>
- <UL>
- <LI><A HREF="#adirective">ADirective</A>
- </LI>
- </UL>
-
-<BLOCKQUOTE><EM>Add these directives to the list in
-directives.html</EM></BLOCKQUOTE>
-
- <HR> <!-- the HR is part of the directive description -->
- <H2><A NAME="adirective">ADirective directive</A></H2>
- <P>
- <STRONG>Syntax:</STRONG> ADirective <EM>some args</EM>
- <BR>
- <STRONG>Default:</STRONG> <SAMP>ADirective default value</SAMP>
- <BR>
- <STRONG>Context:</STRONG> context-list
- <BR>
-
-<BLOCKQUOTE><EM>context-list is where this directive can appear;
-allowed: server config, virtual host, directory, .htaccess</EM></BLOCKQUOTE>
-
- <STRONG>Override:</STRONG> override
- <BR>
+<blockquote><em>Add these directives to the list in
+directives.html</em></blockquote>
-<BLOCKQUOTE><EM>required if the directive is allowed in .htaccess files;
-the AllowOverride option that allows the directive.</EM></BLOCKQUOTE>
+<hr>
- <STRONG>Status:</STRONG> status
- <BR>
+<h2><A name="adirective">ADirective</A></h2>
+<strong>Syntax:</strong> ADirective <em>some args</em><br>
+<strong>Default:</strong> <code>ADirective default value</code><br>
+<strong>Context:</strong> context-list<br>
-<BLOCKQUOTE><EM>Core if in core apache, Base if in one of the standard
+<blockquote><em>context-list is where this directive can appear;
+allowed: server config, virtual host, directory, .htaccess</em></blockquote>
+
+<strong>Override:</strong> override<br>
+
+<blockquote><em>required if the directive is allowed in .htaccess files;
+the AllowOverride option that allows the directive.</em></blockquote>
+
+<strong>Status:</strong> status<br>
+
+<blockquote><em>Core if in core apache, Base if in one of the standard
modules, Extension if in an extension module (not compiled in by default)
-or Experimental</EM></BLOCKQUOTE>
+or Experimental</em></blockquote>
- <STRONG>Module:</STRONG> mod_foobar
- </P>
+<strong>Module:</strong> mod_foobar<p>
- <P>
- The ADirective directive does something.
- </P>
+The ADirective directive does something.
<!--#include virtual="footer.html" -->
- </BODY>
+</BODY>
</HTML>
+
1.5.2.2 +2 -2 apache/htdocs/manual/multilogs.html
Index: multilogs.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/multilogs.html,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- multilogs.html 1997/11/01 23:39:22 1.5.2.1
+++ multilogs.html 1997/11/02 00:19:10 1.5.2.2
@@ -44,7 +44,7 @@
<p>
The new <code>CustomLog</code> directive takes both a filename to log
-to, and a log file format.
+to, and a log file format.
<hr>
@@ -104,7 +104,7 @@
</VirtualHost>
</pre>
-Since no TransferLog or CustomLog directives appear inside the
+Since no TransferLog or CustomLog directives appear inside the
<VirtualHost> section, any requests for this virtual host
will be logged in the main server's log files. If however the
directive
1.6.2.2 +1 -1 apache/htdocs/manual/new_features_1_0.html
Index: new_features_1_0.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/new_features_1_0.html,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- new_features_1_0.html 1997/11/01 23:39:23 1.6.2.1
+++ new_features_1_0.html 1997/11/02 00:19:10 1.6.2.2
@@ -54,7 +54,7 @@
"spare" - every couple of seconds the parent checks the actual number
of spare servers and adjusts accordingly. This should keep the number
of servers concurrently running relatively low while still ensuring
-minimal forking.
+minimal forking.
<P>
1.7.2.2 +1 -1 apache/htdocs/manual/new_features_1_1.html
Index: new_features_1_1.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/new_features_1_1.html,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- new_features_1_1.html 1997/11/01 23:39:23 1.7.2.1
+++ new_features_1_1.html 1997/11/02 00:19:11 1.7.2.2
@@ -68,7 +68,7 @@
<A HREF="http://www.apache.org/status">the status of the
www.apache.org server</A>.
-<li><b><a href="mod/mod_info.html">Server Information Module</a></b>
+<li><b><a href="mod/mod_info.html">Server Information Module</a></b></br>
This module gives a plethora of information about the other modules
installed, their directives, and their configurations. It is
extremely helpful in debugging configuration problems. For an
1.29.2.3 +7 -8 apache/htdocs/manual/new_features_1_2.html
Index: new_features_1_2.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/new_features_1_2.html,v
retrieving revision 1.29.2.2
retrieving revision 1.29.2.3
diff -u -r1.29.2.2 -r1.29.2.3
--- new_features_1_2.html 1997/11/01 23:39:24 1.29.2.2
+++ new_features_1_2.html 1997/11/02 00:19:13 1.29.2.3
@@ -45,8 +45,7 @@
<ul>
-<!-- change the "name" to an "href" if/when there's such a document -->
-<li><b><a name="http11.html">HTTP/1.1 Compliance</a></b>
+<li><b><xa href="http11.html">HTTP/1.1 Compliance</a></b>
[Documentation to be written]<br>
Aside from the optional proxy module (which operates as HTTP/1.0),
Apache is conditionally compliant with the HTTP/1.1 proposed standard,
@@ -67,7 +66,7 @@
<li><b><a href="mod/core.html#files">File-based and Regex-enabled
Directive Sections</a></b><br>
-The new
+The new
<a href="mod/core.html#files"><code><Files></code></a>
section allows directives to be enabled based on full filename, not just directory and URL. In
addition, <code><Files></code> sections can appear in
@@ -75,7 +74,7 @@
<a href="mod/core.html#directory"><code><Directory></code></a>
and <a href="mod/core.html#location"><code><Location></code></a>, can
also now be based on regular expressions, not just simple prefix
-matching.
+matching.
<li><b><a href="mod/mod_browser.html">Browser-based Environment
Variables</a></b><br>
@@ -100,7 +99,7 @@
The optional <code>mod_log_config</code> included with earlier
versions of Apache is now standard, and has been enhanced to allow
logging of much more detail about the transaction, and can be used to
-open <a href="multilogs.html">more than one log file</a> at once
+open <a href="multilogs.html">more than one log file</a> at once
(each of which can have a different log format). If you have Apache
write any logs to a directory which is writable by anyone other than
the user that starts the server, see the <A HREF="misc/security_tips.html">
@@ -139,7 +138,7 @@
<li><b><a href="mod/mod_alias.html">Redirect Directive Can Return Alternate Status</a></b><br>
The Redirect directive can return permanent or temporary redirects,
- "Gone" or "See Other" HTTP status. For NCSA-compatibility,
+ "Gone" or "See Other" HTTP status. For NCSA-compatibility,
RedirectTemp and RedirectPermanent are also implemented.
<li><b><a href="install.html">Simplified Compilation</a></b><br>
@@ -163,7 +162,7 @@
A new <code><IfModule></code> section allows directives to be
enabled only if a given module is loaded into the server.
-<li><b><a href="ncsa_auth.html">Authorization Directives Now Use
+<li><b><xa href="ncsa_auth.html">Authorization Directives Now Use
NCSA-style Syntax</a></b><br>
The <a href="mod/mod_auth.html#authuserfile">AuthUserFile</a>, <a
@@ -172,7 +171,7 @@
now have a syntax compatible with the NCSA server.
<li><b><a href="mod/core.html#satisfy">NCSA Satisfy authentication
-directive now implemented</a></b><br>
+directive now implemented</a></b><br>
<code>Satisfy</code> allows for more flexible access control
configurations.
1.8.2.3 +1 -1 apache/htdocs/manual/process-model.html
Index: process-model.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/process-model.html,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- process-model.html 1997/11/01 23:39:24 1.8.2.2
+++ process-model.html 1997/11/02 00:19:14 1.8.2.3
@@ -24,7 +24,7 @@
"spare" - every couple of seconds the parent checks the actual number
of spare servers and adjusts accordingly. This should keep the number
of servers concurrently running relatively low while still ensuring
-minimal forking.
+minimal forking.
<P>
1.11.2.4 +24 -24 apache/htdocs/manual/suexec.html
Index: suexec.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/suexec.html,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -r1.11.2.3 -r1.11.2.4
--- suexec.html 1997/11/02 00:16:00 1.11.2.3
+++ suexec.html 1997/11/02 00:19:14 1.11.2.4
@@ -25,7 +25,7 @@
<LI><A HREF="#enable">Enabling & Disabling suEXEC</A></LI>
<LI><A HREF="#debug">Debugging suEXEC</A></LI>
<LI><A HREF="#jabberwock">Beware the Jabberwock: Warnings &
- Examples</A></LI>
+ Examples</A></LI>
</OL>
</P>
@@ -43,9 +43,9 @@
with allowing users to develop and run private CGI or SSI programs. However,
if suEXEC is improperly configured, it can cause any number of problems and
possibly create new holes in your computer's security. If you aren't familiar
-with managing setuid root programs and the security issues they present, we
+with managing setuid root programs and the security issues they present, we
highly recommend that you not consider using suEXEC.
-</P>
+</P>
<P ALIGN="CENTER">
<STRONG><A HREF="suexec.html">BACK TO CONTENTS</A></STRONG>
@@ -65,7 +65,7 @@
</P>
<P ALIGN="LEFT">
-Second, it is assumed you are familiar with some basic concepts of your
+Second, it is assumed you are familiar with some basic concepts of your
computer's security and its administration. This involves an understanding
of <STRONG>setuid/setgid</STRONG> operations and the various effects they
may have on your system and its level of security.
@@ -76,14 +76,14 @@
version of suEXEC code. All code for suEXEC has been carefully scrutinized and
tested by the developers as well as numerous beta testers. Every precaution has
been taken to ensure a simple yet solidly safe base of code. Altering this
-code can cause unexpected problems and new security risks. It is
-<STRONG>highly</STRONG> recommended you not alter the suEXEC code unless you
+code can cause unexpected problems and new security risks. It is
+<STRONG>highly</STRONG> recommended you not alter the suEXEC code unless you
are well versed in the particulars of security programming and are willing to
share your work with the Apache Group for consideration.
</P>
<P ALIGN="LEFT">
-Fourth, and last, it has been the decision of the Apache Group to
+Fourth, and last, it has been the decision of the Apache Group to
<STRONG>NOT</STRONG> make suEXEC part of the default installation of Apache.
To this end, suEXEC configuration is a manual process requiring of the
administrator careful attention to details. It is through this process
@@ -112,7 +112,7 @@
called by the main Apache web server. This wrapper is called when an HTTP
request is made for a CGI or SSI program that the administrator has designated
to run as a userid other than that of the main server. When such a request
-is made, Apache provides the suEXEC wrapper with the program's name and the
+is made, Apache provides the suEXEC wrapper with the program's name and the
user and group IDs under which the program is to execute.
</P>
@@ -299,15 +299,15 @@
#define GID_MIN 100
/*
- * USERDIR_SUFFIX -- Define to be the subdirectory under users'
+ * USERDIR_SUFFIX -- Define to be the subdirectory under users'
* home directories where suEXEC access should
* be allowed. All executables under this directory
- * will be executable by suEXEC as the user so
- * they should be "safe" programs. If you are
- * using a "simple" UserDir directive (ie. one
- * without a "*" in it) this should be set to
+ * will be executable by suEXEC as the user so
+ * they should be "safe" programs. If you are
+ * using a "simple" UserDir directive (ie. one
+ * without a "*" in it) this should be set to
* the same value. suEXEC will not work properly
- * in cases where the UserDir directive points to
+ * in cases where the UserDir directive points to
* a location that is not the same as the user's
* home directory as referenced in the passwd file.
*
@@ -326,14 +326,14 @@
* transactions and errors logged for auditing and
* debugging purposes.
*/
- #define LOG_EXEC "/usr/local/apache/logs/cgi.log" /* Need me? */
+ #define LOG_EXEC "/usr/local/etc/httpd/logs/cgi.log" /* Need me? */
/*
* DOC_ROOT -- Define as the DocumentRoot set for Apache. This
* will be the only hierarchy (aside from UserDirs)
* that can be used for suEXEC behavior.
*/
- #define DOC_ROOT "/usr/local/apache/htdocs"
+ #define DOC_ROOT "/usr/local/etc/httpd/htdocs"
/*
* SAFE_PATH -- Define a safe PATH environment to pass to CGI executables.
@@ -345,7 +345,7 @@
<P ALIGN="LEFT">
<STRONG>COMPILING THE SUEXEC WRAPPER</STRONG><BR>
-You now need to compile the suEXEC wrapper. At the shell command prompt,
+You now need to compile the suEXEC wrapper. At the shell command prompt,
type: <STRONG><CODE>cc suexec.c -o suexec [ENTER]</CODE></STRONG>.
This should create the <STRONG><em>suexec</em></STRONG> wrapper executable.
</P>
@@ -360,7 +360,7 @@
<EM>From src/httpd.h</EM>
<PRE>
/* The path to the suEXEC wrapper */
- #define SUEXEC_BIN "/usr/local/apache/sbin/suexec"
+ #define SUEXEC_BIN "/usr/local/etc/httpd/sbin/suexec"
</PRE>
</P>
@@ -378,19 +378,19 @@
</P>
<P ALIGN="LEFT">
-<STRONG><CODE>cp suexec /usr/local/apache/sbin/suexec [ENTER]</CODE></STRONG>
+<STRONG><CODE>cp suexec /usr/local/etc/httpd/sbin/suexec [ENTER]</CODE></STRONG>
</P>
<P ALIGN="LEFT">
-In order for the wrapper to set the user ID, it must me installed as owner
-<STRONG><em>root</em></STRONG> and must have the setuserid execution bit
+In order for the wrapper to set the user ID, it must me installed as owner
+<STRONG><em>root</em></STRONG> and must have the setuserid execution bit
set for file modes. If you are not running a <STRONG><em>root</em></STRONG>
user shell, do so now and execute the following commands.
</P>
<P ALIGN="LEFT">
-<STRONG><CODE>chown root /usr/local/apache/sbin/suexec [ENTER]</CODE></STRONG><BR>
-<STRONG><CODE>chmod 4711 /usr/local/apache/sbin/suexec [ENTER]</CODE></STRONG>
+<STRONG><CODE>chown root /usr/local/etc/httpd/sbin/suexec [ENTER]</CODE></STRONG><BR>
+<STRONG><CODE>chmod 4711 /usr/local/etc/httpd/sbin/suexec [ENTER]</CODE></STRONG>
</P>
<P ALIGN="CENTER">
@@ -447,7 +447,7 @@
<P ALIGN="LEFT">
The suEXEC wrapper will write log information to the location defined in
the <code>suexec.h</code> as indicated above. If you feel you have
-configured and installed the wrapper properly, have a look at this log
+configured and installed the wrapper properly, have a look at this log
and the error_log for the server to see where you may have gone astray.
</P>
1.9.2.4 +19 -29 apache/htdocs/manual/vhosts-in-depth.html
Index: vhosts-in-depth.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/vhosts-in-depth.html,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -r1.9.2.3 -r1.9.2.4
--- vhosts-in-depth.html 1997/11/02 00:16:01 1.9.2.3
+++ vhosts-in-depth.html 1997/11/02 00:19:15 1.9.2.4
@@ -143,7 +143,7 @@
the final setting of that value is in the main_server.)
<li>The "lookup defaults" that define the default directory
- permissions
+ permissions
for a vhost are merged with those of the main server. This includes
any per-directory configuration information for any module.
@@ -186,10 +186,6 @@
<h3>Vhost Matching</h3>
-
-<p><strong>Apache 1.3 differs from what is documented
-here, and documentation still has to be written.</strong>
-
<p>
The server determines which vhost to use for a request as follows:
@@ -222,7 +218,7 @@
the connection vhost. If it does then the hostname portion of the URI
is saved as the <EM>request_hostname</EM>. If it does not match, then the
URI remains untouched. <STRONG>Note</STRONG>: to achieve this address
-comparison,
+comparison,
the hostname supplied goes through a DNS lookup unless it matches the
<code>ServerName</code> or the local IP address of the client's socket.
@@ -277,7 +273,6 @@
"main IP address". You essentially have to create a bogus
<code>ServerName</code> for the main_server that does not match the
machine's IPs.
- <P>
<li>During the scans in both <code>check_hostalias</code> and
<code>check_serverpath</code> no check is made that the vhost being
@@ -286,8 +281,8 @@
because the scan starts in the vhost list at the first vhost that
matched the local IP address of the connection, not all IP-based vhosts
can be matched.
- <p>
- Consider the config file above with three vhosts A, B, C. Suppose
+
+ <p>Consider the config file above with three vhosts A, B, C. Suppose
that B is a named-based vhost, and A and C are IP-based vhosts. If
a request comes in on B or C's address containing a header
"<SAMP>Host: A</SAMP>" then
@@ -301,11 +296,11 @@
vhosts. During the <code>find_virtual_server</code> phase above no
named-based vhost will be matched, so the main_server will remain the
connection vhost. Then scans will cover all vhosts in the vhost list.
- <p>
- If you do have a <SAMP>_default_</SAMP> vhost, then you cannot place
+
+ <p>If you do have a <SAMP>_default_</SAMP> vhost, then you cannot place
named-based vhosts after it in the config. This is because on any
connection to the main server IPs the connection vhost will always be
- the <SAMP>_default_</SAMP> vhost since none of the name-based are
+ the <SAMP>_default_</SAMP> vhost since none of the name-based are
considered during <code>find_virtual_server</code>.
</p>
@@ -313,25 +308,22 @@
directives because it will force your server to rely on DNS to boot.
Furthermore it poses a security threat if you do not control the
DNS for all the domains listed.
- <a href="dns-caveats.html">There's more information
- available on this and the next two topics</a>.
- <p>
+ <a href="dns-caveats.html">
+ There's more information
+ available on this and the next two topics</a>.</p>
<li><code>ServerName</code> should always be set for each vhost. Otherwise
- A DNS lookup is required for each vhost.
- <p>
+ A DNS lookup is required for each vhost.</p>
<li>A DNS lookup is always required for the main_server's
<code>ServerName</code> (or to generate that if it isn't specified
- in the config).
- <p>
+ in the config).</p>
<li>If a <code>ServerPath</code> directive exists which is a prefix of
another <code>ServerPath</code> directive that appears later in
the configuration file, then the former will always be matched
and the latter will never be matched. (That is assuming that no
- Host header was available to disambiguate the two.)
- <p>
+ Host header was available to disambiguate the two.)</p>
<li>If a vhost that would otherwise be a name-vhost includes a
<code>Port</code> statement that doesn't match the main_server
@@ -341,19 +333,17 @@
to the port of the main_server) as the connection vhost. Then
<code>check_hostalias</code> will refuse to check any other name-based
vhost because of the port mismatch. The result is that the vhost
- will steal all hits going to the main_server address.
- <p>
+ will steal all hits going to the main_server address.</p>
<li>If two IP-based vhosts have an address in common, the vhost appearing
later in the file is always matched. Such a thing might happen
inadvertently. If the config has name-based vhosts and for some reason
the main_server <code>ServerName</code> resolves to the wrong address
then all the name-based vhosts will be parsed as ip-based vhosts.
- Then the last of them will steal all the hits.
- <P>
+ Then the last of them will steal all the hits.</P>
<li>The last name-based vhost in the config is always matched for any hit
- which doesn't match one of the other name-based vhosts.
+ which doesn't match one of the other name-based vhosts.</p>
</ul>
@@ -383,10 +373,10 @@
"ServerPath /abcdef").
<p>
-<li>Do not use <EM>port-based</EM> vhosts in the same server as
+<li>Do not use <i>port-based</i> vhosts in the same server as
name-based vhosts. A loose definition for port-based is a vhost which
-is determined by the port on the server (<em>i.e.</em>, one server with
-ports 8000, 8080, and 80 - all of which have different configurations).
+is determined by the port on the server (<em>i.e.</em> one server with
+ports 8000, 8080, and 80 all of which have different configurations).
<p>
</ul>
1.12.2.3 +4 -4 apache/htdocs/manual/virtual-host.html
Index: virtual-host.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/virtual-host.html,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -r1.12.2.2 -r1.12.2.3
--- virtual-host.html 1997/11/01 23:39:26 1.12.2.2
+++ virtual-host.html 1997/11/02 00:19:15 1.12.2.3
@@ -66,7 +66,7 @@
<ul>
<li>The different virtual hosts need very different httpd configurations, such
as different values for: <A HREF="mod/core.html#servertype">ServerType</A>,
- <A HREF="mod/core.html#user">User</A>,
+ <A HREF="mod/core.html#user">User</A>,
<A HREF="mod/core.html#group">Group</A>,
<A HREF="mod/mod_mime.html#typesconfig">TypesConfig</A> or
<A HREF="mod/core.html#serverroot">ServerRoot</A>.
@@ -154,7 +154,7 @@
may be used by a process; the limit is typically 64, and may usually be
increased up to a large hard-limit.
<p>
-Although Apache attempts to increase the limit as required, this
+Although Apache attempts to increase the limit as required, this
may not work if:
<ol>
<li>Your system does not provide the setrlimit() system call.
@@ -181,9 +181,9 @@
for the root process. This will exhibit itself as errors in the error log like
"unable to fork". There are two ways you can bump this up:
-<OL>
+<OL>
<LI>Have a <code>csh</code> script wrapper around httpd which sets the
-"rlimit" to some large number, like 512.
+"rlimit" to some large number, like 512.
<LI>Edit http_main.c to add calls to setrlimit() from main(), along the lines of
<PRE>
struct rlimit rlp;
No revision
No revision
1.8.2.2 +35 -35 apache/htdocs/manual/misc/API.html
Index: API.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/misc/API.html,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- API.html 1997/11/01 23:39:30 1.8.2.1
+++ API.html 1997/11/02 00:19:20 1.8.2.2
@@ -59,7 +59,7 @@
<h2><a name="basics">Basic concepts.</a></h2>
-We begin with an overview of the basic concepts behind the
+We begin with an overview of the basic concepts behind the
API, and how they are manifested in the code.
<h3><a name="HMR">Handlers, Modules, and Requests</a></h3>
@@ -78,7 +78,7 @@
<li> `Fixups' --- there aren't any of these yet, but the phase is
intended as a hook for possible extensions like
<code>SetEnv</code>, which don't really fit well elsewhere.
- <li> Actually sending a response back to the client.
+ <li> Actually sending a response back to the client.
<li> Logging the request
</ul>
@@ -89,7 +89,7 @@
<ul>
<li> <em>Handle</em> the request, and indicate that it has done so
- by returning the magic constant <code>OK</code>.
+ by returning the magic constant <code>OK</code>.
<li> <em>Decline</em> to handle the request, by returning the magic
integer constant <code>DECLINED</code>. In this case, the
server behaves in all respects as if the handler simply hadn't
@@ -160,7 +160,7 @@
(such as <code>ScriptAlias</code>).
With no further ado, the module itself:
-
+
<pre>
/* Declarations of handlers. */
@@ -273,17 +273,17 @@
server_rec *server;
/* What object is being requested */
-
+
char *uri;
char *filename;
char *path_info;
char *args; /* QUERY_ARGS, if any */
struct stat finfo; /* Set by server core;
* st_mode set to zero if no such file */
-
+
char *content_type;
char *content_encoding;
-
+
/* MIME header environments, in and out. Also, an array containing
* environment variables to be passed to subprocesses, so people can
* write modules to add to that environment.
@@ -293,14 +293,14 @@
* redirects (so the headers printed for ErrorDocument handlers will
* have them).
*/
-
+
table *headers_in;
table *headers_out;
table *err_headers_out;
table *subprocess_env;
/* Info about the request itself... */
-
+
int header_only; /* HEAD request, as opposed to GET */
char *protocol; /* Protocol, as given to us, or HTTP/0.9 */
char *method; /* GET, HEAD, POST, etc. */
@@ -321,10 +321,10 @@
* These are config vectors, with one void* pointer for each module
* (the thing pointed to being the module's business).
*/
-
+
void *per_dir_config; /* Options set in config files, etc. */
void *request_config; /* Notes on *this* request */
-
+
};
</pre>
@@ -426,14 +426,14 @@
{
int errstatus;
FILE *f;
-
+
if (r->method_number != M_GET) return DECLINED;
if (r->finfo.st_mode == 0) return NOT_FOUND;
if ((errstatus = set_content_length (r, r->finfo.st_size))
|| (errstatus = set_last_modified (r, r->finfo.st_mtime)))
return errstatus;
-
+
f = fopen (r->filename, "r");
if (f == NULL) {
@@ -441,7 +441,7 @@
r->filename, r);
return FORBIDDEN;
}
-
+
register_timeout ("send", r);
send_http_header (r);
@@ -491,7 +491,7 @@
handlers in such cases is the one which was originally built for the
initial request from the client; note that the bytes_sent field will
only be correct in the last request in the chain (the one for which a
-response was actually sent).
+response was actually sent).
<h2><a name="pools">Resource allocation and resource pools</a></h2>
@@ -561,7 +561,7 @@
struct my_structure *foo;
...
- foo = (foo *)palloc (r->pool, sizeof(my_structure));
+ foo = (foo *)palloc (r->pool, sizeof(my_structure));
}
</pre>
@@ -598,7 +598,7 @@
of the strings, as a unit; for instance:
<pre>
- pstrcat (r->pool, "foo", "/", "bar", NULL);
+ pstrcat (r->pool, "foo", "/", "bar", NULL);
</pre>
returns a pointer to 8 bytes worth of memory, initialized to
@@ -614,7 +614,7 @@
<pre>
...
- FILE *f = pfopen (r->pool, r->filename, "r");
+ FILE *f = pfopen (r->pool, r->filename, "r");
if (f == NULL) { ... } else { ... }
</pre>
@@ -641,7 +641,7 @@
<h3>Other sorts of resources --- cleanup functions</h3>
More text goes here. Describe the the cleanup primitives in terms of
-which the file stuff is implemented; also, <code>spawn_process</code>.
+which the file stuff is implemented; also, <code>spawn_process</code>.
<h3>Fine control --- creating and dealing with sub-pools, with a note
on sub-requests</h3>
@@ -783,7 +783,7 @@
new->forced_types = make_table (p, 4);
new->encoding_types = make_table (p, 4);
-
+
return new;
}
</pre>
@@ -876,9 +876,9 @@
<pre>
command_rec mime_cmds[] = {
-{ "AddType", add_type, NULL, OR_FILEINFO, TAKE2,
+{ "AddType", add_type, NULL, OR_FILEINFO, TAKE2,
"a mime type followed by a file extension" },
-{ "AddEncoding", add_encoding, NULL, OR_FILEINFO, TAKE2,
+{ "AddEncoding", add_encoding, NULL, OR_FILEINFO, TAKE2,
"an encoding (e.g., gzip), followed by a file extension" },
{ NULL }
};
@@ -919,7 +919,7 @@
should be present. If the arguments in the actual config file
are not as required, this string will be used to help give a
more specific error message. (You can safely leave this
- <code>NULL</code>).
+ <code>NULL</code>).
</ul>
Finally, having set this all up, we have to use it. This is
@@ -933,22 +933,22 @@
int find_ct(request_rec *r)
{
int i;
- char *fn = pstrdup (r->pool, r->filename);
+ char *fn = pstrdup (r->pool, r->filename);
mime_dir_config *conf = (mime_dir_config *)
- get_module_config(r->per_dir_config, &mime_module);
+ get_module_config(r->per_dir_config, &mime_module);
char *type;
- if (S_ISDIR(r->finfo.st_mode)) {
- r->content_type = DIR_MAGIC_TYPE;
+ if (S_ISDIR(r->finfo.st_mode)) {
+ r->content_type = DIR_MAGIC_TYPE;
return OK;
}
-
+
if((i=rind(fn,'.')) < 0) return DECLINED;
++i;
- if ((type = table_get (conf->encoding_types, &fn[i])))
+ if ((type = table_get (conf->encoding_types, &fn[i])))
{
- r->content_encoding = type;
+ r->content_encoding = type;
/* go back to previous extension to try to use it as a type */
@@ -957,11 +957,11 @@
++i;
}
- if ((type = table_get (conf->forced_types, &fn[i])))
+ if ((type = table_get (conf->forced_types, &fn[i])))
{
- r->content_type = type;
+ r->content_type = type;
}
-
+
return OK;
}
@@ -989,13 +989,13 @@
<pre>
char *add_redirect(cmd_parms *cmd, void *dummy, char *f, char *url)
{
- server_rec *s = cmd->server;
+ server_rec *s = cmd->server;
alias_server_conf *conf = (alias_server_conf *)
get_module_config(s->module_config,&alias_module);
alias_entry *new = push_array (conf->redirects);
if (!is_url (url)) return "Redirect to non-URL";
-
+
new->fake = f; new->real = url;
return NULL;
}
1.63.2.16 +7 -106 apache/htdocs/manual/misc/FAQ.html
Index: FAQ.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/misc/FAQ.html,v
retrieving revision 1.63.2.15
retrieving revision 1.63.2.16
diff -u -r1.63.2.15 -r1.63.2.16
--- FAQ.html 1997/11/02 00:16:03 1.63.2.15
+++ FAQ.html 1997/11/02 00:19:21 1.63.2.16
@@ -15,7 +15,7 @@
<!--#include virtual="header.html" -->
<H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
<P>
- $Revision: 1.63.2.15 $ ($Date: 1997/11/02 00:16:03 $)
+ $Revision: 1.63.2.16 $ ($Date: 1997/11/02 00:19:21 $)
</P>
<P>
The latest version of this FAQ is always available from the main
@@ -252,11 +252,6 @@
<LI><A HREF="#cgi-spec">Where can I find the "CGI
specification"?</A>
</LI>
- <LI><A HREF="#year2000">Is Apache Year 2000 compliant?</A>
- </LI>
- <LI><A HREF="#namevhost">I upgraded to Apache 1.3b2 and now my
- virtual hosts don't work!</A>
- </LI>
</OL>
</LI>
</UL>
@@ -327,7 +322,7 @@
<P>
For an independent assessment, see
<A
- HREF="http://webcompare.internet.com/chart.html"
+ HREF="http://webcompare.iworld.com/compare/chart.html"
>Web Compare</A>'s
comparison chart.
</P>
@@ -614,7 +609,7 @@
allow all files named "<SAMP>*.cgi</SAMP>" to be executable.
Perhaps all you want is to enable a particular file in a normal directory to
be executable. This can be alternatively accomplished
- <EM>via</EM>
+ via
<A
HREF="../mod/mod_rewrite.html"
><SAMP>mod_rewrite</SAMP></A>
@@ -1356,15 +1351,10 @@
</P>
<P>
The canonical location for Apache's core-dump files is the
- <A HREF="../mod/core.html#serverroot">ServerRoot</A>
- directory. As of Apache version 1.3, the location can be set <EM>via</EM>
- the
<A
- HREF="../mod/core.html#coredumpdirectory"
- ><SAMP>CoreDumpDirectory</SAMP></A>
- directive to a different directory. Make sure that this directory is
- writable by the user the server runs as (as opposed to the user the server
- is <EM>started</EM> as).
+ HREF="../mod/core.html#serverroot"
+ >ServerRoot</A>
+ directory.
</P>
<HR>
</LI>
@@ -1996,10 +1986,8 @@
</A>
<P>
You can't! The reason is: First, case translations for arbitrary length URLs
- cannot be done <EM>via</EM> regex patterns and corresponding substitutions.
- One need
- a per-character pattern like sed/Perl <SAMP>tr|..|..|</SAMP> feature.
- Second, just
+ cannot be done via regex patterns and corresponding substitutions. One need
+ a per-character pattern like sed/Perl <SAMP>tr|..|..|</SAMP> feature. Second, just
making URLs always upper or lower case will not resolve the complete problem
of case-INSENSITIVE URLs, because actually the URLs had to be rewritten to
the correct case-variant residing on the filesystem because in later
@@ -2058,93 +2046,6 @@
><SAMP>http://www.ast.cam.ac.uk/~drtr/cgi-spec.html</SAMP></A>>.
</LI>
</OL>
- </P>
- <HR>
- </LI>
- <LI><A NAME="year2000">
- <STRONG>Is Apache Year 2000 compliant?</STRONG>
- </A>
- <P>
- Yes, Apache is Year 2000 compliant.
- </P>
- <P>
- Apache internally never stores years as two digits.
- On the HTTP protocol level RFC1123-style addresses are generated
- which is the only format a HTTP/1.1-compliant server should
- generate. To be compatible with older applications Apache
- recognizes ANSI C's <CODE>asctime()</CODE> and
- RFC850-/RFC1036-style date formats, too.
- The <CODE>asctime()</CODE> format uses four-digit years,
- but the RFC850 and RFC1036 date formats only define a two-digit year.
- If Apache sees such a date with a value less than 70 it assumes that
- the century is <SAMP>20</SAMP> rather than <SAMP>19</SAMP>.
- </P>
- <P>
- Some aspects of Apache's output may use two-digit years, such as the
- automatic listing of directory contents provided by
- <A
- HREF="../mod/mod_autoindex.html"
- ><SAMP>mod_autoindex</SAMP></A>
- with the
- <A
- HREF="../mod/mod_autoindex.html#indexoptions"
- ><SAMP>FancyIndexing</SAMP></A>
- option enabled, but it is improper to depend upon such displays for
- specific syntax. And even that issue is being addressed by the
- developers; a future version of Apache should allow you to format that
- display as you like.
- </P>
- <P>
- Although Apache is Year 2000 compliant, you may still get problems
- if the underlying OS has problems with dates past year 2000
- (<EM>e.g.</EM>, OS calls which accept or return year numbers).
- Most (UNIX) systems store dates internally as signed 32-bit integers
- which contain the number of seconds since 1<SUP>st</SUP> January 1970, so
- the magic boundary to worry about is the year 2038 and not 2000.
- But modern operating systems shouldn't cause any trouble
- at all.
- </P>
- <HR>
- </LI>
- <LI><A NAME="namevhost">
- <STRONG>I upgraded to Apache 1.3b2 and now my virtual hosts don't
- work!</STRONG>
- </A>
- <P>
- In versions of Apache prior to 1.3b2, there was a lot of confusion
- regarding address-based virtual hosts and (HTTP/1.1) name-based
- virtual hosts, and the rules concerning how the server processed
- <SAMP><VirtualHost></SAMP> definitions were very complex and not
- well documented.
- </P>
- <P>
- Apache 1.3b2 introduced a new directive,
- <A
- HREF="http://www.apache.org/docs/mod/core.html#namevirtualhost"
- ><SAMP>NameVirtualHost</SAMP></A>,
- which simplifies the rules quite a bit. However, changing the rules
- like this means that your existing name-based
- <SAMP><VirtualHost></SAMP> containers probably won't work
- correctly immediately following the upgrade.
- </P>
- <P>
- To correct this problem, add the following line to the beginning of
- your server configuration file, before defining any virtual hosts:
- </P>
- <DL>
- <DD><CODE>NameVirtualHost <EM>n.n.n.n</EM></CODE>
- </DD>
- </DL>
- <P>
- Replace the "<SAMP>n.n.n.n</SAMP>" with the IP address to
- which the name-based virtual host names resolve; if you have multiple
- name-based hosts on multiple addresses, repeat the directive for each
- address.
- </P>
- <P>
- Make sure that your name-based <SAMP><VirtualHost></SAMP> blocks
- contain <SAMP>ServerName</SAMP> and possibly <SAMP>ServerAlias</SAMP>
- directives so Apache can be sure to tell them apart correctly.
</P>
<HR>
</LI>
1.6.2.2 +1 -1 apache/htdocs/manual/misc/client_block_api.html
Index: client_block_api.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/misc/client_block_api.html,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- client_block_api.html 1997/11/01 23:39:31 1.6.2.1
+++ client_block_api.html 1997/11/02 00:19:21 1.6.2.2
@@ -69,7 +69,7 @@
100 response is defeated). Never call this function more than once.
<li>Finally, call <code>get_client_block</code> in a loop. Pass it a
- buffer and its
+ buffer and its
size. It will put data into the buffer (not necessarily the full
buffer, in the case of chunked inputs), and return the length of
the input block. When it is done reading, it will
1.7.2.6 +0 -14 apache/htdocs/manual/misc/compat_notes.html
Index: compat_notes.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/misc/compat_notes.html,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -r1.7.2.5 -r1.7.2.6
--- compat_notes.html 1997/11/02 00:16:04 1.7.2.5
+++ compat_notes.html 1997/11/02 00:19:22 1.7.2.6
@@ -127,20 +127,6 @@
<a href="../mod/core.html#errordocument"><code>ErrorDocument</code></a>
instead.
- <LI>Apache (as of 1.3) always performs the equivalent of
- <CODE>HostnameLookups minimal</CODE>. <code>minimal</code> is not an
- option to <a href="../mod/core.html#hostnamelookups"><code>
- HostnameLookups</code></a>.
-
- <LI>To embed spaces in directive arguments NCSA used a backslash
- before the space. Apache treats backslashes as normal characters. To
- embed spaces surround the argument with double-quotes instead.
-
- <LI>Apache does not implement the NCSA <CODE>referer</CODE>
- directive. See <A HREF="http://bugs.apache.org/index/full/968">
- PR#968</A> for a few brief suggestions on alternative ways to
- implement the same thing under Apache.
-
</OL>
More to come when we notice them....
1.7.2.5 +33 -32 apache/htdocs/manual/misc/fin_wait_2.html
Index: fin_wait_2.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/misc/fin_wait_2.html,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -r1.7.2.4 -r1.7.2.5
--- fin_wait_2.html 1997/11/02 00:16:04 1.7.2.4
+++ fin_wait_2.html 1997/11/02 00:19:22 1.7.2.5
@@ -29,10 +29,10 @@
state that the connection is in during the period between when the
server gets the ACK from the client and the server gets the FIN from
the client is known as FIN_WAIT_2. See the <A
-HREF="ftp://ds.internic.net/rfc/rfc793.txt">TCP RFC</A> for the
+HREF="ftp://ds.internic.net/rfc/rfc793.txt">TCP RFC</A> for the
technical details of the state transitions.<P>
-The FIN_WAIT_2 state is somewhat unusual in that there is no timeout
+The FIN_WAIT_2 state is somewhat unusual in that there is no timeout
defined in the standard for it. This means that on many operating
systems, a connection in the FIN_WAIT_2 state will stay around until
the system is rebooted. If the system does not have a timeout and
@@ -43,8 +43,8 @@
<LI><H2>But why does it happen?</H2>
-There are numerous reasons for it happening, some of them may not
-yet be fully clear. What is known follows.<P>
+There are several reasons for it happening, and not all of them are
+fully understood by the Apache team yet. What is known follows.<P>
<H3>Buggy clients and persistent connections</H3>
@@ -111,14 +111,15 @@
all servers that support persistent connections, including Apache 1.1.x
and 1.2.<P>
-<H3>A necessary bit of code introduced in 1.2</H3>
+<H3>Something in Apache may be broken</H3>
While the above bug is a problem, it is not the whole problem.
Some users have observed no FIN_WAIT_2 problems with Apache 1.1.x,
but with 1.2b enough connections build up in the FIN_WAIT_2 state to
-crash their server.
+crash their server. We have not yet identified why this would occur
+and welcome additional test input.<P>
-The most likely source for additional FIN_WAIT_2 states
+One possible (and most likely) source for additional FIN_WAIT_2 states
is a function called <CODE>lingering_close()</CODE> which was added
between 1.1 and 1.2. This function is necessary for the proper
handling of persistent connections and any request which includes
@@ -133,13 +134,13 @@
the connection has closed.
See the <A HREF="#appendix">appendix</A> for more details.<P>
-The code in <CODE>lingering_close()</CODE> appears to cause problems
-for a number of factors, including the change in traffic patterns
-that it causes. The code has been thoroughly reviewed and we are
-not aware of any bugs in it. It is possible that there is some
-problem in the BSD TCP stack, aside from the lack of a timeout
-for the FIN_WAIT_2 state, exposed by the <CODE>lingering_close</CODE>
-code that causes the observed problems.<P>
+We have not yet tracked down the exact reason why
+<CODE>lingering_close()</CODE> causes problems. Its code has been
+thoroughly reviewed and extensively updated in 1.2b6. It is possible
+that there is some problem in the BSD TCP stack which is causing the
+observed problems. It is also possible that we fixed it in 1.2b6.
+Unfortunately, we have not been able to replicate the problem on our
+test servers.<P>
<H2><LI>What can I do about it?</H2>
@@ -157,42 +158,42 @@
<LI><A HREF="http://www.freebsd.org/">FreeBSD</A> versions starting at 2.0 or possibly earlier.
<LI><A HREF="http://www.netbsd.org/">NetBSD</A> version 1.2(?)
<LI><A HREF="http://www.openbsd.org/">OpenBSD</A> all versions(?)
- <LI><A HREF="http://www.bsdi.com/">BSD/OS</A> 2.1, with the
+ <LI><A HREF="http://www.bsdi.com/">BSD/OS</A> 2.1, with the
<A HREF="ftp://ftp.bsdi.com/bsdi/patches/patches-2.1/K210-027">
- K210-027</A> patch installed.
+ K210-027</A> patch installed.
<LI><A HREF="http://www.sun.com/">Solaris</A> as of around version
- 2.2. The timeout can be tuned by using <CODE>ndd</CODE> to
+ 2.2. The timeout can be tuned by using <CODE>ndd</CODE> to
modify <CODE>tcp_fin_wait_2_flush_interval</CODE>, but the
- default should be appropriate for most servers and improper
+ default should be appropriate for most servers and improper
tuning can have negative impacts.
<LI><A HREF="http://www.sco.com/">SCO TCP/IP Release 1.2.1</A>
can be modified to have a timeout by following
<A HREF="http://www.sco.com/cgi-bin/waisgate?WAISdocID=2242622956+0+0+0&WAISaction=retrieve"> SCO's instructions</A>.
<LI><A HREF="http://www.linux.org/">Linux</A> 2.0.x and
earlier(?)
- <LI><A HREF="http://www.hp.com/">HP-UX</A> 10.x defaults to
- terminating connections in the FIN_WAIT_2 state after the
+ <LI><A HREF="http://www.hp.com/">HP-UX</A> 10.x defaults to
+ terminating connections in the FIN_WAIT_2 state after the
normal keepalive timeouts. This does not
refer to the persistent connection or HTTP keepalive
- timeouts, but the <CODE>SO_LINGER</CODE> socket option
- which is enabled by Apache. This parameter can be adjusted
+ timeouts, but the <CODE>SO_LINGER</CODE> socket option
+ which is enabled by Apache. This parameter can be adjusted
by using <CODE>nettune</CODE> to modify parameters such as
<CODE>tcp_keepstart</CODE> and <CODE>tcp_keepstop</CODE>.
In later revisions, there is an explicit timer for
connections in FIN_WAIT_2 that can be modified; contact HP
support for details.
<LI><A HREF="http://www.sgi.com/">SGI IRIX</A> can be patched to
- support a timeout. For IRIX 5.3, 6.2, and 6.3,
+ support a timeout. For IRIX 5.3, 6.2, and 6.3,
use patches 1654, 1703 and 1778 respectively. If you
have trouble locating these patches, please contact your
SGI support channel for help.
<LI><A HREF="http://www.ncr.com/">NCR's MP RAS Unix</A> 2.xx and
3.xx both have FIN_WAIT_2 timeouts. In 2.xx it is non-tunable
at 600 seconds, while in 3.xx it defaults to 600 seconds and
- is calculated based on the tunable "max keep alive probes"
+ is calculated based on the tunable "max keep alive probes"
(default of 8) multiplied by the "keep alive interval" (default
75 seconds).
- <LI><A HREF="http://www.sequent.com">Sequent's ptx/TCP/IP for
+ <LI><A HREF="http://www.sequent.com">Squent's ptx/TCP/IP for
DYNIX/ptx</A> has had a FIN_WAIT_2 timeout since around
release 4.1 in mid-1994.
</UL>
@@ -206,7 +207,7 @@
source should be easy to patch.
</UL>
<P>
-There is a
+There is a
<A HREF="http://www.apache.org/dist/contrib/patches/1.2/fin_wait_2.patch">
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
@@ -220,8 +221,8 @@
<CODE>lingering_close()</CODE> function. This will result in that
section of code being similar to that which was in 1.1. If you do
this, be aware that it can cause problems with PUTs, POSTs and
-persistent connections, especially if the client uses pipelining.
-That said, it is no worse than on 1.1, and we understand that keeping your
+persistent connections, especially if the client uses pipelining.
+That said, it is no worse than on 1.1, and we understand that keeping your
server running is quite important.<P>
To compile without the <CODE>lingering_close()</CODE> function, add
@@ -260,9 +261,9 @@
The exact way to increase them may depend on your OS; look
for some reference to the number of "mbufs" or "mbuf clusters". On
-many systems, this can be done by adding the line
-<CODE>NMBCLUSTERS="n"</CODE>, where <CODE>n</CODE> is the number of
-mbuf clusters you want to your kernel config file and rebuilding your
+many systems, this can be done by adding the line
+<CODE>NMBCLUSTERS="n"</CODE>, where <CODE>n</CODE> is the number of
+mbuf clusters you want to your kernel config file and rebuilding your
kernel.<P>
</DL>
@@ -304,7 +305,7 @@
There are two conditions under which this is likely to occur:
<OL>
<LI>sending POST or PUT data without proper authorization
-<LI>sending multiple requests before each response (pipelining)
+<LI>sending multiple requests before each response (pipelining)
and one of the middle requests resulting in an error or
other break-the-connection result.
</OL>
1.3.2.3 +1 -1 apache/htdocs/manual/misc/nopgp.html
Index: nopgp.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/misc/nopgp.html,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- nopgp.html 1997/11/01 23:39:32 1.3.2.2
+++ nopgp.html 1997/11/02 00:19:23 1.3.2.3
@@ -54,7 +54,7 @@
</UL>
-It kind of sickens us that we had to do it, but so be it.
+It kind of sickens us that we had to do it, but so be it.
<P>
1.6.2.3 +4 -4 apache/htdocs/manual/misc/perf-bsd44.html
Index: perf-bsd44.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/misc/perf-bsd44.html,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- perf-bsd44.html 1997/11/01 23:39:32 1.6.2.2
+++ perf-bsd44.html 1997/11/02 00:19:23 1.6.2.3
@@ -41,7 +41,7 @@
<p>
After the edit, recompile the kernel and recompile the Apache server
-then reboot.
+then reboot.
<P>
@@ -134,8 +134,8 @@
which time its mbufs are not yet freed. Another reason is that, on server
timeouts, some connections end up in FIN_WAIT_2 state forever, because
this state doesn't time out on the server, and the browser never sent
-a final FIN. For more details see the
-<A HREF="fin_wait_2.html">FIN_WAIT_2</A> page.
+a final FIN. For more details see the
+<A HREF="fin_wait_2.html">FIN_WAIT_2</A> page.
<p>
@@ -169,7 +169,7 @@
Be aware that your system may not boot with a kernel that is configured
to use more resources than you have available system RAM. <b>ALWAYS</b>
have a known bootable kernel available when tuning your system this way,
-and use the system tools beforehand to learn if you need to buy more
+and use the system tools beforehand to learn if you need to buy more
memory before tuning.
<p>
1.4.2.2 +1 -1 apache/htdocs/manual/misc/perf-dec.html
Index: perf-dec.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/misc/perf-dec.html,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- perf-dec.html 1997/11/01 23:39:33 1.4.2.1
+++ perf-dec.html 1997/11/02 00:19:24 1.4.2.2
@@ -16,7 +16,7 @@
Below is a set of newsgroup posts made by an engineer from DEC in
response to queries about how to modify DEC's Digital Unix OS for more
-heavily loaded web sites. Copied with permission.
+heavily loaded web sites. Copied with permission.
<HR>
1.8.2.6 +8 -13 apache/htdocs/manual/misc/perf.html
Index: perf.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/misc/perf.html,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -u -r1.8.2.5 -r1.8.2.6
--- perf.html 1997/11/02 00:16:05 1.8.2.5
+++ perf.html 1997/11/02 00:19:24 1.8.2.6
@@ -59,12 +59,11 @@
Digital UNIX
</A></H3>
-<UL>
- <LI><A
- HREF="http://www.digital.com/info/internet/document/ias/tuning.html"
- >DIGITAL UNIX Tuning Parameters for Web Servers</A>
- <LI>We have some <A HREF="perf-dec.html">newsgroup postings</A> on how
- to tune Digital UNIX 3.2 and 4.0.
+<UL>
+ <LI><A HREF="http://www.digital.com/info/internet/document/ias/tuning.html">DIGITAL
+ UNIX Tuning Parameters for Web Servers</A>
+ <LI>We have some <A HREF="perf-dec.html">newsgroup postings</A> on how to tune
+ Digital UNIX 3.2 and 4.0.
</UL>
<P><HR>
@@ -108,11 +107,7 @@
<UL>
-<LI><A href="http://www.sun.com/sun-on-net/Sun.Internet.Solutions/performance/">
-World Wide Web Server Performance,
-<http://www.sun.com/sun-on-net/Sun.Internet.Solutions/performance/></a>
-<LI><A HREF="http://www.sun.com/solaris/products/siss/">
-Solaris Internet Server Supplement for 2.5.1</A>
+<LI><A href="http://www.sun.com/sun-on-net/performance.html">Sun Performance Information</a>
</UL>
<P><HR>
@@ -121,9 +116,9 @@
SunOS 4.x
</A></H3>
-More information on tuning SOMAXCONN on SunOS can be found at
+More information on tuning SOMAXCONN on SunOS can be found at
<A HREF="http://www.islandnet.com/~mark/somaxconn.html">
-http://www.islandnet.com/~mark/somaxconn.html</A>.
+http://www.islandnet.com/~mark/somaxconn.html</A>.
<P><HR>
1.8.2.4 +2 -2 apache/htdocs/manual/misc/security_tips.html
Index: security_tips.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/misc/security_tips.html,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- security_tips.html 1997/11/01 23:39:34 1.8.2.3
+++ security_tips.html 1997/11/02 00:19:25 1.8.2.4
@@ -24,14 +24,14 @@
<H2>Permissions on Log File Directories</H2>
<P>When Apache starts, it opens the log files as the user who started the
-server before switching to the user defined in the
+server before switching to the user defined in the
<a href="../mod/core.html#user"><b>User</b></a> directive. Anyone who
has write permission for the directory where any log files are
being written to can append pseudo-arbitrary data to any file on the
system which is writable by the user who starts Apache. Since the
server is normally started by root, you should <EM>NOT</EM> give anyone
write permission to the directory where logs are stored unless you
-want them to have root access.
+want them to have root access.
<P>
<HR>
<H2>Server Side Includes</H2>
1.6.2.3 +23 -23 apache/htdocs/manual/misc/vif-info.html
Index: vif-info.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/misc/vif-info.html,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- vif-info.html 1997/11/01 23:39:35 1.6.2.2
+++ vif-info.html 1997/11/02 00:19:26 1.6.2.3
@@ -26,7 +26,7 @@
This is a topic that comes up once in a while on comp.protocols.tcp-ip
and other newsgroups. The question is, how to get a machine with one
-network interface to respond to more than one IP addresses.
+network interface to respond to more than one IP addresses.
I have a solution than might suit you. For my doctoral work (there's
a paper about it in this year's ('91) SIGCOMM, also available for
@@ -52,16 +52,16 @@
ifconfig le0 198.3.2.1 up -trailers # config primary interface
ifconfig vif0 198.4.3.2 up # config first virtual interface
- route delete net 198.4.3 198.4.3.2 # delete spurious route
+ route delete net 198.4.3 198.4.3.2 # delete spurious route
route add host 198.4.3.2 198.4.3.2 0 # add route for this i/f
ifconfig vif1 198.5.4.3 up # config second virtual interface
- route delete net 198.5.4 198.5.4.3 # delete spurious route
+ route delete net 198.5.4 198.5.4.3 # delete spurious route
route add host 198.5.4.3 198.5.4.3 0 # add route for this i/f
The route deletes are needed because the ifconfig creates a default
route to the interface's network, which can cause problems; all that's
-needed is the (host) route to the interface's address.
+needed is the (host) route to the interface's address.
Now, get le0's ethernet address (say, 8:0:20:3:2:1), and add the
following static ARP entries:
@@ -70,12 +70,12 @@
arp -s 198.5.4.3 8:0:20:3:2:1 pub
This will cause any ARP requests for the VIF addresses to be replied
-with your machine's ethernet address.
+with your machine's ethernet address.
Now, make sure your default route is to your segment's gateway,
through the real interface. Finally, make sure your routers and/or
hosts on the same segment as yours know that 198.4.3.2 and 198.5.4.3
-are on that cable.
+are on that cable.
Here's what you've accomplished.
@@ -85,7 +85,7 @@
reaching your host with any of these addresses will be accepted by the
ip_input routine because they match the address of one of the host's
interfaces. Packets leaving your host can have any of its addresses
-(real and virtual).
+(real and virtual).
The code for vif follows. To use it, put the stuff in netinet/if_vif.c
and netinet/if_vif.h, configure your kernel with the number of
@@ -134,10 +134,10 @@
Finally, here's the code. It has the tunneling pieces removed (you
need more code to use that anyway), and it comes from a Mach 2.6
kernel; it should compile on any Berkeley-derived unix with minor
-changes (most likely only in the includes).
+changes (most likely only in the includes).
---------------------netinet/if_vif.h--------------------------------------
-typedef struct
+typedef struct
{
struct ifnet vif_if;
struct ifnet *vif_sif; /* slave interface */
@@ -194,7 +194,7 @@
register int i;
register struct ifnet *ifp;
int vifoutput(), vififioctl();
-
+
for (i=0; i<NVIF; i++)
{
ifp = &vif_softc[i].vif_if;
@@ -212,20 +212,20 @@
int dev, flag;
{
int unit;
-
+
if (!vifs_inited)
{
vifattach();
vifs_inited = 1;
printf("vif initialized\n");
}
-
+
unit = minor(dev);
if ((unit < 0) || (unit >= NVIF))
{
return ENXIO;
}
-
+
return 0;
}
@@ -259,10 +259,10 @@
register struct ifqueue *ifq;
struct mbuf *m;
struct sockaddr_in *din;
-
+
if (dst->sa_family != AF_INET)
{
- printf("%s%d: can't handle af%d\n",
+ printf("%s%d: can't handle af%d\n",
ifp->if_name, ifp->if_unit,
dst->sa_family);
m_freem(m0);
@@ -270,11 +270,11 @@
}
din = (struct sockaddr_in *)dst;
-
+
if (din->sin_addr.s_addr == IA_SIN(ifp->if_addrlist)->sin_addr.s_addr)
{
/* printf("%s%d: looping\n", ifp->if_name, ifp->if_unit); */
-
+
/*
* Place interface pointer before the data
* for the receiving protocol.
@@ -345,14 +345,14 @@
int mode;
{
int unit;
-
+
unit = minor(dev);
if ((unit < 0) || (unit >= NVIF))
return ENXIO;
-
+
return EINVAL;
}
-----------------------------------------------------------------------------
+----------------------------------------------------------------------------
To use it, compile your kernel, and reboot. Then create the vif
device:
@@ -367,15 +367,15 @@
This will cause the device to be opened, which will if_attach the
interfaces. If you feel like playing with the code, you may want to
kmem_alloc() the vif_softc structrure at open time, and use the minor
-number of the device to tell it how many interfaces to create.
+number of the device to tell it how many interfaces to create.
-Now you can go ahead and ifconfig etc.
+Now you can go ahead and ifconfig etc.
I'll be happy to answer minor questions, and hear about success and
failure stories, but I cannot help you if you don't already know how
to hack kernels.
-Good luck!
+Good luck!
/ji
No revision
No revision
1.56.2.5 +61 -60 apache/htdocs/manual/mod/core.html
Index: core.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v
retrieving revision 1.56.2.4
retrieving revision 1.56.2.5
diff -u -r1.56.2.4 -r1.56.2.5
--- core.html 1997/11/01 23:39:38 1.56.2.4
+++ core.html 1997/11/02 00:19:30 1.56.2.5
@@ -15,11 +15,11 @@
<!--#include virtual="header.html" -->
<H1 ALIGN="CENTER">Apache Core Features</h1>
-<P>
+
These configuration parameters control the core Apache features, and are
always available.
-</P>
-<H2>Directives</H2>
+
+
<ul>
<li><A HREF="#accessconfig">AccessConfig</A>
<li><A HREF="#accessfilename">AccessFileName</A>
@@ -112,7 +112,7 @@
AllowOverride None<br>
</Directory></code></blockquote><p><hr>
-<h2><A name="addmodule">AddModule directive</A></h2>
+<A name="addmodule"><h2>AddModule directive</h2></A>
<!--%plaintext <?INDEX {\tt AddModule} directive> -->
<strong>Syntax:</strong> AddModule <em>module module ...</em><br>
<strong>Context:</strong> server config <br>
@@ -125,7 +125,7 @@
be cleared with the <A HREF="#clearmodulelist">ClearModuleList</A>
directive.<p><hr>
-<h2><A name="allowoverride">AllowOverride directive</A></h2>
+<A name="allowoverride"><h2>AllowOverride directive</h2></A>
<!--%plaintext <?INDEX {\tt AllowOverride} directive> -->
<strong>Syntax:</strong> AllowOverride <em>override override ...</em><br>
<strong>Default:</strong> <code>AllowOverride All</code><br>
@@ -187,7 +187,7 @@
<A HREF="mod_include.html#xbithack">XBitHack</A>).
</dl><p><hr>
-<h2><A name="authname">AuthName directive</A></h2>
+<A name="authname"><h2>AuthName directive</h2></A>
<!--%plaintext <?INDEX {\tt AuthName} directive> -->
<strong>Syntax:</strong> AuthName <em>auth-domain</em><br>
<strong>Context:</strong> directory, .htaccess<br>
@@ -202,7 +202,7 @@
<A HREF="mod_auth.html#authuserfile">AuthUserFile</A> and
<A HREF="mod_auth.html#authgroupfile">AuthGroupFile</A> to work.<p><hr>
-<h2><A name="authtype">AuthType directive</A></h2>
+<A name="authtype"><h2>AuthType directive</h2></A>
<!--%plaintext <?INDEX {\tt AuthType} directive> -->
<strong>Syntax:</strong> AuthType <em>type</em><br>
<strong>Context:</strong> directory, .htaccess<br>
@@ -217,7 +217,7 @@
<A HREF="mod_auth.html#authuserfile">AuthUserFile</A> and
<A HREF="mod_auth.html#authgroupfile">AuthGroupFile</A> to work.<p><hr>
-<h2><A name="bindaddress">BindAddress directive</A></h2>
+<A name="bindaddress"><h2>BindAddress directive</h2></A>
<!--%plaintext <?INDEX {\tt BindAddress} directive> -->
<strong>Syntax:</strong> BindAddress <em>saddr</em><br>
<strong>Default:</strong> <code>BindAddress *</code><br>
@@ -248,7 +248,7 @@
<hr>
-<h2><A name="clearmodulelist">ClearModuleList directive</A></h2>
+<A name="clearmodulelist"><h2>ClearModuleList directive</h2></A>
<!--%plaintext <?INDEX {\tt ClearModuleList} directive> -->
<strong>Syntax:</strong> ClearModuleList<br>
<strong>Context:</strong> server config<br>
@@ -277,7 +277,7 @@
would be appropriate for a directory which contained many gif images
with filenames missing the .gif extension.<p><hr>
-<h2><A name="directory"><Directory> directive</A></h2>
+<A name="directory"><h2><Directory> directive</h2></A>
<!--%plaintext <?INDEX {\tt Directory} section directive> -->
<strong>Syntax:</strong> <Directory <em>directory</em>> ... </Directory> <br>
<strong>Context:</strong> server config, virtual host<br>
@@ -377,7 +377,7 @@
<p><hr>
-<h2><A name="errordocument">ErrorDocument directive</A></h2>
+<A name="errordocument"><h2>ErrorDocument directive</h2></A>
<!--%plaintext <?INDEX {\tt ErrorDocument} directive> -->
<strong>Syntax:</strong> ErrorDocument <em>error-code document</em><br>
<strong>Context</strong> server config, virtual host, directory, .htaccess<br>
@@ -396,14 +396,14 @@
<LI>redirect to an external URL to handle the problem/error
</OL>
-<P>The first option is the default, while options 2-4 are configured
-using the <CODE>ErrorDocument</CODE> directive, which is followed by
+<P>The first option is the default, while options 2-4 are configured
+using the <CODE>ErrorDocument</CODE> directive, which is followed by
the HTTP response code and a message or URL.
<P><em>Messages</em> in this context begin with a single quote
-(<code>"</code>), which does not form part of the message itself.
-Apache will sometimes offer additional information regarding the
-problem/error.
+(<code>"</code>), which does not form part of the message itself.
+Apache will sometimes offer additional information regarding the
+problem/error.
<P>URLs can begin with a slash (/) for local URLs, or be a full
URL which the client can resolve. Examples:
@@ -414,10 +414,10 @@
ErrorDocument 403 "Sorry can't allow you access today
</code></blockquote>
-<P>Note that when you specify an <CODE>ErrorDocument</CODE> that
-points to a remote URL (ie. anything with a method such as "http" in
+<P>Note that when you specify an <CODE>ErrorDocument</CODE> that
+points to a remote URL (ie. anything with a method such as "http" in
front of it) Apache will send a redirect to the client to tell it
-where to find the document, even if the document ends up being
+where to find the document, even if the document ends up being
on the same server.. This has several implications, the
most important being that <STRONG>if you use an "ErrorDocument 401"
directive then it must refer to a local document.</STRONG> This results
@@ -426,7 +426,7 @@
<P>See Also: <A HREF="../custom-error.html">documentation of customizable
responses.</A><p><hr>
-<h2><A name="errorlog">ErrorLog directive</A></h2>
+<A name="errorlog"><h2>ErrorLog directive</h2></A>
<!--%plaintext <?INDEX {\tt ErrorLog} directive> -->
<strong>Syntax:</strong> ErrorLog <em>filename</em><br>
<strong>Default:</strong> <code>ErrorLog logs/error_log</code><br>
@@ -440,14 +440,14 @@
<blockquote><code>ErrorLog /dev/null</code></blockquote>
This effectively turns off error logging.<p>
-SECURITY: See the <A HREF="../misc/security_tips.html">security tips</A>
+SECURITY: See the <A HREF="../misc/security_tips.html">security tips</A>
document for details on why your security could be compromised if
the directory where logfiles are stored is writable by anyone other
than the user that starts the server.
<p><hr>
-<h2><A name="files"><Files> directive</A></h2>
+<A name="files"><h2><Files></h2></A>
<strong>Syntax:</strong> <Files <em>filename</em>>
... </Files><br>
<strong>Context:</strong> server config, virtual host, htaccess<br>
@@ -560,13 +560,13 @@
servers accessible from the Internet.
<p><hr>
-<H2><A NAME="ifmodule"><IfModule> directive</A></H2>
+<A NAME="ifmodule"><H2><IfModule></H2></A>
<b>Syntax:</b> <IfModule [!]<i>module-name</i>> <i>...</i>
</IfModule><br>
<b>Default:</b> None<br>
<b>Context:</b> all<br>
-<b>Status:</b> Core<br>
-<strong>Compatibility:</strong> IfModule is only available in 1.2 and
+<b>Status:</b> Core
+<strong>Compatibility:</strong> ScriptLog is only available in 1.2 and
later.<P>
<p>
@@ -600,7 +600,7 @@
<P> <hr>
-<h2><a name="keepalive">KeepAlive directive</a></h2>
+<h2><a name="keepalive">KeepAlive</a></h2>
<strong>Syntax: (Apache 1.1)</strong> KeepAlive <em>max-requests</em><br>
<strong>Default: (Apache 1.1)</strong> <code>KeepAlive 5</code><br>
<strong>Syntax: (Apache 1.2)</strong> KeepAlive <em>on/off</em><br>
@@ -623,7 +623,7 @@
persistent connections, "Off" to disable. See also the <a
href="#maxkeepaliverequests">MaxKeepAliveRequests</a> directive.</p>
-<h2><a name="keepalivetimeout">KeepAliveTimeout directive</a></h2>
+<h2><a name="keepalivetimeout">KeepAliveTimeout</a></h2>
<strong>Syntax:</strong> KeepAliveTimeout <em>seconds</em><br>
<strong>Default:</strong> <code>KeepAliveTimeout 15</code><br>
<strong>Context:</strong> server config<br>
@@ -638,7 +638,7 @@
applies.
<hr>
-<h2><A name="listen">Listen directive</A></h2>
+<A name="listen"><h2>Listen</h2></A>
<strong>Syntax:</strong>
Listen [<em>IP address</em>:]<em>port number</em><br>
<strong>Context:</strong> server config<br>
@@ -659,7 +659,7 @@
<a href="../misc/known_bugs.html#listenbug">Known Bugs</a></p>
<hr>
-<h2><A name="limit"><Limit> directive</A></h2>
+<A name="limit"><h2><Limit> directive</h2></A>
<!--%plaintext <?INDEX {\tt Limit} section directive> -->
<strong>Syntax:</strong>
<Limit <em>method method</em> ... > ... </Limit><br>
@@ -679,7 +679,7 @@
If an access control directive appears outside a <Limit> directive,
then it applies to all access methods.<p><hr>
-<h2><a name="location"><Location> directive</a></h2>
+<h2><a name="location"><Location></a></h2>
<strong>Syntax:</strong> <Location <em>URL</em>>
... </Location><br>
@@ -749,7 +749,7 @@
<P><HR>
-<h2><A name="maxclients">MaxClients directive</A></h2>
+<A name="maxclients"><h2>MaxClients</h2></A>
<!--%plaintext <?INDEX {\tt MaxClients} directive> -->
<strong>Syntax:</strong> MaxClients <em>number</em><br>
<strong>Default:</strong> <code>MaxClients 256</code><br>
@@ -760,7 +760,7 @@
requests that can be supported; not more than this number of child server
processes will be created.<p><hr>
-<h2><A name="maxkeepaliverequests">MaxKeepAliveRequests directive</A></h2>
+<A name="maxkeepaliverequests"><h2>MaxKeepAliveRequests</h2></A>
<strong>Syntax:</strong> MaxKeepAliveRequests <em>number</em><br>
<strong>Default:</strong> <code>MaxKeepAliveRequests 100</code><br>
<strong>Context:</strong> server config<br>
@@ -774,7 +774,7 @@
allowed. We recommend that this setting be kept to a high value for
maximum server performance.
-<h2><A name="maxrequestsperchild">MaxRequestsPerChild directive</A></h2>
+<A name="maxrequestsperchild"><h2>MaxRequestsPerChild directive</h2></A>
<!--%plaintext <?INDEX {\tt MaxRequestsPerChild} directive> -->
<strong>Syntax:</strong> MaxRequestsPerChild <em>number</em><br>
<strong>Default:</strong> <code>MaxRequestsPerChild 0</code><br>
@@ -794,7 +794,7 @@
number of processes when the server load reduces.
</ul><p><hr>
-<h2><A name="maxspareservers">MaxSpareServers directive</A></h2>
+<A name="maxspareservers"><h2>MaxSpareServers directive</h2></A>
<!--%plaintext <?INDEX {\tt MaxSpareServers} directive> -->
<strong>Syntax:</strong> MaxSpareServers <em>number</em><br>
<strong>Default:</strong> <code>MaxSpareServers 10</code><br>
@@ -812,7 +812,7 @@
See also <A HREF="#minspareservers">MinSpareServers</A> and
<A HREF="#startservers">StartServers</A>.<p><hr>
-<h2><A name="minspareservers">MinSpareServers directive</A></h2>
+<A name="minspareservers"><h2>MinSpareServers directive</h2></A>
<!--%plaintext <?INDEX {\tt MinSpareServers} directive> -->
<strong>Syntax:</strong> MinSpareServers <em>number</em><br>
<strong>Default:</strong> <code>MinSpareServers 5</code><br>
@@ -830,7 +830,7 @@
See also <A HREF="#maxspareservers">MaxSpareServers</A> and
<A HREF="#startservers">StartServers</A>.<p><hr>
-<h2><A name="options">Options directive</A></h2>
+<A name="options"><h2>Options directive</h2></A>
<!--%plaintext <?INDEX {\tt Options} directive> -->
<strong>Syntax:</strong> Options <em>[+|-]option [+|-]option ...</em><br>
<strong>Context:</strong> server config, virtual host, directory, .htaccess<br>
@@ -838,7 +838,7 @@
<strong>Status:</strong> core<p>
The Options directive controls which server features are available in
-a particular directory.
+a particular directory.
<p>
<em>option</em> can be set to <code>None</code>, in which case none of
the extra features are enabled, or one or more of the following:
@@ -917,7 +917,7 @@
are set for the /web/docs/spec directory.
<hr>
-<h2><A name="pidfile">PidFile directive</A></h2>
+<A name="pidfile"><h2>PidFile directive</h2></A>
<!--%plaintext <?INDEX {\tt PidFile} directive> -->
<strong>Syntax:</strong> PidFile <em>filename</em><br>
<strong>Default:</strong> <code>PidFile logs/httpd.pid</code><br>
@@ -939,7 +939,7 @@
<p><hr>
-<h2><A name="port">Port directive</A></h2>
+<A name="port"><h2>Port directive</h2></A>
<!--%plaintext <?INDEX {\tt Port} directive> -->
<strong>Syntax:</strong> Port <em>number</em><br>
<strong>Default:</strong> <code>Port 80</code><br>
@@ -968,7 +968,7 @@
sets the <code>SERVER_PORT</code> environment variable (for
<a href="mod_cgi.html">CGI</a> and <a href="mod_include.html">SSI</a>),
and is used when the server must generate a URL that refers to itself
-(for example when creating an external redirect to itself).
+(for example when creating an external redirect to itself).
</ul>
In no event does a Port setting affect
@@ -995,7 +995,7 @@
root whilst handling connections, your site may be open to a major security
attack.<p><hr>
-<h2><A name="require">require directive</A></h2>
+<A name="require"><h2>require directive</h2></A>
<!--%plaintext <?INDEX {\tt require} directive> -->
<strong>Syntax:</strong> require <em>entity-name entity entity...</em><br>
<strong>Context:</strong> directory, .htaccess<br>
@@ -1032,7 +1032,7 @@
<A HREF="mod_auth.html#authgroupfile">AuthGroupFile</A> (to define users and
groups) in order to work correctly.<p><hr>
-<h2><A name="resourceconfig">ResourceConfig directive</A></h2>
+<A name="resourceconfig"><h2>ResourceConfig directive</h2></A>
<!--%plaintext <?INDEX {\tt ResourceConfig} directive> -->
<strong>Syntax:</strong> ResourceConfig <em>filename</em><br>
<strong>Default:</strong> <code>ResourceConfig conf/srm.conf</code><br>
@@ -1051,7 +1051,8 @@
See also <A HREF="#accessconfig">AccessConfig</A>.<p><hr>
-<H2><A name="rlimit">RLimitCPU</A> <A NAME="rlimitcpu">directive</A></H2>
+<A name="rlimit"> </A>
+<A name="rlimitcpu"><h2>RLimitCPU directive</h2></A>
<!--%plaintext <?INDEX {\tt RLimitCPU} directive> -->
<strong>Syntax:</strong> RLimitCPU <em># or 'max'</em> <em>[# or 'max']</em><br>
<strong>Default:</strong> <code>Unset uses operating system defaults</code><br>
@@ -1070,7 +1071,7 @@
See also <A HREF="#rlimitmem">RLimitMEM</A> or <A HREF="#rlimitnproc">RLimitNPROC</A>.<p><hr>
-<h2><A name="rlimitmem">RLimitMEM directive</A></h2>
+<A name="rlimitmem"><h2>RLimitMEM directive</h2></A>
<!--%plaintext <?INDEX {\tt RLimitMEM} directive> -->
<strong>Syntax:</strong> RLimitMEM <em># or 'max'</em> <em>[# or 'max']</em><br>
<strong>Default:</strong> <code>Unset uses operating system defaults</code><br>
@@ -1089,7 +1090,7 @@
See also <A HREF="#rlimitcpu">RLimitCPU</A> or <A HREF="#rlimitnproc">RLimitNPROC</A>.<p><hr>
-<h2><A name="rlimitnproc">RLimitNPROC directive</A></h2>
+<A name="rlimitnproc"><h2>RLimitNPROC directive</h2></A>
<!--%plaintext <?INDEX {\tt RLimitNPROC} directive> -->
<strong>Syntax:</strong> RLimitNPROC <em># or 'max'</em> <em>[# or 'max']</em><br>
<strong>Default:</strong> <code>Unset uses operating system defaults</code><br>
@@ -1115,7 +1116,7 @@
<p><hr>
-<h2><A name="satisfy">Satisfy directive</A></h2>
+<A name="satisfy"><h2>Satisfy</h2></A>
<!--%plaintext <?INDEX {\tt Satisfy} directive> -->
<strong>Syntax:</strong> Satisfy <em>'any' or 'all'</em><br>
<strong>Default:</strong> Satisfy all<br>
@@ -1137,7 +1138,7 @@
<p><hr>
-<h2><A name="scoreboardfile">ScoreBoardFile directive</A></h2>
+<A name="scoreboardfile"><h2>ScoreBoardFile directive</h2></A>
<!--%plaintext <?INDEX {\tt ScoreBoardFile} directive> -->
<strong>Syntax:</strong> ScoreBoardFile <em>filename</em><br>
<strong>Default:</strong> <code>ScoreBoardFile logs/apache_status</code><br>
@@ -1174,7 +1175,7 @@
<p><hr>
-<h2><A name="sendbuffersize">SendBufferSize directive</A></h2>
+<A name="sendbuffersize"><h2>SendBufferSize directive</h2></A>
<!--%plaintext <?INDEX {\tt SendBufferSize} directive> -->
<strong>Syntax:</strong> SendBufferSize <em>bytes</em><br>
<strong>Context:</strong> server config<br>
@@ -1186,7 +1187,7 @@
fast pipes)
<p><hr>
-<h2><A name="serveradmin">ServerAdmin directive</A></h2>
+<A name="serveradmin"><h2>ServerAdmin directive</h2></A>
<!--%plaintext <?INDEX {\tt ServerAdmin} directive> -->
<strong>Syntax:</strong> ServerAdmin <em>email-address</em><br>
<strong>Context:</strong> server config, virtual host<br>
@@ -1199,7 +1200,7 @@
<blockquote><code>ServerAdmin www-admin@foo.bar.com</code></blockquote>
as users do not always mention that they are talking about the server!<p><hr>
-<h2><A name="serveralias">ServerAlias directive</A></h2>
+<A name="serveralias"><h2>ServerAlias directive</h2></A>
<strong>Syntax:</strong> ServerAlias <em>host1 host2 ...</em><br>
<strong>Context:</strong> virtual host<br>
@@ -1215,7 +1216,7 @@
<hr>
-<h2><A name="servername">ServerName directive</A></h2>
+<A name="servername"><h2>ServerName directive</h2></A>
<!--%plaintext <?INDEX {\tt ServerName} directive> -->
<strong>Syntax:</strong> ServerName <em>fully-qualified domain name</em><br>
<strong>Context:</strong> server config, virtual host<br>
@@ -1232,7 +1233,7 @@
<a href="../dns-caveats.html">DNS Issues</a></p>
<hr>
-<h2><A name="serverpath">ServerPath directive</A></h2>
+<A name="serverpath"><h2>ServerPath directive</h2></A>
<strong>Syntax:</strong> ServerPath <em>pathname</em><br>
<strong>Context:</strong> virtual host<br>
@@ -1246,7 +1247,7 @@
<a href="../vhosts-in-depth.html">In-depth description of Virtual Host matching</a></p>
<hr>
-<h2><A name="serverroot">ServerRoot directive</A></h2>
+<A name="serverroot"><h2>ServerRoot directive</h2></A>
<!--%plaintext <?INDEX {\tt ServerRoot} directive> -->
<strong>Syntax:</strong> ServerRoot <em>directory-filename</em><br>
<strong>Default:</strong> <code>ServerRoot /usr/local/etc/httpd</code><br>
@@ -1259,7 +1260,7 @@
as relative to this directory.<br>
See also <a href="../invoking.html">the <code>-d</code> option to httpd</a>.<p><hr>
-<h2><A name="servertype">ServerType directive</A></h2>
+<A name="servertype"><h2>ServerType directive</h2></A>
<!--%plaintext <?INDEX {\tt ServerType} directive> -->
<strong>Syntax:</strong> ServerType <em>type</em><br>
<strong>Default:</strong> <code>ServerType standalone</code><br>
@@ -1293,7 +1294,7 @@
cannot be guaranteed in either, but whilst most people are happy to use
standalone, inetd is probably least prone to attack.<p><hr>
-<h2><A name="startservers">StartServers directive</A></h2>
+<A name="startservers"><h2>StartServers directive</h2></A>
<!--%plaintext <?INDEX {\tt StartServers} directive> -->
<strong>Syntax:</strong> StartServers <em>number</em><br>
<strong>Default:</strong> <code>StartServers 5</code><br>
@@ -1321,7 +1322,7 @@
<LI>The total amount of time it takes to receive a GET request.
<LI>The amount of time between receipt of TCP packets on a POST or
PUT request.
- <LI>The amount of time between ACKs on transmissions of TCP packets
+ <LI>The amount of time between ACKs on transmissions of TCP packets
in responses.
</OL>
@@ -1334,7 +1335,7 @@
<p><hr>
-<h2><A name="user">User directive</A></h2>
+<A name="user"><h2>User directive</h2></A>
<!--%plaintext <?INDEX {\tt User} directive> -->
<strong>Syntax:</strong> User <em>unix-userid</em><br>
<strong>Default:</strong> <code>User #-1</code><br>
@@ -1373,7 +1374,7 @@
<code>root</code> unless you know exactly what you are doing, and what the
dangers are.<p><hr>
-<h2><A name="virtualhost"><VirtualHost> directive</A></h2>
+<A name="virtualhost"><h2><VirtualHost> directive</h2></A>
<!--%plaintext <?INDEX {\tt VirtualHost} section directive> -->
<strong>Syntax:</strong> <VirtualHost <em>addr</em>[:<em>port</em>] ...> ...
</VirtualHost> <br>
@@ -1386,7 +1387,7 @@
<VirtualHost> and </VirtualHost> are used to enclose a group of
directives which will apply only to a particular virtual host.
-Any directive which is allowed in a virtual host context may be used.
+Any directive which is allowed in a virtual host context may be used.
When the server receives a request for a document on a particular virtual
host, it uses the configuration directives enclosed in the <VirtualHost>
section. <em>Addr</em> can be
@@ -1426,7 +1427,7 @@
(This is recommended when used with <code>_default_</code>.)<p>
<strong>SECURITY</strong>: See the
-<A HREF="../misc/security_tips.html">security tips</A>
+<A HREF="../misc/security_tips.html">security tips</A>
document for details on why your security could be compromised if
the directory where logfiles are stored is writable by anyone other
than the user that starts the server.
1.4.2.2 +19 -25 apache/htdocs/manual/mod/mod_actions.html
Index: mod_actions.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_actions.html,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- mod_actions.html 1997/11/01 23:39:39 1.4.2.1
+++ mod_actions.html 1997/11/02 00:19:30 1.4.2.2
@@ -14,18 +14,18 @@
>
<!--#include virtual="header.html" -->
<H1 ALIGN="CENTER">Module mod_actions</h1>
-<P>
+
This module is contained in the <code>mod_actions.c</code> file, and
is compiled in by default. It provides for
executing CGI scripts based on media type or request method. It is not
present in versions prior to Apache 1.1.
-</P>
+
<h2>Summary</h2>
-<P>
+
This module lets you run CGI scripts whenever a file of a certain type
is requested. This makes it much easier to execute scripts that
process files.
-</P>
+
<h2>Directives</h2>
<ul>
<li><A HREF="#action">Action</A>
@@ -34,58 +34,52 @@
<hr>
-<h2><A name="action">Action directive</A></h2>
-<P>
+<A name="action"><h2>Action</h2></A>
<strong>Syntax:</strong> Action <em>mime-type cgi-script</em><br>
<strong>Context:</strong> server config, virtual host, directory, .htaccess<br>
<strong>Override:</strong> FileInfo<br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_actions<br>
<strong>Compatibility:</strong> Action is only available in Apache 1.1
-and later
-</p>
-<P>
+and later<p>
+
This directive adds an action, which will activate <em>cgi-script</em> when
a file of content type <em>mime-type</em> is requested. It sends the
URL and file path of the requested document using the standard
CGI PATH_INFO and PATH_TRANSLATED environment variables.
-</P>
+
<hr>
-<h2><A name="script">Script directive</A></h2>
-<P>
+<A name="script"><h2>Script</h2></A>
<strong>Syntax:</strong> Script <em>method cgi-script</em><br>
<strong>Context:</strong> server config, virtual host, directory<br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_actions<br>
<strong>Compatibility:</strong> Script is only available in Apache 1.1
-and later
-</p>
+and later<p>
-<p>
-This directive adds an action, which will activate <em>cgi-script</em> when
+<p>This directive adds an action, which will activate <em>cgi-script</em> when
a file is requested using the method of <em>method</em>, which can be
one of <code>GET</code>, <code>POST</code>, <code>PUT</code> or
<code>DELETE</code>. It sends the
URL and file path of the requested document using the standard
-CGI PATH_INFO and PATH_TRANSLATED environment variables.
-</P>
-<p>
-Note that the Script command defines default actions only. If a CGI
+CGI PATH_INFO and PATH_TRANSLATED environment variables.
+
+<p>Note that the Script command defines default actions only. If a CGI
script is called, or some other resource that is capable of handling
-the requested method internally, it will do so. Also note that Script
+the requested method internally, it will do so. Also note that script
with a method of <code>GET</code> will only be called if there are
query arguments present (e.g. foo.html?hi). Otherwise, the request
will proceed normally.
-</P>
-<p>
-Examples:
-</P>
+
+<p>Examples:
<pre>
Script GET /cgi-bin/search #e.g. for <ISINDEX>-style searching
Script PUT /~bob/put.cgi
+
</pre>
<!--#include virtual="footer.html" -->
</BODY>
</HTML>
+
1.8.2.4 +36 -38 apache/htdocs/manual/mod/mod_auth_anon.html
Index: mod_auth_anon.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_auth_anon.html,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- mod_auth_anon.html 1997/11/02 00:16:07 1.8.2.3
+++ mod_auth_anon.html 1997/11/02 00:19:31 1.8.2.4
@@ -52,7 +52,7 @@
<hr>
-<h2><A name="anonymous">Anonymous directive</A></h2>
+<A name="anonymous"><h2>Anonymous</h2></a>
<!--%plaintext <?INDEX {\tt Anonymous} directive> -->
<strong>Syntax:</strong> Anonymous <em>user user ...</em><br>
<strong>Default:</strong> none<br>
@@ -73,14 +73,14 @@
<p>
Example:<br>
<code>
- Anonymous anonymous "Not Registered" 'I don\'t know'
+ Anonymous: anonymous "Not Registered" 'I don\'t know'
</code><p>
This would allow the user to enter without password verification
by using the userId's 'anonymous', 'AnonyMous','Not Registered' and
'I Don't Know'.
<HR>
-<h2><A name="Authoritative">Anonymous_Authoritative directive</A></h2>
+<A name="Authoritative"><h2>Anonymous_Authoritative</h2></A>
<strong>Syntax:</strong> Anonymous_Authoritative <em>on | off</em><br>
<strong>Default:</strong> <code>Anonymous_Authoritative off</code><br>
<strong>Context:</strong> directory, .htaccess<br>
@@ -93,15 +93,15 @@
userID does not match the values specified in the
<code>Anonymous</code> directive, access is denied.
<p>
- Be sure you know what you are doing when you decide to switch
+ Be sure you know what you are doing when you decide to switch
it on. And remember that it is the linking order of the modules
(in the Configuration / Make file) which details the order
in which the Authorization modules are queried.
<hr>
-<h2><A name="LogEmail">Anonymous_LogEmail directive</A></h2>
+<A name="LogEmail"><h2>Anonymous_LogEmail</h2></A>
<strong>Syntax:</strong> Anonymous_LogEmail <em>on | off</em><br>
-<strong>Default:</strong> <code>Anonymous_LogEmail on</code><br>
+<strong>Default:</strong> <code>off</code><br>
<strong>Context:</strong> directory, .htaccess<br>
<strong>Override:</strong> AuthConfig<br>
<strong>Status:</strong> Extension<br>
@@ -111,10 +111,10 @@
contains a sensible email address) is logged in the httpd-log file.
<hr>
-<h2><A name="MustGiveEmail">Anonymous_MustGiveEmail directive</A></h2>
+<A name="MustGiveEmail"><h2>Anonymous_MustGiveEmail</h2></a>
<!--%plaintext <?INDEX {\tt Anonymous_MustGiveEmail} directive> -->
<strong>Syntax:</strong> Anonymous_MustGiveEmail <em>on</em> | <em>off</em><br>
-<strong>Default:</strong> <code>Anonymous_MustGiveEmail on</code><br>
+<strong>Default:</strong> off<br>
<strong>Context:</strong> directory, .htaccess<br>
<strong>Override:</strong> AuthConfig<br>
<strong>Status:</strong> Extension<br>
@@ -124,7 +124,7 @@
address as the password. This prohibits blank passwords.
<HR>
-<h2><A name="NoUserID">Anonymous_NoUserID directive</A></h2>
+<A name="NoUserID"><h2>Anonymous_NoUserID</h2></A>
<strong>Syntax:</strong> Anonymous_NoUserID <em>on | off</em><br>
<strong>Default:</strong> <code>Anonymous_NoUserID off</code><br>
<strong>Context:</strong> directory, .htaccess<br>
@@ -140,8 +140,8 @@
<hr>
-<h2><A name="VerifyEmail">Anonymous_VerifyEmail directive</A></h2>
-<strong>Syntax:</strong> Anonymous_VerifyEmail <em>on | off</em><br>
+<A name="VerifyEmail"><h2>Anonymous_VerifyEmail</h2></A>
+<strong>Syntax:</strong> Anonymous <em>on | off</em><br>
<strong>Default:</strong> <code>Anonymous_VerifyEmail off</code><br>
<strong>Context:</strong> directory, .htaccess<br>
<strong>Override:</strong> AuthConfig<br>
@@ -152,8 +152,7 @@
checked for at least one '@' and a '.' to encourage users to enter
valid email addresses (see the above <code>Auth_LogEmail</code>).
-<hr>
-<h2><a name="Example">Example</A></h2>
+<hr><a name="Example"><h2>Example</h2></a>
The example below (when combined with the Auth directives
of a htpasswd-file based (or GDM, mSQL etc) base access
@@ -170,43 +169,44 @@
<li>
The userID must be one of <code>anonymous guest www test welcome</code>
and comparison is <b>not</b> case sensitive.
+<code><directory /web/docs/public></code>
<li>
-And the Email addresses entered in the passwd field are logged to
+And the Email addresses entered in the passswd field are logged to
the httpd-log file
(<code>Anonymous_LogEmail</code>)
</ul>
<p>
Excerpt of access.conf:
-<blockquote><code>
-Anonymous_NoUserId off<br>
+<dl>
+<dt><code>
+Anonymous anonymous guest www test welcome<p>
Anonymous_MustGiveEmail on<br>
Anonymous_VerifyEmail on<br>
+Anonymous_NoUserId off<br>
Anonymous_LogEmail on<br>
-Anonymous anonymous guest www test welcome<p>
<p>
AuthName Use 'anonymous' & Email address for guest entry<br>
-AuthType basic
-<p>
-# An AuthUserFile/AuthDBUserFile/AuthDBMUserFile<br>
-# directive must be specified, or use<br>
-# Anonymous_Authoritative for public access.<br>
-# In the .htaccess for the public directory, add:<br>
-<Files *><br>
-order deny,allow <br>
-allow from all <br>
-<p>
-require valid-user <br>
-</Files><br>
-</code></blockquote>
+AuthType basic<p>
+
+</code></dt>
+<dd>
+ Normal Apache/NCSA tokens for access control
+ <p>
+ <code><limit get post head></code><br>
+ <code>order deny,allow </code><br>
+ <code>allow from all </code><br>
+ <p>
+ <code>require valid-user </code><br>
+ <code><limit> </code><br>
+</dd>
+</dl>
-<hr>
-<h2><a name="CompileTimeOptions">Compile Time Options</a></h2>
+<hr><h2><a name="CompileTimeOptions">Compile Time Options</a></h2>
Currently there are no Compile options.
-<hr>
-<h2><a name="RevisionHistory">Revision History</a></h2>
+<hr><h2><a name="RevisionHistory">Revision History</a></h2>
This version: 23 Nov 1995, 24 Feb 1996, 16 May 1996.
@@ -223,8 +223,7 @@
</dl>
-<hr>
-<h2><a name="Person">Contact/person to blame</a></h2>
+<hr><h2><a name="Person">Contact/person to blame</a></h2>
This module was written for the
<a href="http://ewse.ceo.org">European Wide Service Exchange</a> by
@@ -235,8 +234,7 @@
<p>
-<hr>
-<h2><a NAME="Sourcecode">Sourcecode</a></h2>
+<hr><h2><a NAME="Sourcecode">Sourcecode</a></h2>
The source code can be found at <a href="http://www.apache.org"><code>
http://www.apache.org</code></a>. A snapshot of a development version
1.10.2.2 +1 -1 apache/htdocs/manual/mod/mod_auth_dbm.html
Index: mod_auth_dbm.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_auth_dbm.html,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- mod_auth_dbm.html 1997/11/01 23:39:42 1.10.2.1
+++ mod_auth_dbm.html 1997/11/02 00:19:32 1.10.2.2
@@ -18,7 +18,7 @@
This module is contained in the <code>mod_auth_dbm.c</code> file, and
is not compiled in by default. It provides for user authentication using
-DBM files.
+DBM files.
<menu>
1.6.2.3 +2 -2 apache/htdocs/manual/mod/mod_cern_meta.html
Index: mod_cern_meta.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_cern_meta.html,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- mod_cern_meta.html 1997/11/01 23:39:42 1.6.2.2
+++ mod_cern_meta.html 1997/11/02 00:19:33 1.6.2.3
@@ -21,14 +21,14 @@
<h2>Summary</h2>
-Emulate the CERN HTTPD Meta file semantics. Meta files are HTTP
+Emulate the CERN HTTPD Meta file semantics. Meta files are HTTP
headers that can be output in addition to the normal range of headers
for each file accessed. They appear rather like the Apache
.asis files, and are able to provide a crude way of influencing
the Expires: header, as well as providing other curiosities.
There are many ways to manage meta information, this one was
chosen because there is already a large number of CERN users
-who can exploit this module.
+who can exploit this module.
<p>More information on the
<a href="http://www.w3.org/pub/WWW/Daemon/User/Config/General.html#MetaDir
1.10.2.2 +2 -3 apache/htdocs/manual/mod/mod_cgi.html
Index: mod_cgi.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_cgi.html,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- mod_cgi.html 1997/11/01 23:39:42 1.10.2.1
+++ mod_cgi.html 1997/11/02 00:19:36 1.10.2.2
@@ -38,9 +38,8 @@
configuration variable.
<h2>CGI Environment variables</h2>
-The server will set the CGI environment variables as described in the
-<A HREF="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI specification</A>, with the
-following provisions:
+The server will set the CGI environment variables as described in the CGI
+specification, with the following provisions:
<dl>
<dt>REMOTE_HOST
<dd>This will only be set if the server has not been compiled with
1.6.2.3 +1 -1 apache/htdocs/manual/mod/mod_env.html
Index: mod_env.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_env.html,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- mod_env.html 1997/11/01 23:39:43 1.6.2.2
+++ mod_env.html 1997/11/02 00:19:38 1.6.2.3
@@ -27,7 +27,7 @@
CERN web-servers are able to do this, so this module is especially
useful to web-admins who wish to migrate from CERN to Apache without
rewriting all their scripts
-
+
<h2>Directives</h2>
<ul>
<li><A HREF="#passenv">PassEnv</A>
1.3.2.2 +9 -36 apache/htdocs/manual/mod/mod_example.html
Index: mod_example.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_example.html,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- mod_example.html 1997/11/02 00:16:07 1.3.2.1
+++ mod_example.html 1997/11/02 00:19:39 1.3.2.2
@@ -47,12 +47,11 @@
To include the example module in your server, follow the steps below:
</P>
<OL>
- <LI>Uncomment the "AddModule modules/example/mod_example" line near
- the bottom of
+ <LI>Uncomment the "Module example_module" line near the bottom of
the <CODE>src/Configuration</CODE> file. If there isn't one, add
it; it should look like this:
<PRE>
- AddModule modules/example/mod_example.o
+ Module example_module modules/example/mod_example.o
</PRE>
</LI>
<LI>Run the <CODE>src/Configure</CODE> script
@@ -117,46 +116,20 @@
Example
</A></H2>
<P>
- <A
- HREF="directive-dict.html#Syntax"
- REL="Help"
- ><STRONG>Syntax:</STRONG></A> Example
- <BR>
- <A
- HREF="directive-dict.html#Default"
- REL="Help"
- ><STRONG>Default:</STRONG></A> None
+ <STRONG>Syntax:</STRONG> Example
<BR>
- <A
- HREF="directive-dict.html#Context"
- REL="Help"
- ><STRONG>Context:</STRONG></A> server config, virtual host, directory,
- .htaccess
+ <STRONG>Default:</STRONG> None
<BR>
- <A
- HREF="directive-dict.html#Override"
- REL="Help"
- ><STRONG>Override:</STRONG></A> Options
+ <STRONG>Context:</STRONG> server config, virtual host, directory, .htaccess
<BR>
- <A
- HREF="directive-dict.html#Status"
- REL="Help"
- ><STRONG>Status:</STRONG></A> Extension
+ <STRONG>Override:</STRONG> Options
<BR>
- <A
- HREF="directive-dict.html#Module"
- REL="Help"
- ><STRONG>Module:</STRONG></A> mod_example
+ <STRONG>Status:</STRONG> Extension
<BR>
- <A
- HREF="directive-dict.html#Compatibility"
- REL="Help"
- ><STRONG>Compatibility:</STRONG></A> <SAMP>Example</SAMP> is only
- available in Apache 1.2 and later.
+ <STRONG>Module:</STRONG> mod_example
</P>
<P>
- The <SAMP>Example</SAMP> directive activates the example module's
- content handler
+ The Example directive activates the example module's content handler
for a particular location or file type. It takes no arguments. If
you browse to an URL to which the example content-handler applies, you
will get a display of the routines within the module and how and in
1.6.2.2 +7 -7 apache/htdocs/manual/mod/mod_imap.html
Index: mod_imap.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_imap.html,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- mod_imap.html 1997/11/01 23:39:43 1.6.2.1
+++ mod_imap.html 1997/11/02 00:19:40 1.6.2.2
@@ -77,7 +77,7 @@
<dt><code>none</code>
<dd>If ImapMenu is
<code>none</code>, no menu is generated, and the <code>default</code>
- action is performed.
+ action is performed.
<dt><code>formatted</code>
<dd>A <code>formatted</code> menu is the simplest menu. Comments
in the imagemap file are ignored. A level one header is
@@ -153,8 +153,8 @@
<h3>Imagemap File Directives</h3>
There are six directives allowed in the imagemap file. The directives
can come in any order, but are processed in the order they are found
-in the imagemap file.
-<dl>
+in the imagemap file.
+<dl>
<dt><code>base</code> Directive
<dd>Has the effect of <code><BASE href="value"></code>. The
non-absolute URLs of the map-file are taken relative to this value.
@@ -217,7 +217,7 @@
<dt><code>referer</code>
<dd>Equivalent to the URL of the referring document.
Defaults to <code>http://servername/</code> if no Referer:
- header was present.
+ header was present.
<p>
<dt><code>nocontent</code>
<dd>Sends a status code of <code>204 No Content</code>,
@@ -227,7 +227,7 @@
<dt><code>error</code>
<dd>Fails with a <code>500 Server Error</code>. Valid for all but
<code>base</code>, but sort of silly for anything but
- <code>default</code>.
+ <code>default</code>.
</dl>
<h3>Coordinates</h3>
@@ -237,13 +237,13 @@
separated by a comma. The coordinates are separated from each other
by whitespace. To accommodate the way Lynx handles imagemaps, should a
user select the coordinate <code>0,0</code>, it is as if
- no coordinate had been selected.
+ no coordinate had been selected.
</dl>
<h3>Quoted Text</h3>
<dl>
<dt><code>"Menu Text"</code>
- <dd>After the value or after the coordinates, the line optionally may
+ <dd>After the value or after the coordinates, the line optionally may
contain text within double quotes. This string is used as the
text for the link if a menu is generated:<br>
<code><a href="http://foo.com/">Menu text</a></code><br>
1.13.2.3 +11 -11 apache/htdocs/manual/mod/mod_include.html
Index: mod_include.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_include.html,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -r1.13.2.2 -r1.13.2.3
--- mod_include.html 1997/11/01 23:39:44 1.13.2.2
+++ mod_include.html 1997/11/02 00:19:40 1.13.2.3
@@ -19,7 +19,7 @@
is compiled in by default. It provides for server-parsed html
documents. Several directives beyond the original NCSA definition have been
included in Apache 1.2 - these are flagged below with the phrase
-"Apache 1.2 and above". Of particular significance are the new flow
+"Apache 1.2 and above". Of particular significance are the new flow
control directives documented at the bottom.
<H2>Enabling Server-Side Includes</H2>
@@ -193,7 +193,7 @@
<dt>value
<dd>The value to give a variable.
</dl>
-For example:
+For example:
<CODE><!--#set var="category" value="help" --></CODE>
<dd>Apache 1.2 and above.
@@ -203,7 +203,7 @@
In addition to the variables in the standard CGI environment, these are
available for the <code>echo</code> command, for <code>if</code> and
-<code>elif</code>, and to any program invoked by the document.
+<code>elif</code>, and to any program invoked by the document.
<dl>
<dt>DATE_GMT
@@ -254,8 +254,8 @@
"<SAMP>X</SAMP>" and <SAMP>REQUEST_METHOD</SAMP> is
"<SAMP>Y</SAMP>".
-<P> EXAMPLE: the below example will print "in foo" if the DOCUMENT_URI is
-/foo/file.html, "in bar" if it is /bar/file.html and "in neither"
+<P> EXAMPLE: the below example will print "in foo" if the DOCUMENT_URI is
+/foo/file.html, "in bar" if it is /bar/file.html and "in neither"
otherwise:
<PRE>
<!--#if expr="\"$DOCUMENT_URI\" = \"/foo/file.html\"" -->
@@ -291,7 +291,7 @@
if the original test_condition was false. These elements
are optional.
-<P> The <B><CODE>endif</CODE></B> element ends the
+<P> The <B><CODE>endif</CODE></B> element ends the
<B><CODE>if</CODE></B> element and is required.
<P> <I>test_condition</I> is one of the following:
@@ -309,19 +309,19 @@
Unix egrep command.
<DT>( <I>test_condition</I> )
- <DD>true if <I>test_condition</I> is true
+ <DD>true if <I>test_condition</I> is true
<DT>! <I>test_condition</I>
<DD>true if <I>test_condition</I> is false
<DT><I>test_condition1</I> && <I>test_condition2</I>
<DD>true if both <I>test_condition1</I> and
- <I>test_condition2</I> are true
+ <I>test_condition2</I> are true
<DT><I>test_condition1</I> || <I>test_condition2</I>
<DD>true if either <I>test_condition1</I> or
- <I>test_condition2</I> is true
+ <I>test_condition2</I> is true
</DL>
<P> "<I>=</I>" and "<I>!=</I>" bind more tightly than "<I>&&</I>" and
- "<I>||</I>".
+ "<I>||</I>".
"<I>!</I>" binds most tightly. Thus, the following are equivalent:
<PRE>
@@ -360,7 +360,7 @@
The XBitHack directives controls the parsing of ordinary html documents.
This directive only affects files associated with the MIME type
-<CODE>text/html</CODE>.
+<CODE>text/html</CODE>.
<em>Status</em> can have the following values:
<dl>
<dt>off
1.11.2.3 +0 -12 apache/htdocs/manual/mod/mod_mime.html
Index: mod_mime.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_mime.html,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -r1.11.2.2 -r1.11.2.3
--- mod_mime.html 1997/11/02 00:16:08 1.11.2.2
+++ mod_mime.html 1997/11/02 00:19:41 1.11.2.3
@@ -59,18 +59,6 @@
<P>
-Note that changing the type or encoding of a file does not change the
-value of the <code>Last-Modified</code> header. Thus, previously cached
-copies may still be used by a client or proxy, with the previous headers.
-
-<P>
-
-Please note that changing a file's type or encoding does not change
-the value of the <code>Last-Modified</code> header. Previously cached
-copies may still be used by a client or proxy.
-
-<P>
-
<h2> Directives</h2>
<ul>
<li><A HREF="#addencoding">AddEncoding</A>
1.6.2.2 +4 -4 apache/htdocs/manual/mod/mod_negotiation.html
Index: mod_negotiation.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_negotiation.html,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- mod_negotiation.html 1997/11/01 23:39:44 1.6.2.1
+++ mod_negotiation.html 1997/11/02 00:19:41 1.6.2.2
@@ -17,7 +17,7 @@
This module is contained in the <code>mod_negotiation.c</code> file,
and is compiled in by default. It provides for <A
-HREF="../content-negotiation.html">content negotiation</A>.
+HREF="../content-negotiation.html">content negotiation</A>.
<h2>Summary</h2>
Content negotiation, or more accurately content selection, is the
@@ -56,7 +56,7 @@
<dd>The length of the file, in bytes. If this header is not present, then
the actual length of the file is used.
<dt>Content-Type:
-<dd>The MIME media type of the document, with optional parameters.
+<dd>The MIME media type of the document, with optional parameters.
parameters are separated from the media type and from one another by
semi-colons. Parameter syntax is name=value; allowed parameters are:
<dl>
@@ -111,7 +111,7 @@
This directive only applies to requests which come from HTTP/1.0 browsers.
HTTP/1.1 provides much better control over the caching of negotiated
-documents, and this directive has no effect in responses to
+documents, and this directive has no effect in responses to
HTTP/1.1 requests.
@@ -139,7 +139,7 @@
Note that this directive only has an effect if a 'best' language
cannot be determined by other any other means. Correctly implemented
-HTTP/1.1 requests will mean this directive has no effect.
+HTTP/1.1 requests will mean this directive has no effect.
<!--#include virtual="footer.html" -->
</BODY>
1.22.2.5 +14 -61 apache/htdocs/manual/mod/mod_proxy.html
Index: mod_proxy.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_proxy.html,v
retrieving revision 1.22.2.4
retrieving revision 1.22.2.5
diff -u -r1.22.2.4 -r1.22.2.5
--- mod_proxy.html 1997/11/02 00:16:08 1.22.2.4
+++ mod_proxy.html 1997/11/02 00:19:42 1.22.2.5
@@ -17,15 +17,13 @@
This module is contained in the <code>mod_proxy.c</code> file for Apache 1.1.x,
or the <code>modules/proxy</code> subdirectory for Apache 1.2, and
-is not compiled in by default. It provides for an <STRONG>HTTP
-1.0</STRONG> caching proxy
+is not compiled in by default. It provides for an <b>HTTP 1.0</b> caching proxy
server. It is only available in Apache 1.1 and later. Common configuration
-questions are addressed <a href="#configs">after the directive
-descriptions</a>.
+questions are addressed <a href="#configs">here</a>.
<h3>Note:</h3>
<p>This module was experimental in Apache 1.1.x. As of Apache 1.2, mod_proxy
-stability is <EM>greatly</EM> improved.<p>
+stability is <i>greatly</i> improved.<p>
<h2>Summary</h2>
@@ -61,23 +59,18 @@
<strong>Syntax:</strong> ProxyRequests <em>on/off</em><br>
<strong>Default:</strong> <code>ProxyRequests Off</code><br>
<strong>Context:</strong> server config, virtual host<br>
-<strong>Override:</strong> <EM>Not applicable</EM><br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_proxy<br>
-<strong>Compatibility:</strong> ProxyRequests is only available in
+<strong>Compatibility:</strong> ProxyRequest is only available in
Apache 1.1 and later.<p>
This allows or prevents Apache from functioning as a proxy
server. Setting ProxyRequests to 'off' does not disable use of the <a
href="#proxypass">ProxyPass</a> directive.
-<HR>
-
<A name="proxyremote"><h2>ProxyRemote</h2></A>
<strong>Syntax:</strong> ProxyRemote <em><match> <remote-server></em><br>
-<strong>Default:</strong> <EM>None</EM><br>
<strong>Context:</strong> server config, virtual host<br>
-<strong>Override:</strong> <EM>Not applicable</EM><br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_proxy<br>
<strong>Compatibility:</strong> ProxyRemote is only available in
@@ -95,7 +88,7 @@
<protocol> is the protocol that should be used to communicate
with the remote server; only "http" is supported by this module.
-<P>
+
Example:
<pre>
ProxyRemote http://goodguys.com/ http://mirrorguys.com:8000
@@ -107,13 +100,9 @@
as yet another HTTP proxy request, to another proxy which can handle
them.
-<HR>
-
<A name="proxypass"><h2>ProxyPass</h2></A>
<strong>Syntax:</strong> ProxyPass <em><path> <url></em><br>
-<strong>Default:</strong> <EM>None</EM><br>
<strong>Context:</strong> server config, virtual host<br>
-<strong>Override:</strong> <EM>Not applicable</EM><br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_proxy<br>
<strong>Compatibility:</strong> ProxyPass is only available in
@@ -123,23 +112,17 @@
server; the local server does not act as a proxy in the conventional sense,
but appears to be a mirror of the remote server. <path> is the name of
a local virtual path; <url> is a partial URL for the remote server.
-<P>
-Suppose the local server has address <SAMP>http://wibble.org/</SAMP>; then
+
+Suppose the local server has address http://wibble.org; then
<pre>
ProxyPass /mirror/foo http://foo.com
</pre>
-will cause a local request for the
-<<SAMP>http://wibble.org/mirror/foo/bar</SAMP>> to be
-internally converted into a proxy request to
-<<SAMP>http://foo.com/bar</SAMP>>.
-
-<HR>
+Will cause a local request for the http://wibble.org/mirror/foo/bar to be
+internally converted into a proxy request to http://foo.com/bar
<A name="proxyblock"><h2>ProxyBlock</h2></A>
<strong>Syntax:</strong> ProxyBlock <em><word/host/domain list></em><br>
-<strong>Default:</strong> <EM>None</EM><br>
<strong>Context:</strong> server config, virtual host<br>
-<strong>Override:</strong> <EM>Not applicable</EM><br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_proxy<br>
<strong>Compatibility:</strong> ProxyBlock is only available in
@@ -167,13 +150,9 @@
blocks connections to all sites.
-<HR>
-
<A name="cacheroot"><h2>CacheRoot</h2></A>
<strong>Syntax:</strong> CacheRoot <em><directory></em><br>
-<strong>Default:</strong> <EM>None</EM><br>
<strong>Context:</strong> server config, virtual host<br>
-<strong>Override:</strong> <EM>Not applicable</EM><br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_proxy<br>
<strong>Compatibility:</strong> CacheRoot is only available in
@@ -183,29 +162,22 @@
writable
by the httpd server.
-<HR>
-
<A name="cachesize"><h2>CacheSize</h2></A>
<strong>Syntax:</strong> CacheSize <em><size></em><br>
<strong>Default:</strong> <code>CacheSize 5</code><br>
<strong>Context:</strong> server config, virtual host<br>
-<strong>Override:</strong> <EM>Not applicable</EM><br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_proxy<br>
<strong>Compatibility:</strong> CacheSize is only available in
Apache 1.1 and later.<p>
-Sets the desired space usage of the cache, in KB (1024-byte units). Although
+Sets the desired space usage of the cache, in Kb (1024 byte units). Although
usage may grow above this setting, the garbage collection will delete files
until the usage is at or below this setting.
-<HR>
-
<A name="cachegcinterval"><h2>CacheGcInterval</h2></A>
<strong>Syntax:</strong> CacheGcInterval <em><time></em><br>
-<strong>Default:</strong> <EM>None</EM><br>
<strong>Context:</strong> server config, virtual host<br>
-<strong>Override:</strong> <EM>Not applicable</EM><br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_proxy<br>
<strong>Compatibility:</strong> CacheGcinterval is only available in
@@ -214,13 +186,10 @@
Check the cache every <time> hours, and delete files if the space
usage is greater than that set by CacheSize.
-<HR>
-
<A name="cachemaxexpire"><h2>CacheMaxExpire</h2></A>
<strong>Syntax:</strong> CacheMaxExpire <em><time></em><br>
<strong>Default:</strong> <code>CacheMaxExpire 24</code><br>
<strong>Context:</strong> server config, virtual host<br>
-<strong>Override:</strong> <EM>Not applicable</EM><br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_proxy<br>
<strong>Compatibility:</strong> CacheMaxExpire is only available in
@@ -231,13 +200,10 @@
hours out of date. This restriction is enforced even if an expiry date
was supplied with the document.
-<HR>
-
<A name="cachelastmodifiedfactor"><h2>CacheLastModifiedFactor</h2></A>
<strong>Syntax:</strong> CacheLastModifiedFactor <em><factor></em><br>
<strong>Default:</strong> <code>CacheLastModifiedFactor 0.1</code><br>
<strong>Context:</strong> server config, virtual host<br>
-<strong>Override:</strong> <EM>Not applicable</EM><br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_proxy<br>
<strong>Compatibility:</strong> CacheLastModifiedFactor is only available in
@@ -254,13 +220,10 @@
<p>If the expiry-period would be longer than that set by CacheMaxExpire,
then the latter takes precedence.
-<HR>
-
<A name="cachedirlevels"><h2>CacheDirLevels</h2></A>
<strong>Syntax:</strong> CacheDirLevels <em><levels></em><br>
<strong>Default:</strong> <code>CacheDirLevels 3</code><br>
<strong>Context:</strong> server config, virtual host<br>
-<strong>Override:</strong> <EM>Not applicable</EM><br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_proxy<br>
<strong>Compatibility:</strong> CacheDirLevels is only available in
@@ -269,13 +232,10 @@
CacheDirLevels sets the number of levels of subdirectories in the cache.
Cached data will be saved this many directory levels below CacheRoot.
-<HR>
-
<A name="cachedirlength"><h2>CacheDirLength</h2></A>
<strong>Syntax:</strong> CacheDirLength <em><length></em><br>
<strong>Default:</strong> <code>CacheDirLength 1</code><br>
<strong>Context:</strong> server config, virtual host<br>
-<strong>Override:</strong> <EM>Not applicable</EM><br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_proxy<br>
<strong>Compatibility:</strong> CacheDirLength is only available in
@@ -283,13 +243,10 @@
CacheDirLength sets the number of characters in proxy cache subdirectory names.
-<HR>
-
<A name="cachedefaultexpire"><h2>CacheDefaultExpire</h2></A>
<strong>Syntax:</strong> CacheDefaultExpire <em><time></em><br>
<strong>Default:</strong> <code>CacheDefaultExpire 1</code><br>
<strong>Context:</strong> server config, virtual host<br>
-<strong>Override:</strong> <EM>Not applicable</EM><br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_proxy<br>
<strong>Compatibility:</strong> CacheDefaultExpire is only available in
@@ -298,15 +255,11 @@
If the document is fetched via a protocol that does not support expiry times,
then use <time> hours as the expiry time.
<a href="#cachemaxexpire">CacheMaxExpire</a> does <strong>not</strong>
-override this setting.
-
-<HR>
+override.
<A name="nocache"><h2>NoCache</h2></A>
<strong>Syntax:</strong> NoCache <em><word/host/domain list></em><br>
-<strong>Default:</strong> <EM>None</EM><br>
<strong>Context:</strong> server config, virtual host<br>
-<strong>Override:</strong> <EM>Not applicable</EM><br>
<strong>Status:</strong> Base<br>
<strong>Module:</strong> mod_proxy<br>
<strong>Compatibility:</strong> NoCache is only available in
@@ -342,7 +295,7 @@
<ul>
<li><a href="#access">Controlling access to your proxy</a>
<li><a href="#shortname">Using Netscape hostname shortcuts</a>
-<li><a href="#mimetypes">Why doesn't file type <EM>xxx</EM> download via FTP?</a>
+<li><a href="#mimetypes">Why doesn't file type <i>xxx</i> download via FTP?</a>
<li><a href="#startup">Why does Apache start more slowly when using the
proxy module?</a>
<li><a href="#socks">Can I use the Apache proxy module with my SOCKS proxy?</a>
@@ -373,10 +326,10 @@
<a href="http://www.apache.org/dist/contrib/patches/1.2/netscapehost.patch">
here</a>.<p>
-<h2><a name="mimetypes">Why doesn't file type <EM>xxx</EM> download via FTP?</a></h2>
+<h2><a name="mimetypes">Why doesn't file type <i>xxx</i> download via FTP?</a></h2>
You probably don't have that particular file type defined as
-<EM>application/octet-stream</EM> in your proxy's mime.types configuration
+<i>application/octet-stream</i> in your proxy's mime.types configuration
file. A useful line can be<p>
<pre>
1.6.2.3 +4 -4 apache/htdocs/manual/mod/mod_status.html
Index: mod_status.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/mod_status.html,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- mod_status.html 1997/11/01 23:39:45 1.6.2.2
+++ mod_status.html 1997/11/02 00:19:44 1.6.2.3
@@ -33,7 +33,7 @@
<li>A total number of accesses and byte count served (*)
<li>The time the server was started/restarted and the
time it has been running for
-<li>Averages giving the number of requests per second,
+<li>Averages giving the number of requests per second,
the number of bytes served per second and the average number
of bytes per request (*)
<li>The current percentage CPU used by each child and in total by
@@ -52,7 +52,7 @@
<pre>
<Location /server-status>
SetHandler server-status
-
+
order deny,allow
deny from all
allow from .foo.com
@@ -62,8 +62,8 @@
You can now access server statistics by using a Web browser to access the
page <code>http://your.server.name/server-status</code>
<p>
-Note that mod_status will only work when you are running Apache in
-<A HREF="core.html#servertype">standalone</A> mode and not
+Note that mod_status will only work when you are running Apache in
+<A HREF="core.html#servertype">standalone</A> mode and not
<A HREF="core.html#servertype">inetd</A> mode.
<h3>Automatic Updates</h3>