You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2002/06/15 09:20:59 UTC
cvs commit: httpd-2.0/modules/mappers mod_userdir.c
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 <dd...@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 <dd...@real-me.net>]
+
*) Fixed a problem with 'make install' on ReliantUnix.
[Jean-frederic Clere <jf...@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);
RE: cvs commit: httpd-2.0/modules/mappers mod_userdir.c
Posted by Ryan Bloom <rb...@covalent.net>.
> From: Aaron Bannert [mailto:aaron@clove.org]
>
> On Sat, Jun 15, 2002 at 07:20:59AM -0000, rbb@apache.org wrote:
> > 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);
>
> Is this anything more than an intentation change, and if so did you
mean
> to include it in the same commit with the shtml AddType fix?
It is just indentation, and no I didn't mean to include it, but since it
is safe, I left it there.
Ryan
Re: cvs commit: httpd-2.0/modules/mappers mod_userdir.c
Posted by Aaron Bannert <aa...@clove.org>.
On Sat, Jun 15, 2002 at 07:20:59AM -0000, rbb@apache.org wrote:
> 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);
Is this anything more than an intentation change, and if so did you mean
to include it in the same commit with the shtml AddType fix?
-aaron