--- httpd-2.2.6/modules/generators/mod_autoindex.c 2007-08-30 07:37:26.000000000 +0900 +++ httpd-2.2.6-new/modules/generators/mod_autoindex.c 2007-09-22 18:08:13.000000000 +0900 @@ -1090,7 +1090,10 @@ emit_preamble(r, emit_xhtml, title); } if (emit_H1) { - ap_rvputs(r, "

Index of ", title, "

\n", NULL); + ap_rvputs(r, "
\n" + "\tLocation:\n" + "\t", title, "\n" + "
\n", NULL); } if (rr != NULL) { ap_destroy_sub_req(rr); @@ -1162,7 +1165,7 @@ ap_rputs(ap_psignature("", r), r); } if (!suppress_post) { - ap_rputs("\n", r); + ap_rputs("
Copyright unfix.net all right reserved
\n\n\n", r); } if (rr != NULL) { ap_destroy_sub_req(rr); @@ -1531,58 +1534,35 @@ if (autoindex_opts & TABLE_INDEXING) { int cols = 1; - ap_rputs("", r); - if (!(autoindex_opts & SUPPRESS_ICON)) { - ap_rputs("", r); - } - else { - ap_rputs(" ", r); - } - - ++cols; - } - ap_rputs("
", r); - if ((tp = find_default_icon(d, "^^BLANKICON^^"))) { - ap_rvputs(r, "\"[ICO]\"",icon_width) { - ap_rprintf(r, " width=\"%d\"", d->icon_width); - } - if (d->icon_height) { - ap_rprintf(r, " height=\"%d\"", d->icon_height); - } - - if (autoindex_opts & EMIT_XHTML) { - ap_rputs(" /", r); - } - ap_rputs(">", r); + ap_rputs("\n\n", r); + ap_rputs("\t\n\t\n\t\n\t\n", cols, + "\n\t\n\n", cols, (autoindex_opts & EMIT_XHTML) ? " /" : ""); } - ap_rvputs(r, "", breakrow, NULL); + ap_rvputs(r, "\n\n", breakrow, NULL); } else if (autoindex_opts & FANCY_INDEXING) { ap_rputs("
", r);
@@ -1659,9 +1639,9 @@
         }
 
         if (autoindex_opts & TABLE_INDEXING) {
-            ap_rputs("
", r); + ap_rputs("\n", r); if (!(autoindex_opts & SUPPRESS_ICON)) { - ap_rputs("", r); - } - else { - ap_rputs("", r); + ap_rputs(" ", r); } } + else + ap_rputs("\t\n\t\n\t\n\t\n\t\n\t\n\t\n\t\n", r); + ap_rputs("\n\n", r); } else if (autoindex_opts & FANCY_INDEXING) { if (!(autoindex_opts & SUPPRESS_ICON)) {
", r); emit_link(r, "Name", K_NAME, keyid, direction, colargs, static_columns); if (!(autoindex_opts & SUPPRESS_LAST_MOD)) { - ap_rputs("", r); + ap_rputs("", r); emit_link(r, "Last modified", K_LAST_MOD, keyid, direction, colargs, static_columns); ++cols; } if (!(autoindex_opts & SUPPRESS_SIZE)) { - ap_rputs("", r); + ap_rputs("", r); emit_link(r, "Size", K_SIZE, keyid, direction, colargs, static_columns); ++cols; } if (!(autoindex_opts & SUPPRESS_DESC)) { - ap_rputs("", r); + ap_rputs("", r); emit_link(r, "Description", K_DESC, keyid, direction, colargs, static_columns); ++cols; } if (!(autoindex_opts & SUPPRESS_RULES)) { breakrow = apr_psprintf(r->pool, - "
" - "
" + "
", r); + ap_rputs("\t", r); if (autoindex_opts & ICONS_ARE_LINKS) { ap_rvputs(r, "", NULL); } @@ -1688,14 +1668,14 @@ ap_rputs(" ", r); } if (autoindex_opts & ICONS_ARE_LINKS) { - ap_rputs("", r); + if (d->name_adjust == K_ADJUST) { - ap_rvputs(r, "", + ap_rvputs(r, "", ap_escape_html(scratch, t2), "", NULL); } else { @@ -1709,7 +1689,7 @@ t2 = name_scratch; nwidth = name_width; } - ap_rvputs(r, "", + ap_rvputs(r, "", ap_escape_html(scratch, t2), "", pad_scratch + nwidth, NULL); } @@ -1719,36 +1699,39 @@ apr_time_exp_t ts; apr_time_exp_lt(&ts, ar[x]->lm); apr_strftime(time_str, &rv, MAX_STRING_LEN, - "%d-%b-%Y %H:%M ", + "%d-%b-%Y %H:%M ", &ts); ap_rputs(time_str, r); } else { - ap_rputs(" ", r); + ap_rputs(" ", r); } } if (!(autoindex_opts & SUPPRESS_SIZE)) { char buf[5]; - ap_rvputs(r, "", + ap_rvputs(r, "", apr_strfsize(ar[x]->size, buf), NULL); } if (!(autoindex_opts & SUPPRESS_DESC)) { if (ar[x]->desc) { if (d->desc_adjust == K_ADJUST) { - ap_rvputs(r, "", ar[x]->desc, NULL); + ap_rvputs(r, "", ar[x]->desc, NULL); } else { - ap_rvputs(r, "", + ap_rvputs(r, "", terminate_description(d, ar[x]->desc, autoindex_opts, desc_width), NULL); } } + else + ap_rputs(" ", r); + } else { - ap_rputs(" ", r); + ap_rputs(" ", r); } - ap_rputs("