From: Ryan Bloom <rbb@apache.org>
Date: Sat, 15 Jun 2002 07:20:59 +0000 (+0000)
Subject: We must set the MIME-type for .shtml files to text/html if we want them
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3437149c72ce2b68275c510879aac359242908b9;p=apache

We must set the MIME-type for .shtml files to text/html if we want them
to be parsed for SSI tags.  Add the config for that to the default
config file so that it is easier to enable .shtml parsing.

PR:	9787
Submitted by:	Dave Dyer <ddyer@real-me.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95693 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 795884aeda..1a113a6677 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.38
 
+  *) We must set the MIME-type for .shtml files to text/html if we want them
+     to be parsed for SSI tags.  Add the config for that to the default 
+     config file so that it is easier to enable .shtml parsing.
+     [Dave Dyer <ddyer@real-me.net>]
+
   *) Fixed a problem with 'make install' on ReliantUnix.
      [Jean-frederic Clere <jfrederic.clere@fujitsu-siemens.com>]
 
diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 5c145478c4..03ad021202 100644
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -843,6 +843,7 @@ AddHandler type-map var
 # To parse .shtml files for server-side includes (SSI):
 # (You will also need to add "Includes" to the "Options" directive.)
 #
+#AddType text/html .shtml
 #AddOutputFilter INCLUDES .shtml
 
 #
diff --git a/modules/mappers/mod_userdir.c b/modules/mappers/mod_userdir.c
index 85c32af08f..7d874bf5fd 100644
--- a/modules/mappers/mod_userdir.c
+++ b/modules/mappers/mod_userdir.c
@@ -347,12 +347,12 @@ static int translate_userdir(request_rec *r)
                                          r->pool)) == APR_SUCCESS
                                              || rv == APR_INCOMPLETE))) {
             r->filename = apr_pstrcat(r->pool, filename, dname, NULL);
-	    /* XXX: Does this walk us around FollowSymLink rules?
+            /* XXX: Does this walk us around FollowSymLink rules?
              * When statbuf contains info on r->filename we can save a syscall
-	     * by copying it to r->finfo
-	     */
-	    if (*userdirs && dname[0] == 0)
-		r->finfo = statbuf;
+             * by copying it to r->finfo
+             */
+            if (*userdirs && dname[0] == 0)
+                r->finfo = statbuf;
 
             /* For use in the get_suexec_identity phase */
             apr_table_setn(r->notes, "mod_userdir_user", w);