marc 98/10/03 23:13:19
Modified: src CHANGES
src/modules/standard mod_autoindex.c
Log:
Fix mod_autoindex bug where directories got a size of "0k" instead
of "-". This was introduced by a bogus cleanup in rev 1.31; -1 was
changed to 0 to avoid storing -1 in a size_t, when the correct fix is
to change the size_t to an off_t.
Submitter's patch modified for correctness.
PR: 3130
Submitted by: Martin Plechsmid <[EMAIL PROTECTED]>
Revision Changes Path
1.1099 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1098
retrieving revision 1.1099
diff -u -r1.1098 -r1.1099
--- CHANGES 1998/10/03 19:28:16 1.1098
+++ CHANGES 1998/10/04 06:13:16 1.1099
@@ -1,5 +1,9 @@
Changes with Apache 1.3.3
+ *) Fix mod_autoindex bug where directories got a size of "0k" instead
+ of "-". [Martin Plechsmid <[EMAIL PROTECTED]>, Marc Slemko]
+ PR#3130
+
*) PORT: DRS 6000 machine. [Paul Debleecker <[EMAIL PROTECTED]>]
*) Add the server signature text (from the core ServerSignature directive)
1.96 +3 -3 apache-1.3/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- mod_autoindex.c 1998/10/02 21:35:38 1.95
+++ mod_autoindex.c 1998/10/04 06:13:18 1.96
@@ -569,7 +569,7 @@
char *icon;
char *alt;
char *desc;
- size_t size;
+ off_t size;
time_t lm;
struct ent *next;
int ascending;
@@ -859,7 +859,7 @@
p = (struct ent *) ap_pcalloc(r->pool, sizeof(struct ent));
p->name = ap_pstrdup(r->pool, name);
- p->size = 0;
+ p->size = -1;
p->icon = NULL;
p->alt = NULL;
p->desc = NULL;
@@ -879,7 +879,7 @@
if (!(p->alt = find_alt(d, rr, 1))) {
p->alt = "DIR";
}
- p->size = 0;
+ p->size = -1;
p->name = ap_pstrcat(r->pool, name, "/", NULL);
}
else {
