Mailing List Archive

coar 97/11/12 13:37:46

Modified: src CHANGES
src/modules/standard mod_autoindex.c
Log:
Fix mod_autoindex so it displays the ReadmeName file under all
circumstances, as it already handled the HeaderName file that
way.

PR: 1373
Reviewed by: Dean Gaudet, Martin Kraemer

Revision Changes Path
1.506 +6 -0 apachen/src/CHANGES

Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -r1.505 -r1.506
--- CHANGES 1997/11/12 20:42:06 1.505
+++ CHANGES 1997/11/12 21:37:43 1.506
@@ -1,5 +1,11 @@
Changes with Apache 1.3b3

+ *) mod_autoindex wasn't displaying the ReadmeName file at the bottom
+ unless it was also doing FancyIndexes, but it displayed the
+ HeaderName file at the top under all circumstances. It now shows
+ the ReadmeName file for simple indices, too, as it should. PR#1373
+ [Ken Coar]
+
*) http_core was mmap()ing even in cases where it wasn't going to
read the file. [Ben Hyde <bhyde@gensym.com>]




1.56 +4 -6 apachen/src/modules/standard/mod_autoindex.c

Index: mod_autoindex.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mod_autoindex.c 1997/11/09 20:40:33 1.55
+++ mod_autoindex.c 1997/11/12 21:37:45 1.56
@@ -1100,12 +1100,10 @@
direction);
pclosedir(r->pool, d);

- if (autoindex_opts & FANCY_INDEXING) {
- if ((tmp = find_readme(autoindex_conf, r)))
- insert_readme(name, tmp, "", HRULE, END_MATTER, r);
- else {
- rputs("</UL>", r);
- }
+ if ((tmp = find_readme(autoindex_conf, r))) {
+ insert_readme(name, tmp, "",
+ ((autoindex_opts & FANCY_INDEXING) ? HRULE : NO_HRULE),
+ END_MATTER, r);
}
rputs("</BODY></HTML>\n", r);