From ba3266faca70c86eb01c92e49621113db2dab0ce Mon Sep 17 00:00:00 2001 From: Joshua Slive Date: Sat, 10 Feb 2001 23:33:36 +0000 Subject: [PATCH] Update all the references I can find to use SetOutputFilter to actives SSIs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88072 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/howto/ssi.html | 4 ++- docs/manual/howto/ssi.html.en | 4 ++- docs/manual/misc/FAQ-F.html | 24 ++++++++------- docs/manual/misc/custom_errordocs.html | 4 ++- docs/manual/mod/mod_include.html | 42 ++++++++++++++------------ 5 files changed, 45 insertions(+), 33 deletions(-) diff --git a/docs/manual/howto/ssi.html b/docs/manual/howto/ssi.html index d804733738..da17836b41 100644 --- a/docs/manual/howto/ssi.html +++ b/docs/manual/howto/ssi.html @@ -143,7 +143,9 @@ such as .shtml, with the following directives:

         AddType text/html .shtml
-        AddHandler server-parsed .shtml
+        <FilesMatch "\.shtml[.$]">
+          SetOutputFilter INCLUDES

+        </FilesMatch>

One disadvantage to this approach is that if you wanted to add SSI diff --git a/docs/manual/howto/ssi.html.en b/docs/manual/howto/ssi.html.en index d804733738..da17836b41 100644 --- a/docs/manual/howto/ssi.html.en +++ b/docs/manual/howto/ssi.html.en @@ -143,7 +143,9 @@ such as .shtml, with the following directives:

         AddType text/html .shtml
-        AddHandler server-parsed .shtml
+        <FilesMatch "\.shtml[.$]">
+          SetOutputFilter INCLUDES

+        </FilesMatch>

One disadvantage to this approach is that if you wanted to add SSI diff --git a/docs/manual/misc/FAQ-F.html b/docs/manual/misc/FAQ-F.html index 7acb96e516..87c71faeae 100644 --- a/docs/manual/misc/FAQ-F.html +++ b/docs/manual/misc/FAQ-F.html @@ -31,7 +31,7 @@

Apache Server Frequently Asked Questions

- $Revision: 1.7 $ ($Date: 2000/12/02 21:39:03 $) + $Revision: 1.8 $ ($Date: 2001/02/10 23:33:36 $)

The latest version of this FAQ is always available from the main @@ -383,22 +383,24 @@ directive which permits Includes.

  • Make sure that the directory where you want the SSI documents to - live is covered by the "server-parsed" content handler, + live is covered by the "INCLUDES" output filter, either explicitly or in some ancestral location. That can be done with the following - AddHandler + SetOutputFilter directive:

    -

    -
    AddHandler server-parsed .shtml -
    -
    +
    + <FilesMatch "\.shtml[.$]">
    +   SetOutputFilter INCLUDES
    + </FilesMatch> +

    - This indicates that all files ending in ".shtml" in that - location (or its descendants) should be parsed. Note that using - ".html" 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 + ".shtml" in that location (or its descendants) should be + parsed. Note that using ".html" will cause all normal + HTML files to be parsed, which may put an inordinate load on your + server.

    • diff --git a/docs/manual/misc/custom_errordocs.html b/docs/manual/misc/custom_errordocs.html index 983d46beb6..c2c2310a13 100644 --- a/docs/manual/misc/custom_errordocs.html +++ b/docs/manual/misc/custom_errordocs.html @@ -145,7 +145,9 @@ the contained directives- must be omitted.) AllowOverride none Options MultiViews IncludesNoExec FollowSymLinks AddType text/html .shtml - AddHandler server-parsed .shtml + <FilesMatch "\.shtml[.$]"> + SetOutputFilter INCLUDES + </FilesMatch> </Directory> # "400 Bad Request", ErrorDocument 400 /errordocs/400 diff --git a/docs/manual/mod/mod_include.html b/docs/manual/mod/mod_include.html index ce373b8fa8..ae0500cdcf 100644 --- a/docs/manual/mod/mod_include.html +++ b/docs/manual/mod/mod_include.html @@ -61,34 +61,38 @@ and AddHandler.

    Enabling Server-Side Includes

    -Any document with handler of "server-parsed" will be parsed by this -module, if the Includes 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 text/html: - -
    -AddType text/html .shtml
-AddHandler server-parsed .shtml
-
    - -The following directive must be given for the directories containing +

    Server Side Includes are implemented by the INCLUDES +filter. 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 text/html: +

    + +
    +AddType text/html .shtml
    +<FilesMatch "\.shtml[.$]">
    +  SetOutputFilter INCLUDES
    +</FilesMatch> +
    + +

    The following directive must be given for the directories containing the shtml files (typically in a <Directory> section, but this directive is also valid .htaccess files if AllowOverride -Options is set): +Options is set):

    -
    +
    
 Options +Includes
-
    + -Alternatively the XBitHack +

    Alternatively the XBitHack directive can be used to parse normal (text/html) files, -based on file permissions.

    +based on file permissions.

    -For backwards compatibility, documents with mime type +

    For backwards compatibility, documents with mime type text/x-server-parsed-html or text/x-server-parsed-html3 will also be parsed -(and the resulting output given the mime type text/html). +(and the resulting output given the mime type text/html) +as will documents with the handler server-parsed.

    Basic Elements

    -- 2.40.0