dgaudet 97/09/15 21:13:07
Modified: src CHANGES
src/modules/standard mod_userdir.c
Log:
*) mod_userdir was modifying r->finfo in cases where it wasn't setting
r->filename. Since those two are meant to be in sync with each other
this is a bug. ["Paul B. Henson" <[EMAIL PROTECTED]>]
Submitted by: "Paul B. Henson" <[EMAIL PROTECTED]>
Reviewed by: Dean Gaudet
Revision Changes Path
1.443 +5 -1 apachen/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- CHANGES 1997/09/16 03:59:56 1.442
+++ CHANGES 1997/09/16 04:13:03 1.443
@@ -1,5 +1,9 @@
Changes with Apache 1.3b1
-
+
+ *) mod_userdir was modifying r->finfo in cases where it wasn't setting
+ r->filename. Since those two are meant to be in sync with each other
+ this is a bug. ["Paul B. Henson" <[EMAIL PROTECTED]>]
+
*) PORT: Support Unisys SVR4, whose uname returns mostly useless data.
["Kaufman, Steven E" <[EMAIL PROTECTED]>]
1.22 +3 -1 apachen/src/modules/standard/mod_userdir.c
Index: mod_userdir.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_userdir.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_userdir.c 1997/08/18 13:12:18 1.21
+++ mod_userdir.c 1997/09/16 04:13:06 1.22
@@ -194,6 +194,7 @@
const char *userdirs = pstrdup (r->pool, s_cfg->userdir);
const char *w, *dname, *redirect;
char *x = NULL;
+ struct stat statbuf;
/*
* If the URI doesn't match our basic pattern, we've nothing to do with
@@ -312,8 +313,9 @@
in the hope that some handler might handle it. This can be used, for
example, to run a CGI script for the user.
*/
- if (filename && (!*userdirs || stat(filename, &r->finfo) != -1)) {
+ if (filename && (!*userdirs || stat(filename, &statbuf) != -1)) {
r->filename = pstrcat(r->pool, filename, dname, NULL);
+ r->finfo = statbuf;
return OK;
}
}