Skip to content

[2.4.x] mod_autoindex updates from trunk #682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
notroj wants to merge 3 commits into
base: 2.4.x
Choose a base branch
from
Open

[2.4.x] mod_autoindex updates from trunk #682

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f01f2cc
* modules/generators/mod_autoindex.c (dsortf): Ensure the function
notroj Jan 8, 2025
d757ba2
add charset in the document if specified in IndexOptions
bigio Jan 21, 2026
048003d
* modules/generators/mod_autoindex.c (add_header): Reject invalid
notroj Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions modules/generators/mod_autoindex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,11 @@ static void emit_preamble(request_rec *r, int xhtml, const char *title)
if (xhtml) {
ap_rvputs(r, DOCTYPE_XHTML_1_0T,
"<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
" <head>\n <title>Index of ", title,
" <head>\n", NULL);
if(d->charset != NULL) {
ap_rvputs(r, " <meta http-equiv=\"Content-Type\" content=\"text/html; charset=", d->charset, "\" />\n", NULL);
}
ap_rvputs(r, " <title>Index of ", title,
"</title>\n", NULL);
} else {
ap_rvputs(r, DOCTYPE_HTML_4_01,
Expand Down Expand Up @@ -457,8 +461,8 @@ static const char *add_opts(cmd_parms *cmd, void *d, int argc, char *const argv[
else {
int width = atoi(&w[10]);

if (width && (width < 5)) {
return "NameWidth value must be greater than 5";
if (width < 5) {
return "NameWidth value must be at least 5";
}
d_cfg->name_width = width;
d_cfg->name_adjust = K_NOADJUST;
Expand Down Expand Up @@ -1915,8 +1919,13 @@ static int dsortf(struct ent **e1, struct ent **e2)

/*
* First, see if either of the entries is for the parent directory.
* If so, that *always* sorts lower than anything else.
* If so, that *always* sorts lower than anything else. The
* function must be transitive else behaviour is undefined, although
* in no real case should both entries start with a '/'.
*/
if ((*e1)->name[0] == '/' && (*e2)->name[0] == '/') {
return 0;
}
if ((*e1)->name[0] == '/') {
return -1;
}
Expand Down
Loading