httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_userdir.c
Date Sat, 15 Jun 2002 07:20:59 GMT
rbb         2002/06/15 00:20:59

  Modified:    .        CHANGES
               docs/conf httpd-std.conf.in
               modules/mappers mod_userdir.c
  Log:
  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>
  
  Revision  Changes    Path
  1.834     +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.833
  retrieving revision 1.834
  diff -u -r1.833 -r1.834
  --- CHANGES	15 Jun 2002 06:11:44 -0000	1.833
  +++ CHANGES	15 Jun 2002 07:20:58 -0000	1.834
  @@ -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>]
   
  
  
  
  1.11      +1 -0      httpd-2.0/docs/conf/httpd-std.conf.in
  
  Index: httpd-std.conf.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- httpd-std.conf.in	13 Jun 2002 18:39:04 -0000	1.10
  +++ httpd-std.conf.in	15 Jun 2002 07:20:59 -0000	1.11
  @@ -843,6 +843,7 @@
   # 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
   
   #
  
  
  
  1.50      +5 -5      httpd-2.0/modules/mappers/mod_userdir.c
  
  Index: mod_userdir.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_userdir.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- mod_userdir.c	31 May 2002 16:59:13 -0000	1.49
  +++ mod_userdir.c	15 Jun 2002 07:20:59 -0000	1.50
  @@ -347,12 +347,12 @@
                                            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);
  
  
  

Mime
View raw message