httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject cvs commit: httpd-2.0/docs/manual/misc FAQ-F.html custom_errordocs.html
Date Sat, 10 Feb 2001 23:33:37 GMT
slive       01/02/10 15:33:37

  Modified:    docs/manual/mod mod_include.html
               docs/manual/howto ssi.html
               docs/manual/misc FAQ-F.html custom_errordocs.html
  Log:
  Update all the references I can find to use SetOutputFilter to
  actives SSIs.
  
  Revision  Changes    Path
  1.31      +21 -17    httpd-2.0/docs/manual/mod/mod_include.html
  
  Index: mod_include.html
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_include.html,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -d -b -u -r1.30 -r1.31
  --- mod_include.html	2001/01/24 18:28:09	1.30
  +++ mod_include.html	2001/02/10 23:33:34	1.31
  @@ -61,34 +61,38 @@
   
   <H2>Enabling Server-Side Includes</H2>
   
  -Any document with handler of "server-parsed" will be parsed by this
  -module, if the <CODE>Includes</CODE> option is set. If documents
  -containing server-side include directives are given the extension
  -.shtml, the following directives will make Apache parse them and
  -assign the resulting document the mime type of <CODE>text/html</CODE>:
  +<p>Server Side Includes are implemented by the <code>INCLUDES</code>
  +<a href="../filter.html">filter</a>.  If documents containing
  +server-side include directives are given the extension .shtml, the
  +following directives will make Apache parse them and assign the
  +resulting document the mime type of <CODE>text/html</CODE>:
  +</p>
   
  -<PRE>
  -AddType text/html .shtml
  -AddHandler server-parsed .shtml
  -</PRE>
  +<blockquote><code>
  +AddType text/html .shtml<br>
  +&lt;FilesMatch "\.shtml[.$]"&gt;<br>
  +&nbsp;&nbsp;SetOutputFilter INCLUDES<br>
  +&lt;/FilesMatch&gt;
  +</code></blockquote>
   
  -The following directive must be given for the directories containing
  +<p>The following directive must be given for the directories containing
   the shtml files (typically in a <CODE>&lt;Directory&gt;</CODE> section,
   but this directive is also valid .htaccess files if <CODE>AllowOverride
  -Options</CODE> is set):
  +Options</CODE> is set):</p>
   
  -<PRE>
  +<blockquote><code>
   Options +Includes
  -</PRE>
  +</code></blockquote>
   
  -Alternatively the <A HREF="#xbithack"><CODE>XBitHack</CODE></A>
  +<p>Alternatively the <A HREF="#xbithack"><CODE>XBitHack</CODE></A>
   directive can be used to parse normal (<CODE>text/html</CODE>) files,
  -based on file permissions.  <P>
  +based on file permissions.</p>
   
  -For backwards compatibility, documents with mime type
  +<p>For backwards compatibility, documents with mime type
   <CODE>text/x-server-parsed-html</CODE> or
   <CODE>text/x-server-parsed-html3</CODE> will also be parsed
  -(and the resulting output given the mime type <CODE>text/html</CODE>).
  +(and the resulting output given the mime type <CODE>text/html</CODE>)
  +as will documents with the handler <code>server-parsed</code>.
   
   <H2>Basic Elements</H2>
   
  
  
  
  1.3       +3 -1      httpd-2.0/docs/manual/howto/ssi.html
  
  Index: ssi.html
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/howto/ssi.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -d -b -u -r1.2 -r1.3
  --- ssi.html	2001/01/24 18:14:18	1.2
  +++ ssi.html	2001/02/10 23:33:35	1.3
  @@ -143,7 +143,9 @@
   
   <pre>
           AddType text/html .shtml
  -        AddHandler server-parsed .shtml
  +        &lt;FilesMatch "\.shtml[.$]"&gt;
  +          SetOutputFilter INCLUDES<br>
  +        &lt;/FilesMatch&gt;
   </pre>
   
   <p>One disadvantage to this approach is that if you wanted to add SSI
  
  
  
  1.8       +13 -11    httpd-2.0/docs/manual/misc/FAQ-F.html
  
  Index: FAQ-F.html
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/misc/FAQ-F.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -d -b -u -r1.7 -r1.8
  --- FAQ-F.html	2000/12/02 21:39:03	1.7
  +++ FAQ-F.html	2001/02/10 23:33:36	1.8
  @@ -31,7 +31,7 @@
     <!--#include virtual="header.html" -->
     <H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
     <P>
  -  $Revision: 1.7 $ ($Date: 2000/12/02 21:39:03 $)
  +  $Revision: 1.8 $ ($Date: 2001/02/10 23:33:36 $)
     </P>
     <P>
     The latest version of this FAQ is always available from the main
  @@ -383,22 +383,24 @@
       directive which permits <SAMP>Includes</SAMP>.
      </LI>
      <LI>Make sure that the directory where you want the SSI documents to
  -    live is covered by the &quot;server-parsed&quot; content handler,
  +    live is covered by the &quot;INCLUDES&quot; output filter,
       either explicitly or in some ancestral location.  That can be done
       with the following
  -    <A HREF="../mod/mod_mime.html#addhandler"><SAMP>AddHandler</SAMP></A>
  +    <A HREF="../mod/core.html#setoutputfilter"><SAMP>SetOutputFilter</SAMP></A>
       directive:
       <P>
  -    <DL>
  -     <DD><CODE>AddHandler server-parsed .shtml</CODE>
  -     </DD>
  -    </DL>
  +    <blockquote><code>
  +    &lt;FilesMatch "\.shtml[.$]"&gt;<br>
  +    &nbsp;&nbsp;SetOutputFilter INCLUDES<br>
  +    &lt;/FilesMatch&gt;
  +    </code></blockquote>
       <P></P>
       <P>
  -    This indicates that all files ending in &quot;.shtml&quot; in that
  -    location (or its descendants) should be parsed.  Note that using
  -    &quot;.html&quot; will cause all normal HTML files to be parsed,
  -    which may put an inordinate load on your server.
  +    This indicates that all files with the extension
  +    &quot;.shtml&quot; in that location (or its descendants) should be
  +    parsed.  Note that using &quot;.html&quot; will cause all normal
  +    HTML files to be parsed, which may put an inordinate load on your
  +    server.
       </P>
      </LI>
     </UL>
  
  
  
  1.8       +3 -1      httpd-2.0/docs/manual/misc/custom_errordocs.html
  
  Index: custom_errordocs.html
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/misc/custom_errordocs.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -d -b -u -r1.7 -r1.8
  --- custom_errordocs.html	2000/10/24 19:09:55	1.7
  +++ custom_errordocs.html	2001/02/10 23:33:36	1.8
  @@ -145,7 +145,9 @@
      AllowOverride none
      Options MultiViews IncludesNoExec FollowSymLinks
      AddType text/html .shtml
  -   AddHandler server-parsed .shtml
  +   &lt;FilesMatch "\.shtml[.$]"&gt;
  +    SetOutputFilter INCLUDES
  +   &lt;/FilesMatch&gt;
     &lt;/Directory&gt;
     #    "400 Bad Request",
     ErrorDocument  400  /errordocs/400
  
  
  

Mime
View raw message