SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-01-08 00:39:27 +00:00
parent a2b5593ce1
commit 19c768bf4f
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
67 changed files with 1526 additions and 522 deletions
Download patch file Download diff file Expand all files Collapse all files

5
usr.sbin/httpd/js.h.in
View file

@ -1,6 +1,7 @@
static const char *js =
const rowValue = (tr, idx) => tr.children[idx].getAttribute('data-o') || tr.children[idx].innerText || tr.children[idx].textContent;
const cellVal = (e) => e.getAttribute('title') || e.getAttribute('data-o') ||
e.innerText || e.textContent;
const rowValue = (tr, idx) => cellVal(tr.children[idx]);
const compare = (idx, asc) => (a, b) => ((v1, v2) =>
v1 !== '' && v2 !== '' && !isNaN(v1) && !isNaN(v2) ? v1 - v2 : v1.toString().localeCompare(v2)
)(rowValue(asc ? a : b, idx), rowValue(asc ? b : a, idx));

4
usr.sbin/httpd/server_file.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: server_file.c,v 1.77 2024/01/04 18:17:47 espie Exp $ */
/* $OpenBSD: server_file.c,v 1.78 2024/01/06 11:29:00 espie Exp $ */
/*
* Copyright (c) 2006 - 2017 Reyk Floeter <reyk@openbsd.org>
@ -596,7 +596,7 @@ server_file_index(struct httpd *env, struct client *clt)
(evbuffer_add_printf(evb,
"<tr><td><a href=\"%s%s\">%s</a></td>\n"
" <td data-o=\"%lld\">%s</td>"
"<td data-o=\"%llu\">%s</td></tr>\n",
"<td title=\"%llu\">%s</td></tr>\n",
strchr(escapeduri, ':') != NULL ? "./" : "",
escapeduri, escapedhtml,
(long long)t, tmstr,