Aw shoot, this one is screwed up. 

Dean

On 2 Nov 1997 [EMAIL PROTECTED] wrote:

> dgaudet     97/11/01 16:16:11
> 
>   Modified:    htdocs/manual Tag: APACHE_1_2_X LICENSE install.html
>                         invoking.html suexec.html vhosts-in-depth.html
>                htdocs/manual/misc Tag: APACHE_1_2_X FAQ.html
>                         compat_notes.html fin_wait_2.html perf.html
>                htdocs/manual/mod Tag: APACHE_1_2_X mod_auth_anon.html
>                         mod_example.html mod_mime.html mod_proxy.html
>   Log:
>   yet more merges from 1.3
>   
>   Revision  Changes    Path
>   No                   revision
>   
>   
>   No                   revision
>   
>   
>   1.3.2.1   +2 -1      apache/htdocs/manual/LICENSE
>   
>   Index: LICENSE
>   ===================================================================
>   RCS file: /export/home/cvs/apache/htdocs/manual/LICENSE,v
>   retrieving revision 1.3
>   retrieving revision 1.3.2.1
>   diff -u -r1.3 -r1.3.2.1
>   --- LICENSE 1997/01/01 18:32:13     1.3
>   +++ LICENSE 1997/11/02 00:15:58     1.3.2.1
>   @@ -20,7 +20,8 @@
>     *
>     * 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.
>   + *    prior written permission. For written permission, please contact
>   + *    [EMAIL PROTECTED]
>     *
>     * 5. Redistributions of any form whatsoever must retain the following
>     *    acknowledgment:
>   
>   
>   
>   1.9.2.2   +8 -3      apache/htdocs/manual/install.html
>   
>   Index: install.html
>   ===================================================================
>   RCS file: /export/home/cvs/apache/htdocs/manual/install.html,v
>   retrieving revision 1.9.2.1
>   retrieving revision 1.9.2.2
>   diff -u -r1.9.2.1 -r1.9.2.2
>   --- install.html    1997/11/01 23:39:21     1.9.2.1
>   +++ install.html    1997/11/02 00:15:59     1.9.2.2
>   @@ -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 Module lines
>   +  those optional modules you wish to include (among the AddModule 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,7 +83,12 @@
>         + configured for &lt;whatever&gt; platform
>         + setting C compiler to &lt;whatever&gt; *
>         + setting C compiler optimization-level to &lt;whatever&gt; *
>   -    %
>   +     + 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>
>    
>   @@ -159,7 +164,7 @@
>    
>    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/etc/httpd/conf/httpd.conf</CODE>). If
>   +default <CODE>/usr/local/apache/conf/httpd.conf</CODE>). If
>    this file is somewhere else, you can give the real
>    location with the -f argument. For example:
>    
>   
>   
>   
>   1.11.2.2  +1 -1      apache/htdocs/manual/invoking.html
>   
>   Index: invoking.html
>   ===================================================================
>   RCS file: /export/home/cvs/apache/htdocs/manual/invoking.html,v
>   retrieving revision 1.11.2.1
>   retrieving revision 1.11.2.2
>   diff -u -r1.11.2.1 -r1.11.2.2
>   --- invoking.html   1997/11/01 23:39:21     1.11.2.1
>   +++ invoking.html   1997/11/02 00:16:00     1.11.2.2
>   @@ -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/etc/httpd</code>.
>   +configuration file. The default is <code>/usr/local/apache</code>.
>    
>    <dt><code>-f</code> <em>config</em>
>    <dd>Execute the commands in the file <em>config</em> on startup. If
>   
>   
>   
>   1.11.2.3  +6 -6      apache/htdocs/manual/suexec.html
>   
>   Index: suexec.html
>   ===================================================================
>   RCS file: /export/home/cvs/apache/htdocs/manual/suexec.html,v
>   retrieving revision 1.11.2.2
>   retrieving revision 1.11.2.3
>   diff -u -r1.11.2.2 -r1.11.2.3
>   --- suexec.html     1997/11/01 23:39:25     1.11.2.2
>   +++ suexec.html     1997/11/02 00:16:00     1.11.2.3
>   @@ -326,14 +326,14 @@
>          *             transactions and errors logged for auditing and
>          *             debugging purposes.
>          */
>   -     #define LOG_EXEC "/usr/local/etc/httpd/logs/cgi.log" /* Need me? */
>   +     #define LOG_EXEC "/usr/local/apache/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/etc/httpd/htdocs"
>   +     #define DOC_ROOT "/usr/local/apache/htdocs"
>    
>         /*
>          * SAFE_PATH -- Define a safe PATH environment to pass to CGI 
> executables.
>   @@ -360,7 +360,7 @@
>    <EM>From src/httpd.h</EM>
>    <PRE>
>         /* The path to the suEXEC wrapper */
>   -     #define SUEXEC_BIN "/usr/local/etc/httpd/sbin/suexec"
>   +     #define SUEXEC_BIN "/usr/local/apache/sbin/suexec"
>    </PRE>
>    </P>
>    
>   @@ -378,7 +378,7 @@
>    </P>
>    
>    <P ALIGN="LEFT">
>   -<STRONG><CODE>cp suexec /usr/local/etc/httpd/sbin/suexec 
> [ENTER]</CODE></STRONG>
>   +<STRONG><CODE>cp suexec /usr/local/apache/sbin/suexec 
> [ENTER]</CODE></STRONG>
>    </P>
>    
>    <P ALIGN="LEFT">
>   @@ -389,8 +389,8 @@
>    </P>
>    
>    <P ALIGN="LEFT">
>   -<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>
>   +<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>
>    </P>
>    
>    <P ALIGN="CENTER">
>   
>   
>   
>   1.9.2.3   +4 -0      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.2
>   retrieving revision 1.9.2.3
>   diff -u -r1.9.2.2 -r1.9.2.3
>   --- vhosts-in-depth.html    1997/11/01 23:39:25     1.9.2.2
>   +++ vhosts-in-depth.html    1997/11/02 00:16:01     1.9.2.3
>   @@ -186,6 +186,10 @@
>    
>    <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:
>    
>   
>   
>   
>   No                   revision
>   
>   
>   No                   revision
>   
>   
>   1.63.2.15 +107 -8    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.14
>   retrieving revision 1.63.2.15
>   diff -u -r1.63.2.14 -r1.63.2.15
>   --- FAQ.html        1997/08/03 08:47:57     1.63.2.14
>   +++ FAQ.html        1997/11/02 00:16:03     1.63.2.15
>   @@ -15,7 +15,7 @@
>      <!--#include virtual="header.html" -->
>      <H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
>      <P>
>   -  $Revision: 1.63.2.14 $ ($Date: 1997/08/03 08:47:57 $)
>   +  $Revision: 1.63.2.15 $ ($Date: 1997/11/02 00:16:03 $)
>      </P>
>      <P>
>      The latest version of this FAQ is always available from the main
>   @@ -252,6 +252,11 @@
>       <LI><A HREF="#cgi-spec">Where can I find the &quot;CGI
>        specification&quot;?</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>
>   @@ -322,7 +327,7 @@
>      <P>
>      For an independent assessment, see
>      <A
>   -   HREF="http://webcompare.iworld.com/compare/chart.html";
>   +   HREF="http://webcompare.internet.com/chart.html";
>      >Web Compare</A>'s
>      comparison chart.
>      </P>
>   @@ -609,7 +614,7 @@
>      allow all files named &quot;<SAMP>*.cgi</SAMP>&quot; 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 
>   -  via 
>   +  <EM>via</EM>
>      <A
>       HREF="../mod/mod_rewrite.html"
>      ><SAMP>mod_rewrite</SAMP></A> 
>   @@ -1351,10 +1356,15 @@
>      </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#serverroot"
>   -  >ServerRoot</A>
>   -  directory.
>   +   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).
>      </P>
>      <HR>
>     </LI>
>   @@ -1986,8 +1996,10 @@
>         </A>
>      <P>
>      You can't! The reason is: First, case translations for arbitrary length 
> URLs
>   -  cannot be done via regex patterns and corresponding substitutions. One 
> need
>   -  a per-character pattern like sed/Perl <SAMP>tr|..|..|</SAMP> feature.  
> Second, just
>   +  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
>      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
>   @@ -2046,6 +2058,93 @@
>            ><SAMP>http://www.ast.cam.ac.uk/~drtr/cgi-spec.html</SAMP></A>&gt;.
>       </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>&lt;VirtualHost&gt;</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>&lt;VirtualHost&gt;</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 &quot;<SAMP>n.n.n.n</SAMP>&quot; 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>&lt;VirtualHost&gt;</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.7.2.5   +14 -0     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.4
>   retrieving revision 1.7.2.5
>   diff -u -r1.7.2.4 -r1.7.2.5
>   --- compat_notes.html       1997/09/18 19:53:19     1.7.2.4
>   +++ compat_notes.html       1997/11/02 00:16:04     1.7.2.5
>   @@ -127,6 +127,20 @@
>      <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.4   +1 -1      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.3
>   retrieving revision 1.7.2.4
>   diff -u -r1.7.2.3 -r1.7.2.4
>   --- fin_wait_2.html 1997/11/01 23:39:31     1.7.2.3
>   +++ fin_wait_2.html 1997/11/02 00:16:04     1.7.2.4
>   @@ -192,7 +192,7 @@
>                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";>Squent's ptx/TCP/IP for
>   +        <LI><A HREF="http://www.sequent.com";>Sequent's ptx/TCP/IP for
>                DYNIX/ptx</A> has had a FIN_WAIT_2 timeout since around
>                release 4.1 in mid-1994.
>    </UL>
>   
>   
>   
>   1.8.2.5   +1 -1      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.4
>   retrieving revision 1.8.2.5
>   diff -u -r1.8.2.4 -r1.8.2.5
>   --- perf.html       1997/11/01 23:39:33     1.8.2.4
>   +++ perf.html       1997/11/02 00:16:05     1.8.2.5
>   @@ -109,7 +109,7 @@
>    <UL>
>    
>    <LI><A 
> href="http://www.sun.com/sun-on-net/Sun.Internet.Solutions/performance/";>
>   -World Wide Web Server Performance,
>   +World Wide Web Server Performance, 
>    
> &lt;http://www.sun.com/sun-on-net/Sun.Internet.Solutions/performance/&gt;</a>
>    <LI><A HREF="http://www.sun.com/solaris/products/siss/";>
>    Solaris Internet Server Supplement for 2.5.1</A>
>   
>   
>   
>   No                   revision
>   
>   
>   No                   revision
>   
>   
>   1.8.2.3   +14 -10    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.2
>   retrieving revision 1.8.2.3
>   diff -u -r1.8.2.2 -r1.8.2.3
>   --- mod_auth_anon.html      1997/11/01 23:39:40     1.8.2.2
>   +++ mod_auth_anon.html      1997/11/02 00:16:07     1.8.2.3
>   @@ -101,7 +101,7 @@
>    
>    <h2><A name="LogEmail">Anonymous_LogEmail directive</A></h2>
>    <strong>Syntax:</strong> Anonymous_LogEmail <em>on | off</em><br>
>   -<strong>Default:</strong> <code>off</code><br>
>   +<strong>Default:</strong> <code>Anonymous_LogEmail on</code><br>
>    <strong>Context:</strong> directory, .htaccess<br>
>    <strong>Override:</strong> AuthConfig<br>
>    <strong>Status:</strong> Extension<br>
>   @@ -114,7 +114,7 @@
>    <h2><A name="MustGiveEmail">Anonymous_MustGiveEmail directive</A></h2>
>    <!--%plaintext &lt;?INDEX {\tt Anonymous_MustGiveEmail} directive&gt; -->
>    <strong>Syntax:</strong> Anonymous_MustGiveEmail <em>on</em> | 
> <em>off</em><br>
>   -<strong>Default:</strong> off<br>
>   +<strong>Default:</strong> <code>Anonymous_MustGiveEmail on</code><br>
>    <strong>Context:</strong> directory, .htaccess<br>
>    <strong>Override:</strong> AuthConfig<br>
>    <strong>Status:</strong> Extension<br>
>   @@ -141,7 +141,7 @@
>    <hr>
>    
>    <h2><A name="VerifyEmail">Anonymous_VerifyEmail directive</A></h2>
>   -<strong>Syntax:</strong> Anonymous <em>on | off</em><br>
>   +<strong>Syntax:</strong> Anonymous_VerifyEmail <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>
>   @@ -170,29 +170,33 @@
>    <li>
>    The userID must be one of <code>anonymous guest www test welcome</code>
>    and comparison is <b>not</b> case sensitive.
>   -<code>&lt;directory /web/docs/public&gt;</code>
>    <li>
>   -And the Email addresses entered in the passswd field are logged to
>   +And the Email addresses entered in the passwd field are logged to
>    the httpd-log file
>    (<code>Anonymous_LogEmail</code>)
>    </ul>
>    <p>
>    Excerpt of access.conf:
>    <blockquote><code>
>   -Anonymous        anonymous guest www test welcome<p>
>   +Anonymous_NoUserId      off<br>
>    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>
>   -
>   -</code>
>   +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>
>   +&lt;Files *&gt;<br>
>    order deny,allow          <br>
>    allow from all            <br>
>    <p>
>    require valid-user        <br>
>   +&lt;/Files&gt;<br>
>    </code></blockquote>
>    
>    
>   
>   
>   
>   1.3.2.1   +36 -9     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
>   retrieving revision 1.3.2.1
>   diff -u -r1.3 -r1.3.2.1
>   --- mod_example.html        1997/06/04 16:14:20     1.3
>   +++ mod_example.html        1997/11/02 00:16:07     1.3.2.1
>   @@ -47,11 +47,12 @@
>      To include the example module in your server, follow the steps below:
>      </P>
>      <OL>
>   -   <LI>Uncomment the "Module example_module" line near the bottom of
>   +   <LI>Uncomment the "AddModule modules/example/mod_example" line near 
>   +    the bottom of
>        the <CODE>src/Configuration</CODE> file.  If there isn't one, add
>        it; it should look like this:
>        <PRE>
>   -     Module example_module        modules/example/mod_example.o
>   +     AddModule modules/example/mod_example.o
>        </PRE>
>       </LI>
>       <LI>Run the <CODE>src/Configure</CODE> script
>   @@ -116,20 +117,46 @@
>       Example
>      </A></H2>
>      <P>
>   -  <STRONG>Syntax:</STRONG> Example
>   +  <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
>      <BR>
>   -  <STRONG>Default:</STRONG> None
>   +  <A
>   +   HREF="directive-dict.html#Context"
>   +   REL="Help" 
>   +  ><STRONG>Context:</STRONG></A> server config, virtual host, directory,
>   +  .htaccess
>      <BR>
>   -  <STRONG>Context:</STRONG> server config, virtual host, directory, 
> .htaccess
>   +  <A
>   +   HREF="directive-dict.html#Override"
>   +   REL="Help" 
>   +  ><STRONG>Override:</STRONG></A> Options
>      <BR>
>   -  <STRONG>Override:</STRONG> Options
>   +  <A
>   +   HREF="directive-dict.html#Status"
>   +   REL="Help" 
>   +  ><STRONG>Status:</STRONG></A> Extension
>      <BR>
>   -  <STRONG>Status:</STRONG> Extension
>   +  <A
>   +   HREF="directive-dict.html#Module"
>   +   REL="Help" 
>   +  ><STRONG>Module:</STRONG></A> mod_example
>      <BR>
>   -  <STRONG>Module:</STRONG> mod_example
>   +  <A
>   +   HREF="directive-dict.html#Compatibility"
>   +   REL="Help" 
>   +  ><STRONG>Compatibility:</STRONG></A> <SAMP>Example</SAMP> is only
>   +   available in Apache 1.2 and later.
>      </P>
>      <P>
>   -  The Example directive activates the example module's content handler
>   +  The <SAMP>Example</SAMP> 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.11.2.2  +12 -0     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.1
>   retrieving revision 1.11.2.2
>   diff -u -r1.11.2.1 -r1.11.2.2
>   --- mod_mime.html   1997/06/09 14:46:04     1.11.2.1
>   +++ mod_mime.html   1997/11/02 00:16:08     1.11.2.2
>   @@ -59,6 +59,18 @@
>    
>    <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.22.2.4  +61 -14    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.3
>   retrieving revision 1.22.2.4
>   diff -u -r1.22.2.3 -r1.22.2.4
>   --- mod_proxy.html  1997/08/02 08:24:08     1.22.2.3
>   +++ mod_proxy.html  1997/11/02 00:16:08     1.22.2.4
>   @@ -17,13 +17,15 @@
>    
>    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 <b>HTTP 1.0</b> caching 
> proxy
>   +is not compiled in by default. It provides for an <STRONG>HTTP
>   +1.0</STRONG> caching proxy 
>    server. It is only available in Apache 1.1 and later. Common configuration
>   -questions are addressed <a href="#configs">here</a>.
>   +questions are addressed <a href="#configs">after the directive
>   +descriptions</a>.
>    
>    <h3>Note:</h3>
>    <p>This module was experimental in Apache 1.1.x. As of Apache 1.2, 
> mod_proxy
>   -stability is <i>greatly</i> improved.<p>
>   +stability is <EM>greatly</EM> improved.<p>
>    
>    <h2>Summary</h2>
>    
>   @@ -59,18 +61,23 @@
>    <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> ProxyRequest is only available in
>   +<strong>Compatibility:</strong> ProxyRequests 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>&lt;match&gt; 
> &lt;remote-server&gt;</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
>   @@ -88,7 +95,7 @@
>    
>    &lt;protocol&gt; 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
>   @@ -100,9 +107,13 @@
>    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>&lt;path&gt; &lt;url&gt;</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
>   @@ -112,17 +123,23 @@
>    server; the local server does not act as a proxy in the conventional sense,
>    but appears to be a mirror of the remote server. &lt;path&gt; is the name 
> of
>    a local virtual path; &lt;url&gt; is a partial URL for the remote server.
>   -
>   -Suppose the local server has address http://wibble.org; then
>   +<P>
>   +Suppose the local server has address <SAMP>http://wibble.org/</SAMP>; then
>    <pre>
>       ProxyPass /mirror/foo http://foo.com
>    </pre>
>   -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
>   +will cause a local request for the
>   +&lt;<SAMP>http://wibble.org/mirror/foo/bar</SAMP>&gt; to be
>   +internally converted into a proxy request to
>   +&lt;<SAMP>http://foo.com/bar</SAMP>&gt;.
>   +
>   +<HR>
>    
>    <A name="proxyblock"><h2>ProxyBlock</h2></A>
>    <strong>Syntax:</strong> ProxyBlock <em>&lt;word/host/domain 
> list&gt;</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
>   @@ -150,9 +167,13 @@
>    
>    blocks connections to all sites.
>    
>   +<HR>
>   +
>    <A name="cacheroot"><h2>CacheRoot</h2></A>
>    <strong>Syntax:</strong> CacheRoot <em>&lt;directory&gt;</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
>   @@ -162,22 +183,29 @@
>    writable
>    by the httpd server.
>    
>   +<HR>
>   +
>    <A name="cachesize"><h2>CacheSize</h2></A>
>    <strong>Syntax:</strong> CacheSize <em>&lt;size&gt;</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>&lt;time&gt;</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
>   @@ -186,10 +214,13 @@
>    Check the cache every &lt;time&gt; 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>&lt;time&gt;</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
>   @@ -200,10 +231,13 @@
>    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>&lt;factor&gt;</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
>   @@ -220,10 +254,13 @@
>    <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>&lt;levels&gt;</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
>   @@ -232,10 +269,13 @@
>    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>&lt;length&gt;</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
>   @@ -243,10 +283,13 @@
>    
>    CacheDirLength sets the number of characters in proxy cache subdirectory 
> names.
>    
>   +<HR>
>   +
>    <A name="cachedefaultexpire"><h2>CacheDefaultExpire</h2></A>
>    <strong>Syntax:</strong> CacheDefaultExpire <em>&lt;time&gt;</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
>   @@ -255,11 +298,15 @@
>    If the document is fetched via a protocol that does not support expiry 
> times,
>    then use &lt;time&gt; hours as the expiry time.
>    <a href="#cachemaxexpire">CacheMaxExpire</a> does <strong>not</strong>
>   -override.
>   +override this setting.
>   +
>   +<HR>
>    
>    <A name="nocache"><h2>NoCache</h2></A>
>    <strong>Syntax:</strong> NoCache <em>&lt;word/host/domain list&gt;</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
>   @@ -295,7 +342,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 <i>xxx</i> download via 
> FTP?</a>
>   +<li><a href="#mimetypes">Why doesn't file type <EM>xxx</EM> 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>
>   @@ -326,10 +373,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 <i>xxx</i> download via 
> FTP?</a></h2>
>   +<h2><a name="mimetypes">Why doesn't file type <EM>xxx</EM> download via 
> FTP?</a></h2>
>    
>    You probably don't have that particular file type defined as
>   -<i>application/octet-stream</i> in your proxy's mime.types configuration
>   +<EM>application/octet-stream</EM> in your proxy's mime.types configuration
>    file. A useful line can be<p>
>    
>    <pre>
>   
>   
>   
> 

Reply via email to