diff --git a/Makefile b/Makefile index 7769dfc07..c87d438fa 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,6 @@ include libc/testlib/testlib.mk include tool/viz/lib/vizlib.mk include third_party/lua/lua.mk include third_party/quickjs/quickjs.mk -include examples/examples.mk include third_party/lz4cli/lz4cli.mk include tool/build/lib/buildlib.mk include third_party/chibicc/chibicc.mk @@ -145,6 +144,7 @@ include third_party/chibicc/test/test.mk include tool/build/emucrt/emucrt.mk include tool/build/emubin/emubin.mk include tool/build/build.mk +include examples/examples.mk include tool/decode/lib/decodelib.mk include tool/decode/decode.mk include tool/hash/hash.mk diff --git a/ape/ape.S b/ape/ape.S index ad4986203..e355ae632 100644 --- a/ape/ape.S +++ b/ape/ape.S @@ -865,48 +865,48 @@ ape_macho: @see "The Portable Executable File Format from Top to Bottom", Randy Kath, Microsoft Developer Network Technology Group. */ -// ┌14:Uniprocessor Machine ┌─────────────────────────┐ -// │┌13:DLL │ PE File Characteristics │ -// ││┌12:System ├─────────────────────────┤ -// │││┌11:If Net Run From Swap │ r │ reserved │ -// ││││┌10:If Removable Run From Swap │ d │ deprecated │ -// │││││┌9:Debug Stripped │ D │ deprecated with │ -// ││││││┌8:32bit Machine │ │ extreme prejudice │ -// │││││││ ┌5:Large Address Aware └───┴─────────────────────┘ -// │││││││ │ ┌1:Executable -// │││││││ │ │┌0:Relocs Stripped -// d│││││││dr│Ddd││ -PEEXE = 0b0000001000100011 +// ┌14:Uniprocessor Machine ┌─────────────────────────┐ +// │┌13:DLL │ PE File Characteristics │ +// ││┌12:System ├─────────────────────────┤ +// │││┌11:If Net Run From Swap │ r │ reserved │ +// ││││┌10:If Removable Run From Swap │ d │ deprecated │ +// │││││┌9:Debug Stripped │ D │ deprecated with │ +// ││││││┌8:32bit Machine │ │ extreme prejudice │ +// │││││││ ┌5:Large Address Aware └───┴─────────────────────┘ +// │││││││ │ ┌1:Executable +// │││││││ │ │┌0:Relocs Stripped +// d│││││││dr│Ddd││ +PEEXE = 0b00000001000100011 -// ┌15:TERMINAL_SERVER_AWARE ┌─────────────────────────┐ -// │┌14:GUARD_CF │ PE DLL Characteristics │ -// ││┌13:WDM_DRIVER ├─────────────────────────┤ -// │││┌12:APPCONTAINER │ r │ reserved │ -// ││││┌11:NO_BIND └───┴─────────────────────┘ -// │││││┌10:NO_SEH -// ││││││┌9:NO_ISOLATION -// │││││││┌8:NX_COMPAT -// ││││││││┌7:FORCE_INTEGRITY -// │││││││││┌6:DYNAMIC_BASE -// ││││││││││┌5:HIGH_ENTROPY_VA -// │││││││││││rrrrr +// ┌15:TERMINAL_SERVER_AWARE ┌─────────────────────────┐ +// │┌14:GUARD_CF │ PE DLL Characteristics │ +// ││┌13:WDM_DRIVER ├─────────────────────────┤ +// │││┌12:APPCONTAINER │ r │ reserved │ +// ││││┌11:NO_BIND └───┴─────────────────────┘ +// │││││┌10:NO_SEH +// ││││││┌9:NO_ISOLATION +// │││││││┌8:NX_COMPAT +// ││││││││┌7:FORCE_INTEGRITY +// │││││││││┌6:DYNAMIC_BASE +// ││││││││││┌5:HIGH_ENTROPY_VA +// │││││││││││rrrrr DLLSTD = 0b0000000100100000 DLLPIE = 0b0000000001100000 DLLEXE = DLLSTD -// ┌31:Writeable ┌─────────────────────────┐ -// │┌30:Readable │ PE Section Flags │ -// ││┌29:Executable ├─────────────────────────┤ -// │││┌28:Shareable │ o │ for object files │ -// ││││┌27:Unpageable │ r │ reserved │ -// │││││┌26:Uncacheable └───┴─────────────────────┘ -// ││││││┌25:Discardable -// │││││││┌24:Contains Extended Relocations -// ││││││││ ┌15:Contains Global Pointer (GP) Relative Data -// ││││││││ │ ┌7:Contains Uninitialized Data -// ││││││││ │ │┌6:Contains Initialized Data -// ││││││││ o │ ││┌5:Contains Code -// ││││││││┌┴─┐rrrr│ ooror│││rorrr +// ┌31:Writeable ┌─────────────────────────┐ +// │┌30:Readable │ PE Section Flags │ +// ││┌29:Executable ├─────────────────────────┤ +// │││┌28:Shareable │ o │ for object files │ +// ││││┌27:Unpageable │ r │ reserved │ +// │││││┌26:Uncacheable └───┴─────────────────────┘ +// ││││││┌25:Discardable +// │││││││┌24:Contains Extended Relocations +// ││││││││ ┌15:Contains Global Pointer (GP) Relative Data +// ││││││││ │ ┌7:Contains Uninitialized Data +// ││││││││ │ │┌6:Contains Initialized Data +// ││││││││ o │ ││┌5:Contains Code +// ││││││││┌┴─┐rrrr│ ooror│││rorrr PETEXT = 0b01110000000000000000000001100000 PEDATA = 0b11000000000000000000000011000000 PEIMPS = 0b11000000000000000000000001000000 @@ -1437,7 +1437,7 @@ long: push $GDT_LONG_DATA .endfn long /* ▄▄▒▀▀▀▀▒▒▄ -█████▓▓▄░░░░ ▒▒▄░ +█████▓▓▄░░░░ ▒▒▄ ▐█▓▓█▓▄█████▓░ ▀▒▄ ▓█▓▓▓▓▓▓▓▓▓█▓ ░▀▒░ ▀▀▓█▓▓▓▓▓▓█▓ ░▀▒▄▄▒▄▄▄▒▒▒▀▀▀▀▀▀▀▀▀▀▀▀▀▀▒▒▄▒ diff --git a/build/bootstrap/package.com b/build/bootstrap/package.com index c166f1018..4266ab544 100755 Binary files a/build/bootstrap/package.com and b/build/bootstrap/package.com differ diff --git a/build/bootstrap/zipobj.com b/build/bootstrap/zipobj.com index d148bd22d..bbe95476f 100755 Binary files a/build/bootstrap/zipobj.com and b/build/bootstrap/zipobj.com differ diff --git a/examples/curl.c b/examples/curl.c index 46c54332e..b46b42621 100644 --- a/examples/curl.c +++ b/examples/curl.c @@ -25,7 +25,8 @@ #include "libc/sysv/consts/shut.h" #include "libc/sysv/consts/sock.h" #include "libc/x/x.h" -#include "net/http/uri.h" +#include "net/http/http.h" +#include "net/http/url.h" /** * @fileoverview Downloads HTTP URL to stdout. @@ -35,50 +36,92 @@ */ int main(int argc, char *argv[]) { - int sock; - ssize_t rc; - unsigned long need; - struct UriSlice path; - size_t i, got, toto, msglen; - char buf[1500], host[256], port[7]; - const char *url, *msg, *pathstr, *crlfcrlf, *contentlength; - struct UriSlice us[16]; - struct Uri u = {.segs.p = us, .segs.n = ARRAYLEN(us)}; + + /* + * Get argument. + */ + const char *urlarg; + if (argc != 2) { + fprintf(stderr, "USAGE: %s URL\n", argv[0]); + exit(1); + } + urlarg = argv[1]; + + /* + * Parse URL. + */ + struct Url url; + char *host, *port; + _gc(ParseUrl(urlarg, -1, &url)); + _gc(url.params.p); + if (url.scheme.n && + !(url.scheme.n == 4 && !memcasecmp(url.scheme.p, "http", 4))) { + fprintf(stderr, "ERROR: NOT AN HTTP URL: %s\n", urlarg); + exit(1); + } + host = firstnonnull(_gc(strndup(url.host.p, url.host.n)), "127.0.0.1"); + port = url.port.n ? _gc(strndup(url.port.p, url.port.n)) : "80"; + port = _gc(xasprintf("%hu", atoi(port))); + if (!IsAcceptableHost(host, -1)) { + fprintf(stderr, "ERROR: INVALID HOST: %s\n", urlarg); + exit(1); + } + url.fragment.p = 0, url.fragment.n = 0; + url.scheme.p = 0, url.scheme.n = 0; + url.user.p = 0, url.user.n = 0; + url.pass.p = 0, url.pass.n = 0; + url.host.p = 0, url.host.n = 0; + url.port.p = 0, url.port.n = 0; + if (!url.path.n || url.path.p[0] != '/') { + char *p = _gc(xmalloc(1 + url.path.n)); + mempcpy(mempcpy(p, "/", 1), url.path.p, url.path.n); + url.path.p = p; + ++url.path.n; + } + + /* + * Create HTTP message. + */ + const char *msg; + msg = _gc(xasprintf("GET %s HTTP/1.1\r\n" + "Host: %s:%s\r\n" + "Connection: close\r\n" + "Content-Length: 0\r\n" + "Accept: text/plain; */*\r\n" + "Accept-Encoding: identity\r\n" + "User-Agent: github.com/jart/cosmopolitan\r\n" + "\r\n", + _gc(EncodeUrl(&url, 0)), host, port)); + + /* + * Perform DNS lookup. + */ struct addrinfo *addr, *addrs; struct addrinfo hints = {.ai_family = AF_INET, .ai_socktype = SOCK_STREAM, .ai_protocol = IPPROTO_TCP, .ai_flags = AI_NUMERICSERV}; - if (argc != 2) { - fprintf(stderr, "USAGE: %s URL\n", argv[0]); - exit(1); - } - url = argv[1]; - CHECK_NE(-1, uriparse(&u, url, strlen(url)), "BAD URL: %`'s", url); - CHECK_EQ(kUriSchemeHttp, urischeme(u.scheme, url)); - urislice2cstr(host, sizeof(host), u.host, url, "127.0.0.1"); - urislice2cstr(port, sizeof(port), u.port, url, "80"); - path = uripath(&u); - pathstr = path.n ? url + path.i : "/"; - msg = _gc(xstrcat("GET ", pathstr, - " HTTP/1.1\r\n" - "Host: ", - host, - "\r\n" - "Connection: close\r\n" - "Content-Length: 0\r\n" - "Accept: text/plain; */*\r\n" - "Accept-Encoding: identity\r\n" - "User-Agent: github.com/jart/cosmopolitan\r\n" - "\r\n")); - msglen = strlen(msg); CHECK_EQ(EAI_SUCCESS, getaddrinfo(host, port, &hints, &addrs)); for (addr = addrs; addr; addr = addr->ai_next) { + + /* + * Send HTTP Message. + */ + int sock; CHECK_NE(-1, (sock = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol))); CHECK_NE(-1, connect(sock, addr->ai_addr, addr->ai_addrlen)); - CHECK_EQ(msglen, write(sock, msg, msglen)); + CHECK_EQ(strlen(msg), write(sock, msg, strlen(msg))); shutdown(sock, SHUT_WR); + + /* + * Handle response. + */ + ssize_t rc; + char buf[1500]; + size_t got, toto; + unsigned long need; + const char *msg, *crlfcrlf; buf[0] = '\0'; CHECK_NE(-1, (rc = read(sock, buf, sizeof(buf)))); got = rc; diff --git a/examples/examples.mk b/examples/examples.mk index ef6080ef1..acf6ebfa7 100644 --- a/examples/examples.mk +++ b/examples/examples.mk @@ -74,6 +74,7 @@ EXAMPLES_DIRECTDEPS = \ THIRD_PARTY_STB \ THIRD_PARTY_XED \ THIRD_PARTY_ZLIB \ + TOOL_BUILD_LIB \ TOOL_VIZ_LIB EXAMPLES_DEPS := \ diff --git a/examples/hello3.c b/examples/hello3.c index 29a69466f..64fbdbbb2 100644 --- a/examples/hello3.c +++ b/examples/hello3.c @@ -8,9 +8,10 @@ ╚─────────────────────────────────────────────────────────────────*/ #endif #include "libc/errno.h" +#include "libc/fmt/fmt.h" #include "libc/stdio/stdio.h" int main() { - printf("%s \n", "hello world"); + printf("%`'s\n", "hello\1\2world→→"); return errno; } diff --git a/examples/nc.c b/examples/nc.c new file mode 100644 index 000000000..39b2c0995 --- /dev/null +++ b/examples/nc.c @@ -0,0 +1,112 @@ +#if 0 +/*─────────────────────────────────────────────────────────────────╗ +│ To the extent possible under law, Justine Tunney has waived │ +│ all copyright and related or neighboring rights to this file, │ +│ as it is written in the following disclaimers: │ +│ • http://unlicense.org/ │ +│ • http://creativecommons.org/publicdomain/zero/1.0/ │ +╚─────────────────────────────────────────────────────────────────*/ +#endif +#include "libc/calls/calls.h" +#include "libc/fmt/conv.h" +#include "libc/log/log.h" +#include "libc/macros.internal.h" +#include "libc/runtime/runtime.h" +#include "libc/sock/sock.h" +#include "libc/str/str.h" +#include "libc/sysv/consts/af.h" +#include "libc/sysv/consts/ipproto.h" +#include "libc/sysv/consts/poll.h" +#include "libc/sysv/consts/shut.h" +#include "libc/sysv/consts/so.h" +#include "libc/sysv/consts/sock.h" +#include "libc/sysv/consts/sol.h" + +/** + * @fileoverview netcat clone + * + * Implemented because BusyBox's netcat doesn't detect remote close and + * lingers in the CLOSE_WAIT wait possibly due to file descriptor leaks + * + * Once upon time we called this command "Telnet" + */ + +int main(int argc, char *argv[]) { + ssize_t rc; + size_t i, got; + char buf[1500]; + int err, toto, sock; + struct linger linger = {true, 1}; + struct sockaddr_in addr = {AF_INET}; + struct pollfd fds[2] = {{-1, POLLIN}, {-1, POLLIN}}; + + if (argc != 3) exit(1); + inet_pton(AF_INET, argv[1], &addr.sin_addr); + addr.sin_port = htons(atoi(argv[2])); + + if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) { + perror("socket"); + exit(1); + } + + if (setsockopt(sock, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger)) == -1) { + perror("setsockopt(SO_LINGER)"); + exit(1); + } + + if (connect(sock, &addr, sizeof(addr)) == -1) { + perror("connect"); + exit(1); + } + + fds[0].fd = 0; + fds[1].fd = sock; + for (;;) { + fds[0].revents = 0; + fds[1].revents = 0; + if (poll(fds, ARRAYLEN(fds), -1) == -1) { + perror("poll"); + exit(1); + } + + if (fds[0].revents & (POLLIN | POLLERR | POLLHUP)) { + if ((rc = read(0, buf, 1400)) == -1) { + perror("read(stdin)"); + exit(1); + } + if (!(got = rc)) { + shutdown(sock, SHUT_WR); + fds[0].fd = -1; + } + for (i = 0; i < got; i += rc) { + if ((rc = write(sock, buf + i, got - i)) == -1) { + perror("write(sock)"); + exit(1); + } + } + } + + if (fds[1].revents & (POLLIN | POLLERR | POLLHUP)) { + if ((rc = read(sock, buf, 1500)) == -1) { + perror("read(sock)"); + exit(1); + } + if (!(got = rc)) { + break; + } + for (i = 0; i < got; i += rc) { + if ((rc = write(1, buf + i, got - i)) == -1) { + perror("write(stdout)"); + exit(1); + } + } + } + } + + if (close(sock) == -1) { + perror("close"); + exit(1); + } + + return 0; +} diff --git a/examples/panels.c b/examples/panels.c new file mode 100644 index 000000000..856aac2d4 --- /dev/null +++ b/examples/panels.c @@ -0,0 +1,175 @@ +#if 0 +/*─────────────────────────────────────────────────────────────────╗ +│ To the extent possible under law, Justine Tunney has waived │ +│ all copyright and related or neighboring rights to this file, │ +│ as it is written in the following disclaimers: │ +│ • http://unlicense.org/ │ +│ • http://creativecommons.org/publicdomain/zero/1.0/ │ +╚─────────────────────────────────────────────────────────────────*/ +#endif +#include "libc/calls/calls.h" +#include "libc/calls/ioctl.h" +#include "libc/calls/struct/sigaction.h" +#include "libc/calls/struct/termios.h" +#include "libc/calls/struct/winsize.h" +#include "libc/log/check.h" +#include "libc/log/gdb.h" +#include "libc/log/log.h" +#include "libc/macros.internal.h" +#include "libc/runtime/gc.internal.h" +#include "libc/runtime/runtime.h" +#include "libc/str/str.h" +#include "libc/sysv/consts/sa.h" +#include "libc/sysv/consts/sig.h" +#include "libc/sysv/consts/termios.h" +#include "libc/x/x.h" +#include "tool/build/lib/panel.h" + +/** + * @fileoverview Cosmopolitan Paneling Demo. + * + * This is useful for creating terminal user interfaces. We take the + * simplest approach possible. The main thing we abstract is like, + * truncating the lines that overflow within a panel. In order to do + * that, we abstract the ANSI parsing and the implementation is able to + * tell how many cells wide each UNICODE character is. + * + * There are smarter ways for Cosmopolitan to do this. For example, it'd + * be great to have automatic flex boxes. It'd also be nice to be able + * to use dynamic programming for low bandwidth display updates, like + * Emacs does, but that's less of an issue these days and can actually + * make things slower, since for heavy workloads like printing videos, + * having ANSI codes bouncing around the display actually goes slower. + * + * Beyond basic paneling, a message box widget is also provided, which + * makes it easier to do modal dialogs. + */ + +struct Panels { + union { + struct { + struct Panel left; + struct Panel right; + }; + struct Panel p[2]; + }; +} pan; + +long tyn; +long txn; +char key[8]; +bool shutdown; +bool invalidated; +struct termios oldterm; + +void OnShutdown(int sig) { + shutdown = true; +} + +void OnInvalidate(int sig) { + invalidated = true; +} + +void GetTtySize(void) { + struct winsize wsize; + wsize.ws_row = tyn; + wsize.ws_col = txn; + getttysize(1, &wsize); + tyn = wsize.ws_row; + txn = wsize.ws_col; +} + +int Write(const char *s) { + return write(1, s, strlen(s)); +} + +void Setup(void) { + CHECK_NE(-1, ioctl(1, TCGETS, &oldterm)); +} + +void Enter(void) { + struct termios term; + memcpy(&term, &oldterm, sizeof(term)); + term.c_cc[VMIN] = 1; + term.c_cc[VTIME] = 1; + term.c_iflag &= ~(INPCK | ISTRIP | PARMRK | INLCR | IGNCR | ICRNL | IXON); + term.c_lflag &= ~(IEXTEN | ICANON | ECHO | ECHONL); + term.c_cflag &= ~(CSIZE | PARENB); + term.c_cflag |= CS8; + term.c_iflag |= IUTF8; + CHECK_NE(-1, ioctl(1, TCSETS, &term)); + Write("\e[?25l"); +} + +void Leave(void) { + Write(gc(xasprintf("\e[?25h\e[%d;%dH\e[S\r\n", tyn, txn))); + ioctl(1, TCSETS, &oldterm); +} + +void Clear(void) { + long i, j; + for (i = 0; i < ARRAYLEN(pan.p); ++i) { + for (j = 0; j < pan.p[i].n; ++j) { + free(pan.p[i].lines[j].p); + } + free(pan.p[i].lines); + pan.p[i].lines = 0; + pan.p[i].n = 0; + } +} + +void Layout(void) { + long i, j; + i = txn >> 1; + pan.left.top = 0; + pan.left.left = 0; + pan.left.bottom = tyn; + pan.left.right = i; + pan.right.top = 0; + pan.right.left = i + 1; + pan.right.bottom = tyn; + pan.right.right = txn; + pan.left.n = pan.left.bottom - pan.left.top; + pan.left.lines = xcalloc(pan.left.n, sizeof(*pan.left.lines)); + pan.right.n = pan.right.bottom - pan.right.top; + pan.right.lines = xcalloc(pan.right.n, sizeof(*pan.right.lines)); +} + +void Append(struct Panel *p, int i, const char *s) { + if (i >= p->n) return; + AppendStr(p->lines + i, s); +} + +void Draw(void) { + Append(&pan.left, 0, gc(xasprintf("you typed %`'s", key))); + Append(&pan.left, ((tyn + 1) >> 1) + 0, "hello left 1 𐌰𐌱𐌲𐌳𐌴𐌵𐌶𐌷"); + Append(&pan.left, ((tyn + 1) >> 1) + 1, "hello left 2 (╯°□°)╯"); + Append(&pan.right, ((tyn + 1) >> 1) + 0, "hello right 1"); + Append(&pan.right, ((tyn + 1) >> 1) + 1, "hello right 2"); + PrintPanels(1, ARRAYLEN(pan.p), pan.p, tyn, txn); +} + +int main(int argc, char *argv[]) { + struct sigaction sa[2] = {{.sa_handler = OnShutdown}, + {.sa_handler = OnInvalidate}}; + showcrashreports(); + Setup(); + Enter(); + GetTtySize(); + sigaction(SIGINT, &sa[0], 0); + sigaction(SIGCONT, &sa[1], 0); + sigaction(SIGWINCH, &sa[1], 0); + atexit(Leave); + do { + Clear(); + Layout(); + Draw(); + if (invalidated) { + Enter(); + GetTtySize(); + invalidated = false; + } else { + readansi(0, key, sizeof(key)); + } + } while (!shutdown); +} diff --git a/libc/alg/bisect.internal.h b/libc/alg/bisect.internal.h index beaa9be7b..242d50668 100644 --- a/libc/alg/bisect.internal.h +++ b/libc/alg/bisect.internal.h @@ -6,19 +6,23 @@ COSMOPOLITAN_C_START_ forceinline void *bisect(const void *k, const void *data, size_t n, size_t size, int cmp(const void *a, const void *b, void *arg), void *arg) { - int dir; - const char *p, *pos; - p = data; - while (n > 0) { - pos = p + size * (n / 2); - dir = cmp(k, pos, arg); - if (dir < 0) { - n /= 2; - } else if (dir > 0) { - p = pos + size; - n -= n / 2 + 1; - } else { - return (void *)pos; + int c; + const char *p; + ssize_t m, l, r; + if (n) { + l = 0; + r = n - 1; + p = data; + while (l <= r) { + m = (l + r) >> 1; + c = cmp(k, p + m * size, arg); + if (c > 0) { + l = m + 1; + } else if (c < 0) { + r = m - 1; + } else { + return p + m * size; + } } } return NULL; diff --git a/libc/bits/bitreverse16.c b/libc/bits/bitreverse16.c index c3a8058a7..7769ec82c 100644 --- a/libc/bits/bitreverse16.c +++ b/libc/bits/bitreverse16.c @@ -21,6 +21,6 @@ /** * Reverses bits in 16-bit word. */ -uint16_t(bitreverse16)(uint16_t x) { - return kReverseBits[x & 0x00FF] << 8 | kReverseBits[(x & 0xFF00) >> 8]; +int bitreverse16(int x) { + return BITREVERSE16(x); } diff --git a/libc/bits/bitreverse32.c b/libc/bits/bitreverse32.c index 405068a13..126e5403a 100644 --- a/libc/bits/bitreverse32.c +++ b/libc/bits/bitreverse32.c @@ -22,10 +22,10 @@ /** * Reverses bits in 32-bit word. */ -uint32_t(bitreverse32)(uint32_t x) { +uint32_t bitreverse32(uint32_t x) { x = bswap_32(x); - x = ((x & 0xaaaaaaaa) >> 1) | ((x & 0x55555555) << 1); - x = ((x & 0xcccccccc) >> 2) | ((x & 0x33333333) << 2); - x = ((x & 0xf0f0f0f0) >> 4) | ((x & 0x0f0f0f0f) << 4); + x = (x & 0xaaaaaaaa) >> 1 | (x & 0x55555555) << 1; + x = (x & 0xcccccccc) >> 2 | (x & 0x33333333) << 2; + x = (x & 0xf0f0f0f0) >> 4 | (x & 0x0f0f0f0f) << 4; return x; } diff --git a/libc/bits/bitreverse64.c b/libc/bits/bitreverse64.c index be0abb1fe..4bacc907e 100644 --- a/libc/bits/bitreverse64.c +++ b/libc/bits/bitreverse64.c @@ -24,8 +24,8 @@ */ uint64_t bitreverse64(uint64_t x) { x = bswap_64(x); - x = ((x & 0xaaaaaaaaaaaaaaaa) >> 1) | ((x & 0x5555555555555555) << 1); - x = ((x & 0xcccccccccccccccc) >> 2) | ((x & 0x3333333333333333) << 2); - x = ((x & 0xf0f0f0f0f0f0f0f0) >> 4) | ((x & 0x0f0f0f0f0f0f0f0f) << 4); + x = (x & 0xaaaaaaaaaaaaaaaa) >> 1 | (x & 0x5555555555555555) << 1; + x = (x & 0xcccccccccccccccc) >> 2 | (x & 0x3333333333333333) << 2; + x = (x & 0xf0f0f0f0f0f0f0f0) >> 4 | (x & 0x0f0f0f0f0f0f0f0f) << 4; return x; } diff --git a/libc/bits/bitreverse8.c b/libc/bits/bitreverse8.c index 5ce08fc45..e9788f47b 100644 --- a/libc/bits/bitreverse8.c +++ b/libc/bits/bitreverse8.c @@ -21,6 +21,6 @@ /** * Reverses bits in 8-bit word. */ -uint8_t(bitreverse8)(uint8_t x) { - return kReverseBits[x]; +int bitreverse8(int x) { + return BITREVERSE8(x); } diff --git a/libc/bits/bits.h b/libc/bits/bits.h index 4b2a2ee6a..d4a4c5b4f 100644 --- a/libc/bits/bits.h +++ b/libc/bits/bits.h @@ -13,8 +13,8 @@ extern const uint8_t kReverseBits[256]; uint32_t gray(uint32_t) pureconst; uint32_t ungray(uint32_t) pureconst; -uint8_t bitreverse8(uint8_t) libcesque pureconst; -uint16_t bitreverse16(uint16_t) libcesque pureconst; +int bitreverse8(int) libcesque pureconst; +int bitreverse16(int) libcesque pureconst; uint32_t bitreverse32(uint32_t) libcesque pureconst; uint64_t bitreverse64(uint64_t) libcesque pureconst; unsigned long roundup2pow(unsigned long) libcesque pureconst; @@ -31,106 +31,104 @@ intptr_t atomic_store(void *, intptr_t, size_t); │ cosmopolitan § bits » no assembly required ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│*/ -#define bitreverse8(X) (kReverseBits[(uint8_t)(X)]) -#define bitreverse16(X) \ - ((uint16_t)kReverseBits[(uint8_t)(X)] << 010 | \ - kReverseBits[((uint16_t)(X) >> 010) & 0xff]) +#define BITREVERSE8(X) (kReverseBits[255 & (X)]) +#define BITREVERSE16(X) \ + (kReverseBits[0x00FF & (X)] << 8 | kReverseBits[(0xFF00 & (X)) >> 8]) -#define READ16LE(S) \ - ((uint16_t)((unsigned char *)(S))[1] << 010 | \ - (uint16_t)((unsigned char *)(S))[0] << 000) -#define READ32LE(S) \ - ((uint32_t)((unsigned char *)(S))[3] << 030 | \ - (uint32_t)((unsigned char *)(S))[2] << 020 | \ - (uint32_t)((unsigned char *)(S))[1] << 010 | \ - (uint32_t)((unsigned char *)(S))[0] << 000) -#define READ64LE(S) \ - ((uint64_t)((unsigned char *)(S))[7] << 070 | \ - (uint64_t)((unsigned char *)(S))[6] << 060 | \ - (uint64_t)((unsigned char *)(S))[5] << 050 | \ - (uint64_t)((unsigned char *)(S))[4] << 040 | \ - (uint64_t)((unsigned char *)(S))[3] << 030 | \ - (uint64_t)((unsigned char *)(S))[2] << 020 | \ - (uint64_t)((unsigned char *)(S))[1] << 010 | \ - (uint64_t)((unsigned char *)(S))[0] << 000) +#ifdef __STRICT_ANSI__ +#define READ16LE(S) ((255 & (S)[1]) << 8 | (255 & (S)[0])) +#define READ16BE(S) ((255 & (S)[0]) << 8 | (255 & (S)[1])) +#define READ32LE(S) \ + ((uint32_t)(255 & (S)[3]) << 030 | (uint32_t)(255 & (S)[2]) << 020 | \ + (uint32_t)(255 & (S)[1]) << 010 | (uint32_t)(255 & (S)[0]) << 000) +#define READ32BE(S) \ + ((uint32_t)(255 & (S)[0]) << 030 | (uint32_t)(255 & (S)[1]) << 020 | \ + (uint32_t)(255 & (S)[2]) << 010 | (uint32_t)(255 & (S)[3]) << 000) +#define READ64LE(S) \ + ((uint64_t)(255 & (S)[7]) << 070 | (uint64_t)(255 & (S)[6]) << 060 | \ + (uint64_t)(255 & (S)[5]) << 050 | (uint64_t)(255 & (S)[4]) << 040 | \ + (uint64_t)(255 & (S)[3]) << 030 | (uint64_t)(255 & (S)[2]) << 020 | \ + (uint64_t)(255 & (S)[1]) << 010 | (uint64_t)(255 & (S)[0]) << 000) +#define READ64BE(S) \ + ((uint64_t)(255 & (S)[0]) << 070 | (uint64_t)(255 & (S)[1]) << 060 | \ + (uint64_t)(255 & (S)[2]) << 050 | (uint64_t)(255 & (S)[3]) << 040 | \ + (uint64_t)(255 & (S)[4]) << 030 | (uint64_t)(255 & (S)[5]) << 020 | \ + (uint64_t)(255 & (S)[6]) << 010 | (uint64_t)(255 & (S)[7]) << 000) +#else /* gcc needs help knowing above are mov if s isn't a variable */ +#define READ16LE(S) \ + ({ \ + const uint8_t *Ptr = (const uint8_t *)(S); \ + Ptr[1] << 8 | Ptr[0]; \ + }) +#define READ16BE(S) \ + ({ \ + const uint8_t *Ptr = (const uint8_t *)(S); \ + Ptr[0] << 8 | Ptr[1]; \ + }) +#define READ32LE(S) \ + ({ \ + const uint8_t *Ptr = (const uint8_t *)(S); \ + ((uint32_t)Ptr[3] << 030 | (uint32_t)Ptr[2] << 020 | \ + (uint32_t)Ptr[1] << 010 | (uint32_t)Ptr[0] << 000); \ + }) +#define READ32BE(S) \ + ({ \ + const uint8_t *Ptr = (const uint8_t *)(S); \ + ((uint32_t)Ptr[0] << 030 | (uint32_t)Ptr[1] << 020 | \ + (uint32_t)Ptr[2] << 010 | (uint32_t)Ptr[3] << 000); \ + }) +#define READ64LE(S) \ + ({ \ + const uint8_t *Ptr = (const uint8_t *)(S); \ + ((uint64_t)Ptr[7] << 070 | (uint64_t)Ptr[6] << 060 | \ + (uint64_t)Ptr[5] << 050 | (uint64_t)Ptr[4] << 040 | \ + (uint64_t)Ptr[3] << 030 | (uint64_t)Ptr[2] << 020 | \ + (uint64_t)Ptr[1] << 010 | (uint64_t)Ptr[0] << 000); \ + }) +#define READ64BE(S) \ + ({ \ + const uint8_t *Ptr = (const uint8_t *)(S); \ + ((uint64_t)Ptr[0] << 070 | (uint64_t)Ptr[1] << 060 | \ + (uint64_t)Ptr[2] << 050 | (uint64_t)Ptr[3] << 040 | \ + (uint64_t)Ptr[4] << 030 | (uint64_t)Ptr[5] << 020 | \ + (uint64_t)Ptr[6] << 010 | (uint64_t)Ptr[7] << 000); \ + }) +#endif -#define READ16BE(S) \ - ((uint16_t)((unsigned char *)(S))[0] << 010 | \ - (uint16_t)((unsigned char *)(S))[1] << 000) -#define READ32BE(S) \ - ((uint32_t)((unsigned char *)(S))[0] << 030 | \ - (uint32_t)((unsigned char *)(S))[1] << 020 | \ - (uint32_t)((unsigned char *)(S))[2] << 010 | \ - (uint32_t)((unsigned char *)(S))[3] << 000) -#define READ64BE(S) \ - ((uint64_t)((unsigned char *)(S))[0] << 070 | \ - (uint64_t)((unsigned char *)(S))[1] << 060 | \ - (uint64_t)((unsigned char *)(S))[2] << 050 | \ - (uint64_t)((unsigned char *)(S))[3] << 040 | \ - (uint64_t)((unsigned char *)(S))[4] << 030 | \ - (uint64_t)((unsigned char *)(S))[5] << 020 | \ - (uint64_t)((unsigned char *)(S))[6] << 010 | \ - (uint64_t)((unsigned char *)(S))[7] << 000) - -#define WRITE16LE(P, V) \ - do { \ - uint8_t *Ple = (uint8_t *)(P); \ - uint16_t Vle = (V); \ - Ple[0] = (uint8_t)(Vle >> 000); \ - Ple[1] = (uint8_t)(Vle >> 010); \ - } while (0) -#define WRITE32LE(P, V) \ - do { \ - uint8_t *Ple = (uint8_t *)(P); \ - uint32_t Vle = (V); \ - Ple[0] = (uint8_t)(Vle >> 000); \ - Ple[1] = (uint8_t)(Vle >> 010); \ - Ple[2] = (uint8_t)(Vle >> 020); \ - Ple[3] = (uint8_t)(Vle >> 030); \ - } while (0) -#define WRITE64LE(P, V) \ - do { \ - uint8_t *Ple = (uint8_t *)(P); \ - uint64_t Vle = (V); \ - Ple[0] = (uint8_t)(Vle >> 000); \ - Ple[1] = (uint8_t)(Vle >> 010); \ - Ple[2] = (uint8_t)(Vle >> 020); \ - Ple[3] = (uint8_t)(Vle >> 030); \ - Ple[4] = (uint8_t)(Vle >> 040); \ - Ple[5] = (uint8_t)(Vle >> 050); \ - Ple[6] = (uint8_t)(Vle >> 060); \ - Ple[7] = (uint8_t)(Vle >> 070); \ - } while (0) - -#define WRITE16BE(P, V) \ - do { \ - uint8_t *Ple = (uint8_t *)(P); \ - uint16_t Vle = (V); \ - Ple[1] = (uint8_t)(Vle >> 000); \ - Ple[0] = (uint8_t)(Vle >> 010); \ - } while (0) -#define WRITE32BE(P, V) \ - do { \ - uint8_t *Ple = (uint8_t *)(P); \ - uint32_t Vle = (V); \ - Ple[3] = (uint8_t)(Vle >> 000); \ - Ple[2] = (uint8_t)(Vle >> 010); \ - Ple[1] = (uint8_t)(Vle >> 020); \ - Ple[0] = (uint8_t)(Vle >> 030); \ - } while (0) -#define WRITE64BE(P, V) \ - do { \ - uint8_t *Ple = (uint8_t *)(P); \ - uint64_t Vle = (V); \ - Ple[7] = (uint8_t)(Vle >> 000); \ - Ple[6] = (uint8_t)(Vle >> 010); \ - Ple[5] = (uint8_t)(Vle >> 020); \ - Ple[4] = (uint8_t)(Vle >> 030); \ - Ple[3] = (uint8_t)(Vle >> 040); \ - Ple[2] = (uint8_t)(Vle >> 050); \ - Ple[1] = (uint8_t)(Vle >> 060); \ - Ple[0] = (uint8_t)(Vle >> 070); \ - } while (0) +#define WRITE16LE(P, V) \ + ((P)[0] = (0x00000000000000FF & (V)) >> 000, \ + (P)[1] = (0x000000000000FF00 & (V)) >> 010, (P) + 2) +#define WRITE16BE(P, V) \ + ((P)[0] = (0x000000000000FF00 & (V)) >> 010, \ + (P)[1] = (0x00000000000000FF & (V)) >> 000, (P) + 2) +#define WRITE32LE(P, V) \ + ((P)[0] = (0x00000000000000FF & (V)) >> 000, \ + (P)[1] = (0x000000000000FF00 & (V)) >> 010, \ + (P)[2] = (0x0000000000FF0000 & (V)) >> 020, \ + (P)[3] = (0x00000000FF000000 & (V)) >> 030, (P) + 4) +#define WRITE32BE(P, V) \ + ((P)[0] = (0x00000000FF000000 & (V)) >> 030, \ + (P)[1] = (0x0000000000FF0000 & (V)) >> 020, \ + (P)[2] = (0x000000000000FF00 & (V)) >> 010, \ + (P)[3] = (0x00000000000000FF & (V)) >> 000, (P) + 4) +#define WRITE64LE(P, V) \ + ((P)[0] = (0x00000000000000FF & (V)) >> 000, \ + (P)[1] = (0x000000000000FF00 & (V)) >> 010, \ + (P)[2] = (0x0000000000FF0000 & (V)) >> 020, \ + (P)[3] = (0x00000000FF000000 & (V)) >> 030, \ + (P)[4] = (0x000000FF00000000 & (V)) >> 040, \ + (P)[5] = (0x0000FF0000000000 & (V)) >> 050, \ + (P)[6] = (0x00FF000000000000 & (V)) >> 060, \ + (P)[7] = (0xFF00000000000000 & (V)) >> 070, (P) + 8) +#define WRITE64BE(P, V) \ + ((P)[0] = (0xFF00000000000000 & (V)) >> 070, \ + (P)[1] = (0x00FF000000000000 & (V)) >> 060, \ + (P)[2] = (0x0000FF0000000000 & (V)) >> 050, \ + (P)[3] = (0x000000FF00000000 & (V)) >> 040, \ + (P)[4] = (0x00000000FF000000 & (V)) >> 030, \ + (P)[5] = (0x0000000000FF0000 & (V)) >> 020, \ + (P)[6] = (0x000000000000FF00 & (V)) >> 010, \ + (P)[7] = (0x00000000000000FF & (V)) >> 000, (P) + 8) /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § bits » some assembly required ─╬─│┼ diff --git a/libc/calls/calls.h b/libc/calls/calls.h index 19e188607..360a71049 100644 --- a/libc/calls/calls.h +++ b/libc/calls/calls.h @@ -5,6 +5,7 @@ #include "libc/calls/struct/rlimit.h" #include "libc/calls/struct/rusage.h" #include "libc/calls/struct/sigaction.h" +#include "libc/calls/struct/sigval.h" #include "libc/calls/struct/stat.h" #include "libc/calls/struct/sysinfo.h" #include "libc/calls/struct/timespec.h" @@ -29,7 +30,7 @@ #define SIG_DFL ((void *)0) #define SIG_IGN ((void *)1) -#define MAP_FAILED ((void *)__SIZE_MAX__) +#define MAP_FAILED ((void *)-1) #define ARCH_SET_GS 0x1001 #define ARCH_SET_FS 0x1002 @@ -120,6 +121,7 @@ int getrlimit(int, struct rlimit *); int getrusage(int, struct rusage *); int kill(int, int); int killpg(int, int); +int sigqueue(int, int, const union sigval); int link(const char *, const char *) nothrow; int linkat(int, const char *, int, const char *, uint32_t); int lstat(const char *, struct stat *); diff --git a/libc/calls/clock_gettime.c b/libc/calls/clock_gettime.c index 336fe2f13..e9e3e975c 100644 --- a/libc/calls/clock_gettime.c +++ b/libc/calls/clock_gettime.c @@ -30,14 +30,10 @@ * time. Among the more popular is CLOCK_MONOTONIC. This function has a * zero syscall implementation of that on modern x86. * - * @param clockid can be CLOCK_REALTIME, CLOCK_MONOTONIC, etc. noting - * that on Linux CLOCK_MONOTONIC is redefined to use the monotonic - * clock that's actually monotonic lool + * @param clockid can be CLOCK_REALTIME, CLOCK_MONOTONIC, etc. * @param ts is where the result is stored * @return 0 on success, or -1 w/ errno - * @error ENOSYS if clockid isn't available; in which case this function - * guarantees an ordinary timestamp is still stored to ts; and - * errno isn't restored to its original value, to detect prec. loss + * @error EINVAL if clockid isn't supported on this system * @see strftime(), gettimeofday() * @asyncsignalsafe */ @@ -46,6 +42,7 @@ int clock_gettime(int clockid, struct timespec *ts) { axdx_t ad; struct NtFileTime ft; if (!ts) return efault(); + if (clockid == -1) return einval(); if (!IsWindows()) { if ((rc = sys_clock_gettime(clockid, ts)) == -1 && errno == ENOSYS) { ad = sys_gettimeofday((struct timeval *)ts, NULL, NULL); diff --git a/libc/calls/fstat-nt.c b/libc/calls/fstat-nt.c index 0e474f6ec..eae334b08 100644 --- a/libc/calls/fstat-nt.c +++ b/libc/calls/fstat-nt.c @@ -39,22 +39,24 @@ textwindows int sys_fstat_nt(int64_t handle, struct stat *st) { memset(st, 0, sizeof(*st)); switch (filetype) { case kNtFileTypeChar: - st->st_mode = S_IFCHR | 0600; + st->st_mode = S_IFCHR | 0644; break; case kNtFileTypePipe: - st->st_mode = S_IFIFO | 0600; + st->st_mode = S_IFIFO | 0644; break; case kNtFileTypeDisk: if (GetFileInformationByHandle(handle, &wst)) { - st->st_mode = - (S_IRUSR | S_IXUSR | - (!(wst.dwFileAttributes & kNtFileAttributeReadonly) ? S_IWUSR - : 0) | - ((wst.dwFileAttributes & kNtFileAttributeNormal) ? S_IFREG : 0) | - ((wst.dwFileAttributes & kNtFileFlagOpenReparsePoint) ? S_IFLNK - : 0) | - ((wst.dwFileAttributes & kNtFileAttributeDirectory) ? S_IFDIR - : 0)); + st->st_mode = 0555; + if (!(wst.dwFileAttributes & kNtFileAttributeReadonly)) { + st->st_mode |= 0200; + } + if (wst.dwFileAttributes & kNtFileAttributeDirectory) { + st->st_mode |= S_IFDIR; + } else if (wst.dwFileAttributes & kNtFileFlagOpenReparsePoint) { + st->st_mode |= S_IFLNK; + } else { + st->st_mode |= S_IFREG; + } st->st_atim = FileTimeToTimeSpec(wst.ftLastAccessFileTime); st->st_mtim = FileTimeToTimeSpec(wst.ftLastWriteFileTime); st->st_ctim = FileTimeToTimeSpec(wst.ftCreationFileTime); diff --git a/net/http/parsehttpversion.c b/libc/calls/getrusage-sysv.c similarity index 81% rename from net/http/parsehttpversion.c rename to libc/calls/getrusage-sysv.c index d04333c2b..4e3261c5e 100644 --- a/net/http/parsehttpversion.c +++ b/libc/calls/getrusage-sysv.c @@ -16,18 +16,20 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/bits/bits.h" -#include "net/http/http.h" +#include "libc/calls/calls.h" +#include "libc/calls/internal.h" +#include "libc/sysv/errfuns.h" -unsigned ParseHttpVersion(const char *p, size_t n) { - unsigned x; - if (!n) return 9; - if (n >= 8 && READ32LE(p) == ('H' | 'T' << 8 | 'T' << 16 | 'P' << 24)) { - if (READ32LE(p + 4) == ('/' | '1' << 8 | '.' << 16 | '1' << 24)) { - return 101; - } else if (READ32LE(p + 4) == ('/' | '1' << 8 | '.' << 16 | '0' << 24)) { - return 100; - } +/** + * Returns resource usage statistics. + * + * @param who can be RUSAGE_{SELF,CHILDREN,THREAD} + * @return 0 on success, or -1 w/ errno + */ +int sys_getrusage(int who, struct rusage *usage) { + int rc; + if ((rc = __sys_getrusage(who, usage)) != -1) { + __rusage2linux(usage); } - return -1; + return rc; } diff --git a/libc/calls/internal.h b/libc/calls/internal.h index 32e057289..4c5571864 100644 --- a/libc/calls/internal.h +++ b/libc/calls/internal.h @@ -4,7 +4,10 @@ #include "libc/calls/internal.h" #include "libc/calls/struct/iovec.h" #include "libc/calls/struct/itimerval.h" +#include "libc/calls/struct/rusage.h" #include "libc/calls/struct/sigaction-xnu.internal.h" +#include "libc/calls/struct/siginfo.h" +#include "libc/calls/struct/sigval.h" #include "libc/calls/struct/timespec.h" #include "libc/calls/struct/timeval.h" #include "libc/dce.h" @@ -108,9 +111,11 @@ i32 __sys_dup3(i32, i32, i32) hidden; i32 __sys_execve(const char *, char *const[], char *const[]) hidden; i32 __sys_fstat(i32, struct stat *) hidden; i32 __sys_fstatat(i32, const char *, struct stat *, i32) hidden; +i32 __sys_getrusage(i32, struct rusage *) hidden; i32 __sys_openat(i32, const char *, i32, u32) hidden; i32 __sys_pipe2(i32[hasatleast 2], u32) hidden; i32 __sys_utimensat(i32, const char *, const struct timespec *, i32) hidden; +i32 __sys_wait4(i32, i32 *, i32, struct rusage *) hidden; i32 getdents(i32, char *, u32, i64 *) hidden; i32 sys_chdir(const char *) hidden; i32 sys_clock_gettime(i32, struct timespec *) hidden; @@ -170,6 +175,8 @@ i32 sys_setrlimit(i32, const struct rlimit *) hidden; i32 sys_setsid(void) hidden; i32 sys_sigaction(i32, const void *, void *, i64, i64) hidden; i32 sys_sigprocmask(i32, const sigset *, sigset *, u64) hidden; +i32 sys_sigqueue(i32, i32, const union sigval) hidden; +i32 sys_sigqueueinfo(i32, const siginfo_t *) hidden; i32 sys_sigsuspend(const sigset *, u64) hidden; i32 sys_symlinkat(const char *, i32, const char *) hidden; i32 sys_sync(void) hidden; @@ -220,6 +227,8 @@ int gethostname_linux(char *, size_t) hidden; int gethostname_bsd(char *, size_t) hidden; int gethostname_nt(char *, size_t) hidden; size_t __iovec_size(const struct iovec *, size_t) hidden; +void __rusage2linux(struct rusage *) hidden; +ssize_t WritevUninterruptible(int, struct iovec *, int); /*───────────────────────────────────────────────────────────────────────────│─╗ │ cosmopolitan § syscalls » windows nt » veneers ─╬─│┼ diff --git a/libc/calls/kill.c b/libc/calls/kill.c index f72bab6e4..26b9f0c84 100644 --- a/libc/calls/kill.c +++ b/libc/calls/kill.c @@ -33,7 +33,7 @@ * <-1 signals all processes in -pid process group * @param sig can be: * >0 can be SIGINT, SIGTERM, SIGKILL, SIGUSR1, etc. - * =0 is for error checking + * =0 checks both if pid exists and we can signal it * @return 0 if something was accomplished, or -1 w/ errno * @asyncsignalsafe */ diff --git a/libc/calls/mprotect.greg.c b/libc/calls/mprotect.greg.c index f2ff0b7fc..dedc7a909 100644 --- a/libc/calls/mprotect.greg.c +++ b/libc/calls/mprotect.greg.c @@ -39,12 +39,12 @@ privileged int mprotect(void *addr, uint64_t len, int prot) { int64_t rc; uint32_t oldprot; if (!IsWindows()) { - asm volatile(CFLAG_ASM("syscall") + asm volatile(CFLAG_ASM("clc\n\tsyscall") : CFLAG_CONSTRAINT(cf), "=a"(rc) : "1"(__NR_mprotect), "D"(addr), "S"(len), "d"(prot) : "rcx", "r11", "memory", "cc"); if (cf) { - rc = -rc; + errno = rc; rc = -1; } else if (rc > -4096ul) { errno = -rc; diff --git a/libc/calls/now.c b/libc/calls/now.c index d695255c8..3c00291fc 100644 --- a/libc/calls/now.c +++ b/libc/calls/now.c @@ -56,7 +56,7 @@ static long double MeasureNanosPerCycle(void) { return avg; } -static void InitTime(void) { +void RefreshTime(void) { struct Now now; now.cpn = MeasureNanosPerCycle(); now.r0 = dtime(CLOCK_REALTIME); @@ -66,21 +66,17 @@ static void InitTime(void) { } long double ConvertTicksToNanos(uint64_t ticks) { - if (!g_now.once) InitTime(); + if (!g_now.once) RefreshTime(); return ticks * g_now.cpn; /* pico scale */ } -static long double ConvertTicksToSeconds(uint64_t ticks) { - return 1 / 1e9 * ConvertTicksToNanos(ticks); -} - long double nowl_sys(void) { return dtime(CLOCK_REALTIME); } long double nowl_art(void) { uint64_t ticks; - if (!g_now.once) InitTime(); + if (!g_now.once) RefreshTime(); ticks = unsignedsubtract(rdtsc(), g_now.k0); - return g_now.r0 + ConvertTicksToSeconds(ticks); + return g_now.r0 + (1 / 1e9L * (ticks * g_now.cpn)); } diff --git a/libc/calls/open-nt.c b/libc/calls/open-nt.c index b29e70871..819256869 100644 --- a/libc/calls/open-nt.c +++ b/libc/calls/open-nt.c @@ -47,14 +47,11 @@ static textwindows int64_t sys_open_nt_impl(int dirfd, const char *path, ? kNtFileShareExclusive : kNtFileShareRead | kNtFileShareWrite | kNtFileShareDelete, &kNtIsInheritable, - (flags & O_CREAT) && (flags & O_EXCL) - ? kNtCreateNew - : (flags & O_CREAT) && (flags & O_TRUNC) - ? kNtCreateAlways - : (flags & O_CREAT) - ? kNtOpenAlways - : (flags & O_TRUNC) ? kNtTruncateExisting - : kNtOpenExisting, + (flags & O_CREAT) && (flags & O_EXCL) ? kNtCreateNew + : (flags & O_CREAT) && (flags & O_TRUNC) ? kNtCreateAlways + : (flags & O_CREAT) ? kNtOpenAlways + : (flags & O_TRUNC) ? kNtTruncateExisting + : kNtOpenExisting, /* TODO(jart): Should we just always set overlapped? */ (/* note: content indexer demolishes unix-ey i/o performance */ kNtFileAttributeNotContentIndexed | kNtFileAttributeNormal | diff --git a/test/tool/build/lib/wut_test.c b/libc/calls/rusage2linux.c similarity index 83% rename from test/tool/build/lib/wut_test.c rename to libc/calls/rusage2linux.c index 1359316a0..855fd8dbe 100644 --- a/test/tool/build/lib/wut_test.c +++ b/libc/calls/rusage2linux.c @@ -1,7 +1,7 @@ /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ │vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ ╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ │ │ │ Permission to use, copy, modify, and/or distribute this software for │ │ any purpose with or without fee is hereby granted, provided that the │ @@ -16,16 +16,10 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/mem/mem.h" -#include "libc/str/str.h" -#include "libc/testlib/testlib.h" +#include "libc/calls/internal.h" -TEST(memcpy, testBackwardsOverlap3) { - volatile char *c; - c = malloc(3); - memcpy(c, "\e[C", 3); - memcpy(c, c + 1, VEIL("r", 3) - 1); - EXPECT_EQ('[', c[0]); - EXPECT_EQ('C', c[1]); - free(c); +void __rusage2linux(struct rusage *ru) { + if (IsXnu()) { + ru->ru_maxrss /= 1024; + } } diff --git a/libc/calls/sigaction.c b/libc/calls/sigaction.c index ac36db971..eeb16c371 100644 --- a/libc/calls/sigaction.c +++ b/libc/calls/sigaction.c @@ -39,6 +39,8 @@ #include "libc/sysv/consts/sig.h" #include "libc/sysv/errfuns.h" +#define SA_RESTORER 0x04000000 + #ifndef SWITCHEROO #define SWITCHEROO(S1, S2, A, B, C, D) \ do { \ diff --git a/libc/calls/sigqueue.c b/libc/calls/sigqueue.c new file mode 100644 index 000000000..d0171e66c --- /dev/null +++ b/libc/calls/sigqueue.c @@ -0,0 +1,59 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/calls/calls.h" +#include "libc/calls/internal.h" +#include "libc/calls/struct/siginfo.h" +#include "libc/calls/struct/sigval.h" +#include "libc/str/str.h" +#include "libc/sysv/consts/sicode.h" + +/* TODO(jart): XNU */ + +/** + * Sends signal to process, with data. + * + * The impact of this action can be terminating the process, or + * interrupting it to request something happen. + * + * @param pid can be: + * >0 signals one process by id + * =0 signals all processes in current process group + * -1 signals all processes possible (except init) + * <-1 signals all processes in -pid process group + * @param sig can be: + * >0 can be SIGINT, SIGTERM, SIGKILL, SIGUSR1, etc. + * =0 checks both if pid exists and we can signal it + * @return 0 if something was accomplished, or -1 w/ errno + * @note this isn't supported on OpenBSD + * @asyncsignalsafe + */ +int sigqueue(int pid, int sig, const union sigval value) { + siginfo_t info; + if (IsFreebsd()) { + return sys_sigqueue(pid, sig, value); + } else { + memset(&info, 0, sizeof(info)); + info.si_signo = sig; + info.si_code = SI_QUEUE; + info.si_pid = getpid(); + info.si_uid = geteuid(); + info.si_value = value; + return sys_sigqueueinfo(pid, &info); + } +} diff --git a/libc/calls/struct/rlimit.h b/libc/calls/struct/rlimit.h index a52e5cdc0..edbe0dfb5 100644 --- a/libc/calls/struct/rlimit.h +++ b/libc/calls/struct/rlimit.h @@ -3,8 +3,8 @@ #if !(__ASSEMBLER__ + __LINKER__ + 0) struct rlimit { - int64_t rlim_cur; - int64_t rlim_max; + uint64_t rlim_cur; /* current (soft) limit in bytes */ + uint64_t rlim_max; /* maximum limit in bytes */ }; #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ diff --git a/libc/calls/struct/rusage.h b/libc/calls/struct/rusage.h index 32d3207ce..ed08ebc71 100644 --- a/libc/calls/struct/rusage.h +++ b/libc/calls/struct/rusage.h @@ -8,12 +8,12 @@ struct rusage { struct { struct timeval ru_utime; /* user CPU time used */ struct timeval ru_stime; /* system CPU time used */ - int64_t ru_maxrss; /* maximum resident set size */ - int64_t ru_ixrss; /* integral shared memory size */ - int64_t ru_idrss; /* integral unshared data size */ - int64_t ru_isrss; /* integral unshared stack size */ - int64_t ru_minflt; /* page reclaims (soft page faults) */ - int64_t ru_majflt; /* page faults (hard page faults) */ + int64_t ru_maxrss; /* maximum resident set size in (kb) */ + int64_t ru_ixrss; /* shared memory size (integral kb CLK_TCK) */ + int64_t ru_idrss; /* unshared data size (integral kb CLK_TCK) */ + int64_t ru_isrss; /* unshared stack size (integral kb CLK_TCK) */ + int64_t ru_minflt; /* page reclaims */ + int64_t ru_majflt; /* page faults */ int64_t ru_nswap; /* swaps */ int64_t ru_inblock; /* block input operations */ int64_t ru_oublock; /* block output operations */ diff --git a/libc/calls/struct/siginfo.h b/libc/calls/struct/siginfo.h index 72ca1d1d4..105ad24c5 100644 --- a/libc/calls/struct/siginfo.h +++ b/libc/calls/struct/siginfo.h @@ -6,7 +6,7 @@ struct siginfo { int32_t si_signo; int32_t si_errno; - int32_t si_code; + int32_t si_code; /* {SICODE,SEGV,ILL,FPE,POLL}_xxx */ union { struct { union { @@ -20,7 +20,7 @@ struct siginfo { }; }; union { - union sigval si_value; + union sigval si_value; /* provided by third arg of sigqueue(2) */ struct { int32_t si_status; int64_t si_utime, si_stime; diff --git a/libc/calls/vdprintf.c b/libc/calls/vdprintf.c index 882dd4ff4..cf4e92fdd 100644 --- a/libc/calls/vdprintf.c +++ b/libc/calls/vdprintf.c @@ -22,43 +22,55 @@ #include "libc/limits.h" #include "libc/macros.internal.h" #include "libc/nt/files.h" +#include "libc/sock/sock.h" +#include "libc/str/str.h" #include "libc/sysv/errfuns.h" struct VdprintfState { - int n; - int fd; - unsigned char buf[1024]; + int n, t, fd; + char b[1024]; }; -static int vdprintf_flush(struct VdprintfState *df, int n) { - int i, rc; - for (i = 0; i < n; i += rc) { - if ((rc = write(df->fd, df->buf + i, n - i)) == -1) { - return -1; +static int vdprintf_putc(const char *s, struct VdprintfState *t, size_t n) { + struct iovec iov[2]; + if (n) { + if (t->n + n < sizeof(t->b)) { + memcpy(t->b + t->n, s, n); + t->n += n; + } else { + iov[0].iov_base = t->b; + iov[0].iov_len = t->n; + iov[1].iov_base = s; + iov[1].iov_len = n; + if (WritevUninterruptible(t->fd, iov, 2) == -1) { + return -1; + } + t->t += t->n; + t->n = 0; } } return 0; } -static int vdprintf_putc(int c, struct VdprintfState *df) { - df->buf[df->n++ & (ARRAYLEN(df->buf) - 1)] = c & 0xff; - if ((df->n & (ARRAYLEN(df->buf) - 1))) { - return 0; - } else { - return vdprintf_flush(df, ARRAYLEN(df->buf)); - } -} - /** * Formats string directly to system i/o device. * @asyncsignalsafe * @vforksafe */ int(vdprintf)(int fd, const char *fmt, va_list va) { - struct VdprintfState df; - df.n = 0; - df.fd = fd; - if (__fmt(vdprintf_putc, &df, fmt, va) == -1) return -1; - if (vdprintf_flush(&df, df.n & (ARRAYLEN(df.buf) - 1)) == -1) return -1; - return df.n; + struct iovec iov[1]; + struct VdprintfState t; + t.n = 0; + t.t = 0; + t.fd = fd; + if (__fmt(vdprintf_putc, &t, fmt, va) == -1) return -1; + if (t.n) { + iov[0].iov_base = t.b; + iov[0].iov_len = t.n; + if (WritevUninterruptible(t.fd, iov, 1) == -1) { + return -1; + } + t.t += t.n; + } + return t.t; } diff --git a/libc/calls/wait4-sysv.c b/libc/calls/wait4-sysv.c new file mode 100644 index 000000000..7e1ebccf8 --- /dev/null +++ b/libc/calls/wait4-sysv.c @@ -0,0 +1,31 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/calls/calls.h" +#include "libc/calls/internal.h" + +int sys_wait4(int pid, int *opt_out_wstatus, int options, + struct rusage *opt_out_rusage) { + int rc; + if ((rc = __sys_wait4(pid, opt_out_wstatus, options, opt_out_rusage)) != -1) { + if (opt_out_rusage) { + __rusage2linux(opt_out_rusage); + } + } + return rc; +} diff --git a/libc/calls/weirdtypes.h b/libc/calls/weirdtypes.h index f23cad207..bd7c7fe70 100644 --- a/libc/calls/weirdtypes.h +++ b/libc/calls/weirdtypes.h @@ -37,6 +37,7 @@ #define time_t int64_t #define timer_t void* #define uid_t uint32_t +#define rlim_t uint64_t /* int64_t on bsd */ #define int_fast8_t __INT_FAST8_TYPE__ #define uint_fast8_t __UINT_FAST8_TYPE__ diff --git a/libc/calls/writevuninterruptible.c b/libc/calls/writevuninterruptible.c new file mode 100644 index 000000000..c1b86340d --- /dev/null +++ b/libc/calls/writevuninterruptible.c @@ -0,0 +1,45 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/calls/internal.h" +#include "libc/errno.h" +#include "libc/sock/sock.h" + +ssize_t WritevUninterruptible(int fd, struct iovec *iov, int iovlen) { + ssize_t rc; + size_t wrote; + do { + if ((rc = writev(fd, iov, iovlen)) != -1) { + wrote = rc; + do { + if (wrote >= iov->iov_len) { + wrote -= iov->iov_len; + ++iov; + --iovlen; + } else { + iov->iov_base = (char *)iov->iov_base + wrote; + iov->iov_len -= wrote; + wrote = 0; + } + } while (wrote); + } else if (errno != EINTR) { + return -1; + } + } while (iovlen); + return 0; +} diff --git a/libc/dce.h b/libc/dce.h index e100c4da0..73cde783f 100644 --- a/libc/dce.h +++ b/libc/dce.h @@ -45,12 +45,6 @@ #define IsTrustworthy() 0 #endif -#ifdef SECURITY_BLANKETS -#define UseSecurityBlankets() 1 -#else -#define UseSecurityBlankets() 0 -#endif - #ifdef TINY #define IsTiny() 1 #else diff --git a/libc/fmt/fmt.c b/libc/fmt/fmt.c index 3bacd1d48..fda6ed39d 100644 --- a/libc/fmt/fmt.c +++ b/libc/fmt/fmt.c @@ -23,6 +23,7 @@ #include "libc/fmt/fmt.h" #include "libc/fmt/fmts.h" #include "libc/fmt/internal.h" +#include "libc/fmt/itoa.h" #include "libc/macros.internal.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/bsr.h" @@ -31,11 +32,12 @@ #include "libc/sysv/errfuns.h" #include "third_party/gdtoa/gdtoa.h" -#define PUT(C) \ - do { \ - if (out(C, arg) == -1) { \ - return -1; \ - } \ +#define PUT(C) \ + do { \ + char Buf[1] = {C}; \ + if (out(Buf, arg, 1) == -1) { \ + return -1; \ + } \ } while (0) static const char kSpecialFloats[2][2][4] = {{"INF", "inf"}, {"NAN", "nan"}}; @@ -121,14 +123,18 @@ hidden int __fmt(void *fn, void *arg, const char *format, va_list va) { uint32_t u[2]; uint64_t q; } pun; + long ld; void *p; + unsigned u; + char ibuf[21]; bool longdouble; long double ldbl; + unsigned long lu; wchar_t charbuf[1]; const char *alphabet; - int (*out)(long, void *); + int (*out)(const char *, void *, size_t); unsigned char signbit, log2base; - int c, d, k, w, i1, ui, bw, bex; + int c, d, k, w, n, i1, ui, bw, bex; char *s, *q, *se, qchar, special[8]; int sgn, alt, sign, prec, prec1, flags, width, decpt, lasterr; @@ -136,18 +142,64 @@ hidden int __fmt(void *fn, void *arg, const char *format, va_list va) { out = fn ? fn : (void *)missingno; while (*format) { - /* %[flags][width][.prec][length] */ if (*format != '%') { - /* no */ - PUT(*format); - format++; + for (n = 1; format[n]; ++n) { + if (format[n] == '%') break; + } + if (out(format, arg, n) == -1) return -1; + format += n; continue; - } else { - /* yes, evaluate it */ - format++; } - /* evaluate flags */ + if (!IsTiny()) { + if (format[1] == 's') { /* FAST PATH: PLAIN STRING */ + s = va_arg(va, char *); + if (!s) s = "(null)"; + if (out(s, arg, strlen(s)) == -1) return -1; + format += 2; + continue; + } else if (format[1] == 'd') { /* FAST PATH: PLAIN INTEGER */ + d = va_arg(va, int); + if (out(ibuf, arg, int64toarray_radix10(d, ibuf)) == -1) return -1; + format += 2; + continue; + } else if (format[1] == 'u') { /* FAST PATH: PLAIN UNSIGNED */ + u = va_arg(va, unsigned); + if (out(ibuf, arg, uint64toarray_radix10(u, ibuf)) == -1) return -1; + format += 2; + continue; + } else if (format[1] == 'x') { /* FAST PATH: PLAIN HEX */ + u = va_arg(va, unsigned); + if (out(ibuf, arg, uint64toarray_radix16(u, ibuf)) == -1) return -1; + format += 2; + continue; + } else if (format[1] == 'l' && format[2] == 'x') { + lu = va_arg(va, unsigned long); /* FAST PATH: PLAIN LONG HEX */ + if (out(ibuf, arg, uint64toarray_radix16(lu, ibuf)) == -1) return -1; + format += 3; + continue; + } else if (format[1] == 'l' && format[2] == 'd') { + ld = va_arg(va, long); /* FAST PATH: PLAIN LONG */ + if (out(ibuf, arg, int64toarray_radix10(ld, ibuf)) == -1) return -1; + format += 3; + continue; + } else if (format[1] == 'l' && format[2] == 'u') { + lu = va_arg(va, unsigned long); /* FAST PATH: PLAIN UNSIGNED LONG */ + if (out(ibuf, arg, int64toarray_radix10(lu, ibuf)) == -1) return -1; + format += 3; + continue; + } else if (format[1] == '.' && format[2] == '*' && format[3] == 's') { + n = va_arg(va, unsigned); /* FAST PATH: PRECISION STRING */ + s = va_arg(va, const char *); + if (!s) s = "(null)", n = MIN(6, n); + if (out(s, arg, n) == -1) return -1; + format += 4; + continue; + } + } + + /* GENERAL PATH */ + format++; sign = 0; flags = 0; getflag: diff --git a/libc/fmt/fmts.h b/libc/fmt/fmts.h index 4336f7bc8..c56f88650 100644 --- a/libc/fmt/fmts.h +++ b/libc/fmt/fmts.h @@ -6,13 +6,14 @@ #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -int __fmt_pad(int (*)(long, void *), void *, unsigned long) hidden; -int __fmt_stoa(int (*)(long, void *), void *, void *, unsigned long, - unsigned long, unsigned long, unsigned char, - unsigned char) hidden; -int __fmt_ntoa(int (*)(long, void *), void *, va_list, unsigned char, +int __fmt_pad(int (*)(const char *, void *, size_t), void *, + unsigned long) hidden; +int __fmt_stoa(int (*)(const char *, void *, size_t), void *, void *, unsigned long, unsigned long, unsigned long, unsigned char, - const char *) hidden; + unsigned char) hidden; +int __fmt_ntoa(int (*)(const char *, void *, size_t), void *, va_list, + unsigned char, unsigned long, unsigned long, unsigned long, + unsigned char, const char *) hidden; char *__fmt_dtoa(double, int, int, int *, int *, char **) hidden; COSMOPOLITAN_C_END_ diff --git a/libc/fmt/ntoa.c b/libc/fmt/ntoa.c index 25757d6c6..508113de7 100644 --- a/libc/fmt/ntoa.c +++ b/libc/fmt/ntoa.c @@ -16,6 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/alg/reverse.internal.h" #include "libc/assert.h" #include "libc/fmt/conv.h" #include "libc/fmt/fmts.h" @@ -25,12 +26,11 @@ uintmax_t __udivmodti4(uintmax_t, uintmax_t, uintmax_t *); -static int __fmt_ntoa_format(int out(long, void *), void *arg, char *buf, - unsigned len, bool negative, unsigned log2base, - unsigned prec, unsigned width, +static int __fmt_ntoa_format(int out(const char *, void *, size_t), void *arg, + char *buf, unsigned len, bool negative, + unsigned log2base, unsigned prec, unsigned width, unsigned char flags) { - unsigned i, idx; - idx = 0; + unsigned i; /* pad leading zeros */ if (!(flags & FLAGS_LEFT)) { @@ -82,24 +82,21 @@ static int __fmt_ntoa_format(int out(long, void *), void *arg, char *buf, } } - /* reverse string */ - for (i = 0U; i < len; i++) { - if (out(buf[len - i - 1], arg) == -1) return -1; - idx++; - } + reverse(buf, len); + if (out(buf, arg, len) == -1) return -1; /* append pad spaces up to given width */ if (flags & FLAGS_LEFT) { - if (idx < width) { - if (__fmt_pad(out, arg, width - idx) == -1) return -1; + if (len < width) { + if (__fmt_pad(out, arg, width - len) == -1) return -1; } } return 0; } -int __fmt_ntoa2(int out(long, void *), void *arg, uintmax_t value, bool neg, - unsigned log2base, unsigned prec, unsigned width, - unsigned flags, const char *alphabet) { +int __fmt_ntoa2(int out(const char *, void *, size_t), void *arg, + uintmax_t value, bool neg, unsigned log2base, unsigned prec, + unsigned width, unsigned flags, const char *alphabet) { uintmax_t remainder; unsigned len, count, digit; char buf[BUFFER_SIZE]; @@ -130,7 +127,7 @@ int __fmt_ntoa2(int out(long, void *), void *arg, uintmax_t value, bool neg, flags); } -int __fmt_ntoa(int out(long, void *), void *arg, va_list va, +int __fmt_ntoa(int out(const char *, void *, size_t), void *arg, va_list va, unsigned char signbit, unsigned long log2base, unsigned long prec, unsigned long width, unsigned char flags, const char *lang) { diff --git a/libc/fmt/pad.c b/libc/fmt/pad.c index e6d50dcd3..c489c745f 100644 --- a/libc/fmt/pad.c +++ b/libc/fmt/pad.c @@ -18,8 +18,9 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/fmt/fmts.h" -int __fmt_pad(int out(long, void *), void *arg, unsigned long n) { +int __fmt_pad(int out(const char *, void *, size_t), void *arg, + unsigned long n) { int i, rc; - for (rc = i = 0; i < n; ++i) rc |= out(' ', arg); + for (rc = i = 0; i < n; ++i) rc |= out(" ", arg, 1); return rc; } diff --git a/libc/fmt/stoa.c b/libc/fmt/stoa.c index 04ae8de42..6040c1e08 100644 --- a/libc/fmt/stoa.c +++ b/libc/fmt/stoa.c @@ -16,9 +16,12 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/bits/bits.h" +#include "libc/bits/safemacros.internal.h" #include "libc/bits/weaken.h" #include "libc/fmt/fmts.h" #include "libc/fmt/internal.h" +#include "libc/nexgen32e/bsr.h" #include "libc/nexgen32e/tinystrlen.internal.h" #include "libc/str/str.h" #include "libc/str/thompike.h" @@ -26,56 +29,48 @@ #include "libc/str/utf16.h" #include "libc/unicode/unicode.h" -typedef int (*emit_f)(int (*)(long, void *), void *, wint_t); +typedef int (*out_f)(const char *, void *, size_t); +typedef int (*emit_f)(out_f, void *, uint64_t); -static noinstrument int __fmt_stoa_byte(int f(long, void *), void *a, - wint_t c) { - return f(c, a); +static int __fmt_stoa_byte(out_f out, void *a, uint64_t c) { + char buf[1] = {c}; + return out(buf, a, 1); } -static noinstrument int __fmt_stoa_word(int f(long, void *), void *a, - uint64_t w) { - do { - if (f(w & 0xff, a) == -1) { - return -1; - } - } while ((w >>= 8)); - return 0; +static int __fmt_stoa_wide(out_f out, void *a, uint64_t w) { + char buf[8]; + if (!isascii(w)) w = tpenc(w); + WRITE64LE(buf, w); + return out(buf, a, w ? (bsr(w) >> 3) + 1 : 1); } -static noinstrument int __fmt_stoa_wide(int f(long, void *), void *a, - wint_t c) { - if (isascii(c)) { - return f(c, a); +static int __fmt_stoa_bing(out_f out, void *a, uint64_t w) { + char buf[8]; + w = tpenc((*weaken(kCp437))[w & 0xFF]); + WRITE64LE(buf, w); + return out(buf, a, w ? (bsr(w) >> 3) + 1 : 1); +} + +static int __fmt_stoa_quoted(out_f out, void *a, uint64_t w) { + char buf[8]; + if (isascii(w)) { + w = cescapec(w); } else { - return __fmt_stoa_word(f, a, tpenc(c)); + w = tpenc(w); } + WRITE64LE(buf, w); + return out(buf, a, w ? (bsr(w) >> 3) + 1 : 1); } -static noinstrument int __fmt_stoa_bing(int f(long, void *), void *a, - wint_t c) { - return __fmt_stoa_wide(f, a, (*weaken(kCp437))[c]); -} - -static noinstrument int __fmt_stoa_quoted(int f(long, void *), void *a, - wint_t c) { - if (isascii(c)) { - return __fmt_stoa_word(f, a, cescapec(c)); - } else { - return __fmt_stoa_word(f, a, tpenc(c)); - } -} - -static noinstrument int __fmt_stoa_quote(int out(long, void *), void *arg, - unsigned flags, char ch, - unsigned char signbit) { +static int __fmt_stoa_quote(out_f out, void *arg, unsigned flags, char ch, + unsigned char signbit) { if (flags & FLAGS_REPR) { if (signbit == 63) { - if (out('L', arg) == -1) return -1; + if (out("L", arg, 1) == -1) return -1; } else if (signbit == 15) { - if (out('u', arg) == -1) return -1; + if (out("u", arg, 1) == -1) return -1; } - if (out(ch, arg) == -1) return -1; + if (out(&ch, arg, 1) == -1) return -1; } return 0; } @@ -89,23 +84,25 @@ static noinstrument int __fmt_stoa_quote(int out(long, void *), void *arg, * * @see __fmt() */ -int __fmt_stoa(int out(long, void *), void *arg, void *data, +int __fmt_stoa(int out(const char *, void *, size_t), void *arg, void *data, unsigned long flags, unsigned long precision, unsigned long width, unsigned char signbit, unsigned char qchar) { - char *p; wint_t wc; unsigned n; emit_f emit; + char *p, buf[1]; unsigned w, c, pad; bool justdobytes, ignorenul; p = data; if (!p) { p = ((flags & FLAGS_REPR) ? "NULL" : "(null)"); - flags &= ~FLAGS_PRECISION; - flags |= FLAGS_NOQUOTE; signbit = 0; + flags |= FLAGS_NOQUOTE; + if (flags & FLAGS_PRECISION) { + precision = min(strlen(p), precision); + } } else { if (__fmt_stoa_quote(out, arg, flags, qchar, signbit) == -1) return -1; } @@ -215,7 +212,8 @@ int __fmt_stoa(int out(long, void *), void *arg, void *data, } if (!(flags & FLAGS_NOQUOTE) && (flags & FLAGS_REPR)) { - if (out(qchar, arg) == -1) return -1; + buf[0] = qchar; + if (out(buf, arg, 1) == -1) return -1; } return 0; diff --git a/libc/fmt/strerror_r.c b/libc/fmt/strerror_r.c index 4efb8b872..0e54cddcb 100644 --- a/libc/fmt/strerror_r.c +++ b/libc/fmt/strerror_r.c @@ -20,291 +20,160 @@ #include "libc/dce.h" #include "libc/errno.h" #include "libc/fmt/fmt.h" +#include "libc/fmt/itoa.h" #include "libc/macros.internal.h" #include "libc/nt/enum/formatmessageflags.h" #include "libc/nt/process.h" #include "libc/nt/runtime.h" #include "libc/str/str.h" -STATIC_YOINK("E2BIG"); -STATIC_YOINK("EACCES"); -STATIC_YOINK("EADDRINUSE"); -STATIC_YOINK("EADDRNOTAVAIL"); -STATIC_YOINK("EADV"); -STATIC_YOINK("EAFNOSUPPORT"); -STATIC_YOINK("EAGAIN"); -STATIC_YOINK("EALREADY"); -STATIC_YOINK("EBADE"); -STATIC_YOINK("EBADF"); -STATIC_YOINK("EBADFD"); -STATIC_YOINK("EBADMSG"); -STATIC_YOINK("EBADR"); -STATIC_YOINK("EBADRQC"); -STATIC_YOINK("EBADSLT"); -STATIC_YOINK("EBFONT"); -STATIC_YOINK("EBUSY"); -STATIC_YOINK("ECANCELED"); -STATIC_YOINK("ECHILD"); -STATIC_YOINK("ECHRNG"); -STATIC_YOINK("ECOMM"); -STATIC_YOINK("ECONNABORTED"); -STATIC_YOINK("ECONNREFUSED"); -STATIC_YOINK("ECONNRESET"); -STATIC_YOINK("EDEADLK"); -STATIC_YOINK("EDESTADDRREQ"); -STATIC_YOINK("EDOM"); -STATIC_YOINK("EDOTDOT"); -STATIC_YOINK("EDQUOT"); -STATIC_YOINK("EEXIST"); -STATIC_YOINK("EFAULT"); -STATIC_YOINK("EFBIG"); -STATIC_YOINK("EHOSTDOWN"); -STATIC_YOINK("EHOSTUNREACH"); -STATIC_YOINK("EHWPOISON"); -STATIC_YOINK("EIDRM"); -STATIC_YOINK("EILSEQ"); -STATIC_YOINK("EINPROGRESS"); -STATIC_YOINK("EINTR"); -STATIC_YOINK("EINVAL"); -STATIC_YOINK("EIO"); -STATIC_YOINK("EISCONN"); -STATIC_YOINK("EISDIR"); -STATIC_YOINK("EISNAM"); -STATIC_YOINK("EKEYEXPIRED"); -STATIC_YOINK("EKEYREJECTED"); -STATIC_YOINK("EKEYREVOKED"); -STATIC_YOINK("EL2HLT"); -STATIC_YOINK("EL2NSYNC"); -STATIC_YOINK("EL3HLT"); -STATIC_YOINK("EL3RST"); -STATIC_YOINK("ELIBACC"); -STATIC_YOINK("ELIBBAD"); -STATIC_YOINK("ELIBEXEC"); -STATIC_YOINK("ELIBMAX"); -STATIC_YOINK("ELIBSCN"); -STATIC_YOINK("ELNRNG"); -STATIC_YOINK("ELOOP"); -STATIC_YOINK("EMEDIUMTYPE"); -STATIC_YOINK("EMFILE"); -STATIC_YOINK("EMLINK"); -STATIC_YOINK("EMSGSIZE"); -STATIC_YOINK("EMULTIHOP"); -STATIC_YOINK("ENAMETOOLONG"); -STATIC_YOINK("ENAVAIL"); -STATIC_YOINK("ENETDOWN"); -STATIC_YOINK("ENETRESET"); -STATIC_YOINK("ENETUNREACH"); -STATIC_YOINK("ENFILE"); -STATIC_YOINK("ENOANO"); -STATIC_YOINK("ENOBUFS"); -STATIC_YOINK("ENOCSI"); -STATIC_YOINK("ENODATA"); -STATIC_YOINK("ENODEV"); -STATIC_YOINK("ENOENT"); -STATIC_YOINK("ENOEXEC"); -STATIC_YOINK("ENOKEY"); -STATIC_YOINK("ENOLCK"); -STATIC_YOINK("ENOLINK"); -STATIC_YOINK("ENOMEDIUM"); -STATIC_YOINK("ENOMEM"); -STATIC_YOINK("ENOMSG"); -STATIC_YOINK("ENONET"); -STATIC_YOINK("ENOPKG"); -STATIC_YOINK("ENOPROTOOPT"); -STATIC_YOINK("ENOSPC"); -STATIC_YOINK("ENOSR"); -STATIC_YOINK("ENOSTR"); -STATIC_YOINK("ENOSYS"); -STATIC_YOINK("ENOTBLK"); -STATIC_YOINK("ENOTCONN"); -STATIC_YOINK("ENOTDIR"); -STATIC_YOINK("ENOTEMPTY"); -STATIC_YOINK("ENOTNAM"); -STATIC_YOINK("ENOTRECOVERABLE"); -STATIC_YOINK("ENOTSOCK"); -STATIC_YOINK("ENOTSUP"); -STATIC_YOINK("ENOTTY"); -STATIC_YOINK("ENOTUNIQ"); -STATIC_YOINK("ENXIO"); -STATIC_YOINK("EOPNOTSUPP"); -STATIC_YOINK("EOVERFLOW"); -STATIC_YOINK("EOWNERDEAD"); -STATIC_YOINK("EPERM"); -STATIC_YOINK("EPFNOSUPPORT"); -STATIC_YOINK("EPIPE"); -STATIC_YOINK("EPROTO"); -STATIC_YOINK("EPROTONOSUPPORT"); -STATIC_YOINK("EPROTOTYPE"); -STATIC_YOINK("ERANGE"); -STATIC_YOINK("EREMCHG"); -STATIC_YOINK("EREMOTE"); -STATIC_YOINK("EREMOTEIO"); -STATIC_YOINK("ERESTART"); -STATIC_YOINK("ERFKILL"); -STATIC_YOINK("EROFS"); -STATIC_YOINK("ESHUTDOWN"); -STATIC_YOINK("ESOCKTNOSUPPORT"); -STATIC_YOINK("ESPIPE"); -STATIC_YOINK("ESRCH"); -STATIC_YOINK("ESRMNT"); -STATIC_YOINK("ESTALE"); -STATIC_YOINK("ESTRPIPE"); -STATIC_YOINK("ETIME"); -STATIC_YOINK("ETIMEDOUT"); -STATIC_YOINK("ETOOMANYREFS"); -STATIC_YOINK("ETXTBSY"); -STATIC_YOINK("EUCLEAN"); -STATIC_YOINK("EUNATCH"); -STATIC_YOINK("EUSERS"); -STATIC_YOINK("EXDEV"); -STATIC_YOINK("EXFULL"); +const struct Error { + const long *x; + const char *s; +} kErrors[] = { + {&ENOSYS, "ENOSYS"}, + {&EPERM, "EPERM"}, + {&ENOENT, "ENOENT"}, + {&ESRCH, "ESRCH"}, + {&EINTR, "EINTR"}, + {&EIO, "EIO"}, + {&ENXIO, "ENXIO"}, + {&E2BIG, "E2BIG"}, + {&ENOEXEC, "ENOEXEC"}, + {&EBADF, "EBADF"}, + {&ECHILD, "ECHILD"}, + {&EAGAIN, "EAGAIN"}, + {&ENOMEM, "ENOMEM"}, + {&EACCES, "EACCES"}, + {&EFAULT, "EFAULT"}, + {&ENOTBLK, "ENOTBLK"}, + {&EBUSY, "EBUSY"}, + {&EEXIST, "EEXIST"}, + {&EXDEV, "EXDEV"}, + {&ENODEV, "ENODEV"}, + {&ENOTDIR, "ENOTDIR"}, + {&EISDIR, "EISDIR"}, + {&EINVAL, "EINVAL"}, + {&ENFILE, "ENFILE"}, + {&EMFILE, "EMFILE"}, + {&ENOTTY, "ENOTTY"}, + {&ETXTBSY, "ETXTBSY"}, + {&EFBIG, "EFBIG"}, + {&ENOSPC, "ENOSPC"}, + {&EDQUOT, "EDQUOT"}, + {&ESPIPE, "ESPIPE"}, + {&EROFS, "EROFS"}, + {&EMLINK, "EMLINK"}, + {&EPIPE, "EPIPE"}, + {&EDOM, "EDOM"}, + {&ERANGE, "ERANGE"}, + {&EDEADLK, "EDEADLK"}, + {&ENAMETOOLONG, "ENAMETOOLONG"}, + {&ENOLCK, "ENOLCK"}, + {&ENOTEMPTY, "ENOTEMPTY"}, + {&ELOOP, "ELOOP"}, + {&ENOMSG, "ENOMSG"}, + {&EIDRM, "EIDRM"}, + {&ETIME, "ETIME"}, + {&EPROTO, "EPROTO"}, + {&EOVERFLOW, "EOVERFLOW"}, + {&EILSEQ, "EILSEQ"}, + {&EUSERS, "EUSERS"}, + {&ENOTSOCK, "ENOTSOCK"}, + {&EDESTADDRREQ, "EDESTADDRREQ"}, + {&EMSGSIZE, "EMSGSIZE"}, + {&EPROTOTYPE, "EPROTOTYPE"}, + {&ENOPROTOOPT, "ENOPROTOOPT"}, + {&EPROTONOSUPPORT, "EPROTONOSUPPORT"}, + {&ESOCKTNOSUPPORT, "ESOCKTNOSUPPORT"}, + {&ENOTSUP, "ENOTSUP"}, + {&EOPNOTSUPP, "EOPNOTSUPP"}, + {&EPFNOSUPPORT, "EPFNOSUPPORT"}, + {&EAFNOSUPPORT, "EAFNOSUPPORT"}, + {&EADDRINUSE, "EADDRINUSE"}, + {&EADDRNOTAVAIL, "EADDRNOTAVAIL"}, + {&ENETDOWN, "ENETDOWN"}, + {&ENETUNREACH, "ENETUNREACH"}, + {&ENETRESET, "ENETRESET"}, + {&ECONNABORTED, "ECONNABORTED"}, + {&ECONNRESET, "ECONNRESET"}, + {&ENOBUFS, "ENOBUFS"}, + {&EISCONN, "EISCONN"}, + {&ENOTCONN, "ENOTCONN"}, + {&ESHUTDOWN, "ESHUTDOWN"}, + {&ETOOMANYREFS, "ETOOMANYREFS"}, + {&ETIMEDOUT, "ETIMEDOUT"}, + {&ECONNREFUSED, "ECONNREFUSED"}, + {&EHOSTDOWN, "EHOSTDOWN"}, + {&EHOSTUNREACH, "EHOSTUNREACH"}, + {&EALREADY, "EALREADY"}, + {&EINPROGRESS, "EINPROGRESS"}, + {&ESTALE, "ESTALE"}, + {&EREMOTE, "EREMOTE"}, + {&EBADMSG, "EBADMSG"}, + {&ECANCELED, "ECANCELED"}, + {&EOWNERDEAD, "EOWNERDEAD"}, + {&ENOTRECOVERABLE, "ENOTRECOVERABLE"}, + {&ENONET, "ENONET"}, + {&ERESTART, "ERESTART"}, + {&ECHRNG, "ECHRNG"}, + {&EL2NSYNC, "EL2NSYNC"}, + {&EL3HLT, "EL3HLT"}, + {&EL3RST, "EL3RST"}, + {&ELNRNG, "ELNRNG"}, + {&EUNATCH, "EUNATCH"}, + {&ENOCSI, "ENOCSI"}, + {&EL2HLT, "EL2HLT"}, + {&EBADE, "EBADE"}, + {&EBADR, "EBADR"}, + {&EXFULL, "EXFULL"}, + {&ENOANO, "ENOANO"}, + {&EBADRQC, "EBADRQC"}, + {&EBADSLT, "EBADSLT"}, + {&ENOSTR, "ENOSTR"}, + {&ENODATA, "ENODATA"}, + {&ENOSR, "ENOSR"}, + {&ENOPKG, "ENOPKG"}, + {&ENOLINK, "ENOLINK"}, + {&EADV, "EADV"}, + {&ESRMNT, "ESRMNT"}, + {&ECOMM, "ECOMM"}, + {&EMULTIHOP, "EMULTIHOP"}, + {&EDOTDOT, "EDOTDOT"}, + {&ENOTUNIQ, "ENOTUNIQ"}, + {&EBADFD, "EBADFD"}, + {&EREMCHG, "EREMCHG"}, + {&ELIBACC, "ELIBACC"}, + {&ELIBBAD, "ELIBBAD"}, + {&ELIBSCN, "ELIBSCN"}, + {&ELIBMAX, "ELIBMAX"}, + {&ELIBEXEC, "ELIBEXEC"}, + {&ESTRPIPE, "ESTRPIPE"}, + {&EUCLEAN, "EUCLEAN"}, + {&ENOTNAM, "ENOTNAM"}, + {&ENAVAIL, "ENAVAIL"}, + {&EISNAM, "EISNAM"}, + {&EREMOTEIO, "EREMOTEIO"}, + {&ENOMEDIUM, "ENOMEDIUM"}, + {&EMEDIUMTYPE, "EMEDIUMTYPE"}, + {&ENOKEY, "ENOKEY"}, + {&EKEYEXPIRED, "EKEYEXPIRED"}, + {&EKEYREVOKED, "EKEYREVOKED"}, + {&EKEYREJECTED, "EKEYREJECTED"}, + {&ERFKILL, "ERFKILL"}, + {&EHWPOISON, "EHWPOISON"}, +}; -_Alignas(char) static const char kErrnoNames[] = "\ -2BIG\000\ -ACCES\000\ -ADDRINUSE\000\ -ADDRNOTAVAIL\000\ -ADV\000\ -AFNOSUPPORT\000\ -AGAIN\000\ -ALREADY\000\ -BADE\000\ -BADF\000\ -BADFD\000\ -BADMSG\000\ -BADR\000\ -BADRQC\000\ -BADSLT\000\ -BFONT\000\ -BUSY\000\ -CANCELED\000\ -CHILD\000\ -CHRNG\000\ -COMM\000\ -CONNABORTED\000\ -CONNREFUSED\000\ -CONNRESET\000\ -DEADLK\000\ -DESTADDRREQ\000\ -DOM\000\ -DOTDOT\000\ -DQUOT\000\ -EXIST\000\ -FAULT\000\ -FBIG\000\ -HOSTDOWN\000\ -HOSTUNREACH\000\ -HWPOISON\000\ -IDRM\000\ -ILSEQ\000\ -INPROGRESS\000\ -INTR\000\ -INVAL\000\ -IO\000\ -ISCONN\000\ -ISDIR\000\ -ISNAM\000\ -KEYEXPIRED\000\ -KEYREJECTED\000\ -KEYREVOKED\000\ -L2HLT\000\ -L2NSYNC\000\ -L3HLT\000\ -L3RST\000\ -LIBACC\000\ -LIBBAD\000\ -LIBEXEC\000\ -LIBMAX\000\ -LIBSCN\000\ -LNRNG\000\ -LOOP\000\ -MEDIUMTYPE\000\ -MFILE\000\ -MLINK\000\ -MSGSIZE\000\ -MULTIHOP\000\ -NAMETOOLONG\000\ -NAVAIL\000\ -NETDOWN\000\ -NETRESET\000\ -NETUNREACH\000\ -NFILE\000\ -NOANO\000\ -NOBUFS\000\ -NOCSI\000\ -NODATA\000\ -NODEV\000\ -NOENT\000\ -NOEXEC\000\ -NOKEY\000\ -NOLCK\000\ -NOLINK\000\ -NOMEDIUM\000\ -NOMEM\000\ -NOMSG\000\ -NONET\000\ -NOPKG\000\ -NOPROTOOPT\000\ -NOSPC\000\ -NOSR\000\ -NOSTR\000\ -NOSYS\000\ -NOTBLK\000\ -NOTCONN\000\ -NOTDIR\000\ -NOTEMPTY\000\ -NOTNAM\000\ -NOTRECOVERABLE\000\ -NOTSOCK\000\ -NOTSUP\000\ -NOTTY\000\ -NOTUNIQ\000\ -NXIO\000\ -OPNOTSUPP\000\ -OVERFLOW\000\ -OWNERDEAD\000\ -PERM\000\ -PFNOSUPPORT\000\ -PIPE\000\ -PROTO\000\ -PROTONOSUPPORT\000\ -PROTOTYPE\000\ -RANGE\000\ -REMCHG\000\ -REMOTE\000\ -REMOTEIO\000\ -RESTART\000\ -RFKILL\000\ -ROFS\000\ -SHUTDOWN\000\ -SOCKTNOSUPPORT\000\ -SPIPE\000\ -SRCH\000\ -SRMNT\000\ -STALE\000\ -STRPIPE\000\ -TIME\000\ -TIMEDOUT\000\ -TOOMANYREFS\000\ -TXTBSY\000\ -UCLEAN\000\ -UNATCH\000\ -USERS\000\ -XDEV\000\ -XFULL\000\ -\000"; - -static const char *geterrname(long code) { - const long *e; - size_t i, n; - e = &E2BIG; - n = &EXFULL + 1 - e; - for (i = 0; i < n; ++i) { - if (code == e[i]) { - return IndexDoubleNulString(kErrnoNames, i); +static const char *geterrname(long x) { + int i; + if (x) { + for (i = 0; i < ARRAYLEN(kErrors); ++i) { + if (x == *kErrors[i].x) { + return kErrors[i].s; + } } } - return NULL; + return "EUNKNOWN"; } /** @@ -312,28 +181,19 @@ static const char *geterrname(long code) { * @return 0 on success, or error code */ int strerror_r(int err, char *buf, size_t size) { + char *p; const char *s; - char16_t buf16[100]; - int winstate, sysvstate; - if (!err || IsTiny()) { - s = "?"; - } else { - s = firstnonnull(geterrname(err), "?"); + err &= 0xFFFF; + s = geterrname(err); + p = buf; + if (strlen(s) + 1 + 5 + 1 + 1 <= size) { + p = stpcpy(p, s); + *p++ = '['; + p += uint64toarray_radix10(err, p); + *p++ = ']'; } - if (!SupportsWindows()) { - (snprintf)(buf, size, "E%s[%d]", s, err); - } else { - winstate = GetLastError(); - sysvstate = errno; - if (FormatMessage( - kNtFormatMessageFromSystem | kNtFormatMessageIgnoreInserts, NULL, - err, 0, buf16, ARRAYLEN(buf16) - 1, 0) > 0) { - chomp16(buf16); - } else { - buf16[0] = u'\0'; - } - (snprintf)(buf, size, "E%s/err=%d/errno:%d/GetLastError:%d%s%hs", s, err, - sysvstate, winstate, buf16[0] ? " " : "", buf16); + if (p - buf < size) { + *p++ = '\0'; } return 0; } diff --git a/libc/fmt/vsnprintf.c b/libc/fmt/vsnprintf.c index 72d158b98..762684db8 100644 --- a/libc/fmt/vsnprintf.c +++ b/libc/fmt/vsnprintf.c @@ -16,10 +16,10 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/bits/safemacros.internal.h" #include "libc/dce.h" #include "libc/fmt/fmt.h" #include "libc/limits.h" +#include "libc/macros.internal.h" #include "libc/runtime/runtime.h" struct SprintfStr { @@ -28,10 +28,13 @@ struct SprintfStr { size_t n; }; -static noinstrument int vsnprintfputchar(unsigned char c, - struct SprintfStr *str) { - if (str->i < str->n) str->p[str->i] = c; - str->i++; +static int vsnprintfputchar(const char *s, struct SprintfStr *t, size_t n) { + if (t->i + n <= t->n) { + memcpy(t->p + t->i, s, n); + } else if (t->i < t->n) { + memcpy(t->p + t->i, s, t->n - t->i); + } + t->i += n; return 0; } @@ -51,6 +54,6 @@ static noinstrument int vsnprintfputchar(unsigned char c, int(vsnprintf)(char *buf, size_t size, const char *fmt, va_list va) { struct SprintfStr str = {buf, 0, size}; __fmt(vsnprintfputchar, &str, fmt, va); - if (str.n) str.p[min(str.i, str.n - 1)] = '\0'; + if (str.n) str.p[MIN(str.i, str.n - 1)] = '\0'; return str.i; } diff --git a/libc/integral/c.inc b/libc/integral/c.inc index 26f5ce007..1eadabba6 100644 --- a/libc/integral/c.inc +++ b/libc/integral/c.inc @@ -659,6 +659,7 @@ typedef uint64_t uintmax_t; #pragma GCC diagnostic ignored "-Wformat" /* forces only gnu pf */ #pragma GCC diagnostic ignored "-Wunused-parameter" /* extreme prejudice */ #pragma GCC diagnostic ignored "-Wunused-function" /* contradicts dce! */ +#pragma GCC diagnostic ignored "-Wunused-const-variable" /* let me dce */ #pragma GCC diagnostic ignored "-Wunused-variable" /* belongs in tidy */ #pragma GCC diagnostic ignored "-Wformat-extra-args" /* is also broken */ #pragma GCC diagnostic ignored "-Wparentheses" /* annoying tidy */ diff --git a/libc/log/cancolor.c b/libc/log/cancolor.c index 4e77c77bc..6d920897a 100644 --- a/libc/log/cancolor.c +++ b/libc/log/cancolor.c @@ -16,7 +16,10 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/bits/safemacros.internal.h" #include "libc/dce.h" +#include "libc/log/color.internal.h" +#include "libc/log/log.h" #include "libc/runtime/runtime.h" #include "libc/str/str.h" @@ -43,17 +46,8 @@ bool cancolor(void) { static bool once; static bool result; - const char *term; if (!once) { - if (!result) { - if ((term = getenv("TERM"))) { - /* anything but emacs basically */ - result = strcmp(term, "dumb") != 0; - } else { - /* TODO(jart): Why does Mac bash login shell exec nuke TERM? */ - result = IsXnu(); - } - } + result = !!strcmp(nulltoempty(getenv("DONTANSIMEBRO")), "1"); once = true; } return result; diff --git a/libc/log/gdbexec.c b/libc/log/gdbexec.c index fc781f4ed..13a345c9c 100644 --- a/libc/log/gdbexec.c +++ b/libc/log/gdbexec.c @@ -28,7 +28,7 @@ /** * Attachs GDB temporarilly, to do something like print a variable. */ -int(gdbexec)(const char *cmd) { +privileged int(gdbexec)(const char *cmd) { struct StackFrame *bp; int pid, ttyin, ttyout; intptr_t continuetoaddr; diff --git a/libc/log/isterminalinarticulate.c b/libc/log/isterminalinarticulate.c index 7d302ca6b..7d2d597bc 100644 --- a/libc/log/isterminalinarticulate.c +++ b/libc/log/isterminalinarticulate.c @@ -21,9 +21,6 @@ #include "libc/runtime/runtime.h" #include "libc/str/str.h" -/** - * Checks if we're probably running inside Emacs. - */ bool IsTerminalInarticulate(void) { - return strcmp(nulltoempty(getenv("TERM")), "dumb") == 0; + return !strcmp(nulltoempty(getenv("TERM")), "dumb"); } diff --git a/libc/log/oncrash.c b/libc/log/oncrash.c index 313aed3bd..3c4bbbcd2 100644 --- a/libc/log/oncrash.c +++ b/libc/log/oncrash.c @@ -232,8 +232,6 @@ relegated void __oncrash(int sig, struct siginfo *si, ucontext_t *ctx) { err = errno; if (once) _exit(119); once = true; - /* TODO(jart): Needs translation for ucontext_t and possibly siginfo_t. */ - if (IsFreebsd() || IsOpenbsd()) ctx = NULL; rip = ctx ? ctx->uc_mcontext.rip : 0; if ((gdbpid = IsDebuggerPresent(true))) { DebugBreak(); diff --git a/libc/mem/reallocarray.c b/libc/mem/reallocarray.c index a7cb94c1b..0c1c5750b 100644 --- a/libc/mem/reallocarray.c +++ b/libc/mem/reallocarray.c @@ -16,6 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/errno.h" #include "libc/fmt/conv.h" #include "libc/mem/mem.h" @@ -27,5 +28,11 @@ * @return new address or NULL w/ errno and ptr is NOT free()'d */ void *reallocarray(void *ptr, size_t nmemb, size_t itemsize) { - return realloc(ptr, nmemb * itemsize); + size_t n; + if (!__builtin_mul_overflow(nmemb, itemsize, &n)) { + return realloc(ptr, n); + } else { + errno = ENOMEM; + return NULL; + } } diff --git a/libc/mem/vasprintf.c b/libc/mem/vasprintf.c index 040f11199..f74ca4251 100644 --- a/libc/mem/vasprintf.c +++ b/libc/mem/vasprintf.c @@ -29,26 +29,26 @@ * @see xasprintf() for a better API */ int(vasprintf)(char **strp, const char *fmt, va_list va) { - int wrote; char *p; size_t size; - va_list va2; + va_list vb; + int wrote, rc = -1; if ((*strp = malloc((size = 512)))) { - va_copy(va2, va); + va_copy(vb, va); wrote = (vsnprintf)(*strp, size, fmt, va); - if (wrote == -1) return -1; if (wrote < size) { if ((p = realloc(*strp, wrote + 1))) *strp = p; - return wrote; + rc = wrote; } else { size = wrote + 1; if ((p = realloc(*strp, size))) { *strp = p; - wrote = (vsnprintf)(*strp, size, fmt, va2); + wrote = (vsnprintf)(*strp, size, fmt, vb); assert(wrote == size - 1); - return wrote; + rc = wrote; } } + va_end(vb); } - return -1; + return rc; } diff --git a/libc/nexgen32e/cescapec.S b/libc/nexgen32e/cescapec.S index 3ce5685e6..b7623117f 100644 --- a/libc/nexgen32e/cescapec.S +++ b/libc/nexgen32e/cescapec.S @@ -27,6 +27,8 @@ // @param dil contains byte to escape // @see libc/nexgen32e/cescapec.c cescapec: + .leafprologue + .profilable movzbl %dil,%edi lea -7(%rdi),%ecx cmp $85,%cl @@ -36,28 +38,28 @@ cescapec: jmp *cescapectab(,%rcx,8) .Lanchorpoint: .LBEL: mov $'a',%ah - ret + .leafepilogue .LBS: mov $'b',%ah - ret + .leafepilogue .LHT: mov $'t',%ah - ret + .leafepilogue .LLF: mov $'n',%ah - ret + .leafepilogue .LVT: mov $'v',%ah - ret + .leafepilogue .LFF: mov $'f',%ah - ret + .leafepilogue .LCR: mov $'r',%ah - ret + .leafepilogue .LDQ: mov $'\"',%ah - ret + .leafepilogue .LSQ: mov $'\'',%ah - ret + .leafepilogue .LBSL: mov $'\\',%ah - ret + .leafepilogue #ifdef __STRICT_ANSI__ .LQM: mov $'?',%ah - ret + .leafepilogue #else .LQM: #endif @@ -65,7 +67,7 @@ cescapec: lea -0x20(%rax),%ecx cmp $0x5E,%ecx ja 2f - ret + .leafepilogue 2: and $-64,%eax mov %edi,%ecx and $56,%ecx @@ -75,7 +77,7 @@ cescapec: or %ecx,%edi lea (%rdi,%rax,4),%eax add $'0'<<030|'0'<<020|'0'<<010|'\\',%eax - ret + .leafepilogue .endfn cescapec,globl .initro 300,_init_cescapec diff --git a/libc/nexgen32e/crc32.h b/libc/nexgen32e/crc32.h index 0a711fc0f..7890f980c 100644 --- a/libc/nexgen32e/crc32.h +++ b/libc/nexgen32e/crc32.h @@ -3,9 +3,11 @@ #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ +extern const uint32_t kCrc32cTab[256]; + void crc32init(uint32_t[hasatleast 256], uint32_t); +uint32_t crc32c(uint32_t, const void *, size_t); uint32_t crc32_z(uint32_t, const void *, size_t); -extern uint32_t (*const crc32c)(uint32_t, const void *, size_t); uint32_t crc32c_pure(uint32_t, const void *, size_t) strlenesque hidden; uint32_t crc32c_sse42(uint32_t, const void *, size_t) strlenesque hidden; uint32_t crc32_pclmul(uint32_t, const void *, size_t) hidden; diff --git a/libc/nexgen32e/memrchr.S b/libc/nexgen32e/memrchr.S index b8296a37a..942b01c10 100644 --- a/libc/nexgen32e/memrchr.S +++ b/libc/nexgen32e/memrchr.S @@ -28,7 +28,8 @@ // @return rax is address of last %sil in %rdi, or NULL // @note AVX2 requires Haswell (2014+) or Excavator (2015+) // @asyncsignalsafe -memrchr:.leafprologue +memrchr: + .leafprologue .profilable #if !IsTiny() cmp $32,%rdx diff --git a/libc/runtime/clktck.c b/libc/runtime/clktck.c new file mode 100644 index 000000000..8fe9f3fa6 --- /dev/null +++ b/libc/runtime/clktck.c @@ -0,0 +1,75 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/calls/calls.h" +#include "libc/dce.h" +#include "libc/runtime/clktck.h" +#include "libc/sysv/consts/auxv.h" + +struct clockinfo_netbsd { + int32_t hz; // number of clock ticks per second + int32_t tick; // µs per tick + int32_t tickadj; // skew rate for adjtime() + int32_t stathz; // statistics clock frequency + int32_t profhz; // profiling clock frequency +}; + +static int clk_tck; + +static noinline int __clk_tck_init(void) { + int x; + int cmd[2]; + size_t len; + struct clockinfo_netbsd clock; + if (IsXnu() || IsOpenbsd()) { + x = 100; + } else if (IsFreebsd()) { + x = 128; + } else if (IsNetbsd()) { + cmd[0] = 1; // CTL_KERN + cmd[1] = 12; // KERN_CLOCKRATE + len = sizeof(clock); + if (sysctl(cmd, 2, &clock, &len, NULL, 0) != -1) { + x = clock.hz; + } else { + x = -1; + } + } else { + x = getauxval(AT_CLKTCK); + } + if (x < 1) x = 100; + clk_tck = x; + return x; +} + +/** + * Returns system clock ticks per second. + * + * The returned value is memoized. This function is intended to be + * used via the `CLK_TCK` macro wrapper. + * + * The returned value is always greater than zero. It's usually 100 + * hertz which means each clock tick is 10 milliseconds long. + */ +int __clk_tck(void) { + if (clk_tck) { + return clk_tck; + } else { + return __clk_tck_init(); + } +} diff --git a/libc/runtime/clktck.h b/libc/runtime/clktck.h new file mode 100644 index 000000000..3ab13648a --- /dev/null +++ b/libc/runtime/clktck.h @@ -0,0 +1,12 @@ +#ifndef COSMOPOLITAN_LIBC_RUNTIME_CLKTCK_H_ +#define COSMOPOLITAN_LIBC_RUNTIME_CLKTCK_H_ +#if !(__ASSEMBLER__ + __LINKER__ + 0) +COSMOPOLITAN_C_START_ + +#define CLK_TCK (__clk_tck()) + +int __clk_tck(void) pureconst; + +COSMOPOLITAN_C_END_ +#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ +#endif /* COSMOPOLITAN_LIBC_RUNTIME_CLKTCK_H_ */ diff --git a/libc/runtime/finddebugbinary.c b/libc/runtime/finddebugbinary.c index 9ff07c09f..4a0201ab8 100644 --- a/libc/runtime/finddebugbinary.c +++ b/libc/runtime/finddebugbinary.c @@ -29,40 +29,28 @@ /** * Returns path of binary with the debug information, or null. * - * @return path to debug binary, or -1 w/ errno + * @return path to debug binary, or NULL */ const char *FindDebugBinary(void) { - unsigned i, len; - char buf[2][PATH_MAX]; - static char res[PATH_MAX]; - const char *bins[4], *pwd, *comdbg; - if (res[0]) return res; - if ((comdbg = emptytonull(getenv("COMDBG")))) return comdbg; - if (res[0]) return res; - bins[0] = program_invocation_name; - bins[1] = (const char *)getauxval(AT_EXECFN); - pwd = emptytonull(getenv("PWD")); - for (i = 0; i < 2; ++i) { - if (pwd && bins[i] && bins[i][0] != '/' && bins[i][0] != '\\' && - strlen(pwd) + 1 + strlen(bins[i]) + 1 <= ARRAYLEN(buf[0])) { - strcpy(buf[i], pwd); - strcat(buf[i], "/"); - strcat(buf[i], bins[i]); - bins[i + 2] = buf[i]; + static bool once; + static char *res; + static char buf[PATH_MAX + 1]; + char *p; + size_t n; + if (!once) { + if (!(res = getenv("COMDBG"))) { + p = (char *)getauxval(AT_EXECFN); + n = strlen(p); + if (n > 4 && !memcmp(p + n - 4, ".dbg", 4)) { + res = p; + } else if (n + 4 <= PATH_MAX) { + mempcpy(mempcpy(buf, p, n), ".dbg", 5); + if (fileexists(buf)) { + res = buf; + } + } } + once = true; } - for (i = 0; i < 4; ++i) { - if (!bins[i]) continue; - len = strlen(bins[i]); - memcpy(res, bins[i], len + 1); - if (!endswith(res, ".dbg") && len + 3 + 1 <= ARRAYLEN(res)) { - strcat(res, ".dbg"); - } - if (fileexists(res)) { - return res; - } - } - res[0] = '\0'; - errno = ENOENT; - return NULL; + return res; } diff --git a/libc/runtime/ftrace.c b/libc/runtime/ftrace.c index 5c190ca8b..0fa7538fe 100644 --- a/libc/runtime/ftrace.c +++ b/libc/runtime/ftrace.c @@ -106,42 +106,12 @@ privileged noasan void ftrace(void) { noreentry = 0; } -/** - * Enables plaintext function tracing if `--ftrace` flag is passed. - * - * The `--ftrace` CLI arg is removed before main() is called. This code - * is intended for diagnostic purposes and assumes binaries are - * trustworthy and stack isn't corrupted. Logging plain text allows - * program structure to easily be visualized and hotspots identified w/ - * `sed | sort | uniq -c | sort`. A compressed trace can be made by - * appending `--ftrace 2>&1 | gzip -4 >trace.gz` to the CLI arguments. - * - * @see libc/runtime/_init.S for documentation - */ -textstartup int ftrace_init(int argc, char *argv[]) { - int i; - bool foundflag; - foundflag = false; - for (i = 1; i <= argc; ++i) { - if (!foundflag) { - if (argv[i]) { - if (strcmp(argv[i], "--ftrace") == 0) { - foundflag = true; - } else if (strcmp(argv[i], "----ftrace") == 0) { - strcpy(argv[i], "--ftrace"); - } - } - } else { - argv[i - 1] = argv[i]; - } +textstartup void ftrace_install(void) { + g_buf[0] = '+'; + g_buf[1] = ' '; + if ((g_symbols = OpenSymbolTable(FindDebugBinary()))) { + __hook(ftrace_hook, g_symbols); + } else { + write(2, "error: --ftrace needs the concomitant .com.dbg binary\n", 54); } - if (foundflag) { - --argc; - g_buf[0] = '+'; - g_buf[1] = ' '; - if ((g_symbols = OpenSymbolTable(FindDebugBinary()))) { - __hook(ftrace_hook, g_symbols); - } - } - return argc; } diff --git a/libc/runtime/ftraceinit.c b/libc/runtime/ftraceinit.c new file mode 100644 index 000000000..cd6af1c9f --- /dev/null +++ b/libc/runtime/ftraceinit.c @@ -0,0 +1,56 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/runtime/runtime.h" +#include "libc/str/str.h" + +/** + * Enables plaintext function tracing if `--ftrace` flag is passed. + * + * The `--ftrace` CLI arg is removed before main() is called. This code + * is intended for diagnostic purposes and assumes binaries are + * trustworthy and stack isn't corrupted. Logging plain text allows + * program structure to easily be visualized and hotspots identified w/ + * `sed | sort | uniq -c | sort`. A compressed trace can be made by + * appending `--ftrace 2>&1 | gzip -4 >trace.gz` to the CLI arguments. + * + * @see libc/runtime/_init.S for documentation + */ +textstartup int ftrace_init(int argc, char *argv[]) { + int i; + bool foundflag; + foundflag = false; + for (i = 1; i <= argc; ++i) { + if (!foundflag) { + if (argv[i]) { + if (strcmp(argv[i], "--ftrace") == 0) { + foundflag = true; + } else if (strcmp(argv[i], "----ftrace") == 0) { + strcpy(argv[i], "--ftrace"); + } + } + } else { + argv[i - 1] = argv[i]; + } + } + if (foundflag) { + --argc; + ftrace_install(); + } + return argc; +} diff --git a/libc/runtime/mmap.c b/libc/runtime/mmap.c index 3992db5c1..2d1b8e44f 100644 --- a/libc/runtime/mmap.c +++ b/libc/runtime/mmap.c @@ -59,8 +59,9 @@ */ void *mmap(void *addr, size_t size, int prot, int flags, int fd, int64_t off) { struct DirectMap dm; - int i, x, n, a, b, f; + int i, x, n, m, a, b, f; if (!size) return VIP(einval()); + if (size > 0x0000010000000000ull) return VIP(enomem()); if (!ALIGNED(off)) return VIP(einval()); if (!ALIGNED(addr)) return VIP(einval()); if (!CANONICAL(addr)) return VIP(einval()); @@ -77,6 +78,7 @@ void *mmap(void *addr, size_t size, int prot, int flags, int fd, int64_t off) { n = ROUNDUP(size, FRAMESIZE) >> 16; for (i = 0; i < _mmi.i; ++i) { if (_mmi.p[i].y < x) continue; + if (__builtin_add_overflow(_mmi.p[i].y, n, &m)) return VIP(enomem()); if (_mmi.p[i].x > x + n - 1) break; x = _mmi.p[i].y + 1; } diff --git a/net/http/uricspn.rl b/libc/runtime/mremap-sysv.c similarity index 63% rename from net/http/uricspn.rl rename to libc/runtime/mremap-sysv.c index b33ec63df..76303f161 100644 --- a/net/http/uricspn.rl +++ b/libc/runtime/mremap-sysv.c @@ -1,7 +1,7 @@ /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ │vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ ╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ │ │ │ Permission to use, copy, modify, and/or distribute this software for │ │ any purpose with or without fee is hereby granted, provided that the │ @@ -16,55 +16,40 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/assert.h" -#include "libc/nexgen32e/x86feature.h" +#include "libc/bits/bits.h" +#include "libc/calls/calls.h" +#include "libc/sysv/consts/map.h" +#include "libc/sysv/consts/mremap.h" #include "libc/sysv/errfuns.h" -#include "net/http/uri.h" -/* TODO(jart): Rewrite in C */ - -#define static - -/* clang-format off */ -%% machine uricspn; -%% write data; -/* clang-format on */ - -int uricspn(const char *data, size_t size) { - int uricspn$avx(const char *, size_t) hidden; - const char *p, *pe; - int cs; - - assert(data || !size); - assert(size <= 0x7ffff000); - assert(size <= 0x7ffff000); - - if (X86_HAVE(AVX)) { - return uricspn$avx(data, size); - } - - p = data; - pe = data + size; - - /* clang-format off */ - - %%{ - mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"; - reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | ","; - unreserved = alnum | mark; - uric = reserved | unreserved | "%"; - machina := uric*; - }%% - - %% write init; - cs = uricspn_en_machina; - %% write exec; - - /* clang-format on */ - - if (cs >= uricspn_first_final) { - return p - data; +privileged void *sys_mremap(void *p, size_t n, size_t m, int f, void *q) { + bool cf; + uintptr_t rax, rdi, rsi, rdx; + register uintptr_t r8 asm("r8"); + register uintptr_t r10 asm("r10"); + if (IsLinux()) { + r10 = f; + r8 = (uintptr_t)q; + asm("syscall" + : "=a"(rax) + : "0"(0x019), "D"(p), "S"(n), "d"(m), "r"(r10), "r"(r8) + : "rcx", "r11", "memory", "cc"); + if (rax > -4096ul) errno = -rax, rax = -1; + } else if (IsNetbsd()) { + if (f & MREMAP_MAYMOVE) { + rax = 0x19B; + r10 = m; + r8 = (f & MREMAP_FIXED) ? MAP_FIXED : 0; + asm(CFLAG_ASM("syscall") + : CFLAG_CONSTRAINT(cf), "+a"(rax) + : "D"(p), "S"(n), "d"(q), "r"(r10), "r"(r8) + : "rcx", "r11", "memory", "cc"); + if (cf) errno = rax, rax = -1; + } else { + rax = einval(); + } } else { - return einval(); + rax = enosys(); } + return (void *)rax; } diff --git a/libc/runtime/mremap.c b/libc/runtime/mremap.c index cd4133c95..e7fbd0b5b 100644 --- a/libc/runtime/mremap.c +++ b/libc/runtime/mremap.c @@ -17,9 +17,46 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" +#include "libc/dce.h" +#include "libc/macros.internal.h" +#include "libc/sysv/consts/mremap.h" #include "libc/sysv/errfuns.h" -void *mremap(void *old_address, size_t old_size, size_t new_size, int flags, - void *new_address) { - return (void *)(intptr_t)enosys(); +#define IP(X) (intptr_t)(X) +#define VIP(X) (void *)IP(X) +#define ALIGNED(p) (!(IP(p) & (FRAMESIZE - 1))) + +/** + * Relocates mapping. + * + * @param p is old address + * @param n is old size + * @param m is new size + * @param f should have MREMAP_MAYMOVE and may have MAP_FIXED + * @param q is new address + */ +void *mremap(void *p, size_t n, size_t m, int f, ... /* void *q */) { + return VIP(enosys()); /* TODO: Implement Me! */ + void *q; + va_list va; + if (!IsWindows()) { + if (!n) return VIP(einval()); + if (!m) return VIP(einval()); + if (!ALIGNED(p)) return VIP(einval()); + n = ROUNDUP(n, FRAMESIZE); + m = ROUNDUP(m, FRAMESIZE); + if (f & MREMAP_FIXED) { + va_start(va, f); + q = va_arg(va, void *); + va_end(va); + if (!ALIGNED(q)) return VIP(einval()); + } else { + q = NULL; + if (!(f & MREMAP_MAYMOVE)) { + } + } + return VIP(enosys()); + } else { + return VIP(enosys()); + } } diff --git a/libc/runtime/openexecutable.S b/libc/runtime/openexecutable.S new file mode 100644 index 000000000..71babb8fd --- /dev/null +++ b/libc/runtime/openexecutable.S @@ -0,0 +1,198 @@ +/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8 -*-│ +│vi: set et ft=asm ts=8 tw=8 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/dce.h" +#include "libc/macros.internal.h" +#include "libc/sysv/consts/auxv.h" +#include "libc/sysv/consts/prot.h" +.privileged + +// Opens executable in O_RDWR mode. +// +// To avoid ETXTBSY we need to unmap the running executable first, +// then open the file, and finally load the code back into memory. +// +// @return file descriptor +// @note only works on .com binary (not .com.dbg) +// @note only supports linux, freebsd, openbsd, and netbsd +OpenExecutable: + push %rbp + mov %rsp,%rbp + pushq __NR_open(%rip) # -0x08(%rbp) + pushq __NR_mmap(%rip) # -0x10(%rbp) + pushq __NR_munmap(%rip) # -0x18(%rbp) + pushq O_RDWR(%rip) # -0x20(%rbp) + pushq MAP_ANONYMOUS(%rip) # -0x28(%rbp) + pushq MAP_PRIVATE(%rip) # -0x30(%rbp) + pushq MAP_FIXED(%rip) # -0x38(%rbp) + pushq MAP_SHARED(%rip) # -0x40(%rbp) + pushq __NR_mprotect(%rip) # -0x48(%rbp) + pushq __NR_mprotect(%rip) # -0x50(%rbp) + push %rbx # code buffer + push %r12 # data buffer + push %r14 # filename + push %r15 # fd + +// Get filename. + mov AT_EXECFN,%edi + call getauxval + mov %rax,%r14 + +// Allocate code buffer. + mov -0x10(%rbp),%eax # __NR_mmap + xor %edi,%edi + mov $PAGESIZE,%esi + mov $PROT_READ|PROT_WRITE,%edx + mov -0x28(%rbp),%r10d # MAP_ANONYMOUS + or -0x30(%rbp),%r10d # MAP_PRIVATE + mov $-1,%r8 + mov $0,%r9 + push %r9 # openbsd:pad + push %r9 # openbsd:align + syscall + pop %r9 + pop %r9 + mov %rax,%rbx + +// Allocate data buffer. + mov -0x10(%rbp),%eax # __NR_mmap + xor %edi,%edi + mov $ape_ram_filesz,%esi + mov $PROT_READ|PROT_WRITE,%edx + mov -0x28(%rbp),%r10d # MAP_ANONYMOUS + or -0x30(%rbp),%r10d # MAP_PRIVATE + mov $-1,%r8 + mov $0,%r9 + push %r9 # openbsd:pad + push %r9 # openbsd:align + syscall + pop %r9 + pop %r9 + mov %rax,%r12 + +// Move data. + mov %r12,%rdi + mov $ape_ram_vaddr,%esi + mov $ape_ram_filesz,%ecx + rep movsb + +// Move code. + mov %rbx,%rdi + mov $8f,%esi + mov $9f-8f,%ecx + rep movsb + +// Change protection. + mov -0x48(%rbp),%eax # __NR_mprotect + mov %rbx,%rdi + mov $PAGESIZE,%esi + mov $PROT_READ|PROT_EXEC,%edx + syscall + + jmp *%rbx + +// + +// Unmap code segment. +8: mov -0x18(%rbp),%eax # __NR_munmap + mov $ape_rom_vaddr,%edi + mov $ape_rom_filesz,%esi + syscall + +// Unmap data segment. + mov -0x18(%rbp),%eax # __NR_munmap + mov $ape_ram_vaddr,%edi + mov $ape_ram_filesz,%esi + syscall + +// Open executable in read-write mode. + mov -0x08(%rbp),%eax # __NR_open + mov %r14,%rdi + mov -0x20(%rbp),%esi # O_RDWR + syscall + mov %eax,%r15d + +// Map code segment. + mov -0x10(%rbp),%eax # __NR_mmap + mov $ape_rom_vaddr,%edi + mov $ape_rom_filesz,%esi + mov $PROT_READ|PROT_EXEC,%edx + mov -0x38(%rbp),%r10d # MAP_FIXED + or -0x40(%rbp),%r10d # MAP_SHARED + mov %r15d,%r8d + mov $ape_rom_offset,%r9d + push %r9 # openbsd:pad + push %r9 # openbsd:align + syscall + pop %r9 + pop %r9 + +// Allocate data segment. + mov -0x10(%rbp),%eax # __NR_mmap + mov $ape_ram_vaddr,%edi + mov $ape_ram_filesz,%esi + mov $PROT_READ|PROT_WRITE,%edx + mov -0x38(%rbp),%r10d # MAP_FIXED + or -0x30(%rbp),%r10d # MAP_PRIVATE + or -0x28(%rbp),%r10d # MAP_ANONYMOUS + mov $-1,%r8 + mov $0,%r9 + push %r9 # openbsd:pad + push %r9 # openbsd:align + syscall + pop %r9 + pop %r9 + +// Put data back. + mov $ape_ram_vaddr,%edi + mov %r12,%rsi + mov $ape_ram_filesz,%ecx + rep movsb + +// Jump back. + mov $9f,%eax + jmp *%rax + +// + +// Deallocate code buffer. +9: mov __NR_munmap,%eax + mov %rbx,%rdi + mov $PAGESIZE,%esi + syscall + +// Deallocate data buffer. + mov __NR_munmap,%eax + mov %r12,%rdi + mov $ape_ram_filesz,%esi + syscall + + mov %r15d,%eax + pop %r15 + pop %r14 + pop %r12 + pop %rbx + leave + ret +9: .endfn OpenExecutable,globl + + .weak ape_rom_vaddr + .weak ape_rom_filesz + .weak ape_rom_offset + .weak ape_ram_vaddr + .weak ape_ram_filesz diff --git a/libc/runtime/runtime.h b/libc/runtime/runtime.h index ef34b22ff..1f230596b 100644 --- a/libc/runtime/runtime.h +++ b/libc/runtime/runtime.h @@ -35,7 +35,7 @@ extern uint8_t __zip_end[]; /* αpε */ void mcount(void); unsigned long getauxval(unsigned long); -void *mapanon(size_t) vallocesque attributeallocsize((1)); +void *mapanon(size_t) attributeallocsize((1)); int setjmp(jmp_buf) libcesque returnstwice paramsnonnull(); void longjmp(jmp_buf, int) libcesque wontreturn paramsnonnull(); int _setjmp(jmp_buf) libcesque returnstwice paramsnonnull(); @@ -55,7 +55,7 @@ int clearenv(void); void fpreset(void); int issetugid(void); void *mmap(void *, uint64_t, int32_t, int32_t, int32_t, int64_t); -void *mremap(void *, uint64_t, uint64_t, int32_t, void *); +void *mremap(void *, size_t, size_t, int, ...); int munmap(void *, uint64_t); int mprotect(void *, uint64_t, int) privileged; int msync(void *, size_t, int); @@ -87,6 +87,8 @@ void _savexmm(void *); void _weakfree(void *); void free_s(void *) paramsnonnull() libcesque; int close_s(int *) paramsnonnull() libcesque; +int OpenExecutable(void); +void ftrace_install(void); COSMOPOLITAN_C_END_ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ diff --git a/libc/runtime/sysconf.c b/libc/runtime/sysconf.c index fbfc8fbf8..3fd5699aa 100644 --- a/libc/runtime/sysconf.c +++ b/libc/runtime/sysconf.c @@ -16,10 +16,32 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/runtime/clktck.h" #include "libc/runtime/sysconf.h" /** * Returns configuration value about system. - * @param thing can be _SC_XXX + * + * The following parameters are supported: + * + * - `_SC_CLK_TCK` returns number of clock ticks per second + * - `_SC_ARG_MAX` currently always returns 32768 due to Windows + * - `_SC_PAGESIZE` currently always returns 65536 due to Windows + * + * You are encouraged to undiamond calls to this API as follows: + * + * - Use `CLK_TCK` instead of `getconf(_SC_CLK_TCK)` + * - Use `PAGESIZE` or `FRAMESIZE` instead of `getconf(_SC_PAGESIZE)` */ -long(sysconf)(int thing) { return __sysconf(thing); } +long sysconf(int name) { + switch (name) { + case _SC_ARG_MAX: + return ARG_MAX; + case _SC_CLK_TCK: + return CLK_TCK; + case _SC_PAGESIZE: + return FRAMESIZE; + default: + return -1; + } +} diff --git a/libc/runtime/sysconf.h b/libc/runtime/sysconf.h index 0afd83eaf..465ece060 100644 --- a/libc/runtime/sysconf.h +++ b/libc/runtime/sysconf.h @@ -1,7 +1,5 @@ #ifndef COSMOPOLITAN_LIBC_RUNTIME_SYSCONF_H_ #define COSMOPOLITAN_LIBC_RUNTIME_SYSCONF_H_ -#include "libc/runtime/runtime.h" -#include "libc/sysv/consts/auxv.h" #define _SC_ARG_MAX 0 #define _SC_CLK_TCK 2 @@ -13,26 +11,6 @@ COSMOPOLITAN_C_START_ long sysconf(int); -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -#define sysconf(X) __sysconf(X) -forceinline long __sysconf(int thing) { - switch (thing) { - case _SC_ARG_MAX: - return ARG_MAX; - case _SC_CLK_TCK: { - extern const long __AT_CLKTCK asm("AT_CLKTCK"); - long res = getauxval(__AT_CLKTCK); - if (!res) res = 100; - return res; - } - case _SC_PAGESIZE: - return FRAMESIZE; - default: - return -1; - } -} -#endif /* GNU && !ANSI */ - COSMOPOLITAN_C_END_ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_LIBC_RUNTIME_SYSCONF_H_ */ diff --git a/libc/runtime/winmain.greg.c b/libc/runtime/winmain.greg.c index 77844de97..2adfc81f7 100644 --- a/libc/runtime/winmain.greg.c +++ b/libc/runtime/winmain.greg.c @@ -160,17 +160,15 @@ static noasan textwindows wontreturn void WinMainNew(void) { * able to assume that stack addresses are located at higher * addresses than heap and program memory. * - * 5. Windows users are afraid of "drive-by downloads" where someone - * might accidentally an evil DLL to their Downloads folder which - * then overrides the behavior of a legitimate EXE being run from - * the downloads folder. Since we don't even use dynamic linking, - * we've cargo culted some API calls, that may harden against it. + * 5. Reconfigure x87 FPU so long double is actually long (80 bits). * - * 6. Reconfigure x87 FPU so long double is actually long (80 bits). - * - * 7. Finally, we need fork. Microsoft designed Windows to prevent us - * from having fork() so we pass pipe handles in an environment - * variable literally copy all the memory. + * 6. Finally, we need fork. Since disagreeing with fork is axiomatic to + * Microsoft's engineering culture, we need to go to great lengths to + * have it anyway without breaking Microsoft's rules: using the WIN32 + * API (i.e. not NTDLL) to copy MAP_PRIVATE pages via a pipe. It'd go + * faster if the COW pages CreateFileMappingNuma claims to have turns + * out to be true. Until then we have a "PC Scale" and entirely legal + * workaround that they hopefully won't block using Windows Defender. * * @param hInstance call GetModuleHandle(NULL) from main if you need it */ diff --git a/libc/sock/inet_pton.c b/libc/sock/inet_pton.c index b4affaadd..baa0ce034 100644 --- a/libc/sock/inet_pton.c +++ b/libc/sock/inet_pton.c @@ -19,9 +19,9 @@ #include "libc/fmt/fmt.h" #include "libc/sock/internal.h" #include "libc/sock/sock.h" -#include "libc/sysv/errfuns.h" #include "libc/sysv/consts/af.h" #include "libc/sysv/consts/inaddr.h" +#include "libc/sysv/errfuns.h" /** * Converts internet address string to binary. @@ -32,16 +32,23 @@ * @return 1 on success, 0 on src malformed, or -1 w/ errno */ int inet_pton(int af, const char *src, void *dst) { - if (af == AF_INET) { - unsigned char *p = (unsigned char *)dst; - if (sscanf(src, "%hhu.%hhu.%hhu.%hhu", &p[0], &p[1], &p[2], &p[3]) == 4) { - return 1; + uint8_t *p; + int b, c, j; + if (af != AF_INET) return eafnosupport(); + j = 0; + p = dst; + p[0] = 0; + while ((c = *src++)) { + if (isdigit(c)) { + b = c - '0' + p[j] * 10; + p[j] = MIN(255, b); + if (b > 255) return 0; + } else if (c == '.') { + if (++j == 4) return 0; + p[j] = 0; } else { - *(uint32_t *)dst = htonl(INADDR_TESTNET3); return 0; } - } else { - *(uint32_t *)dst = htonl(INADDR_TESTNET3); - return eafnosupport(); } + return j == 3 ? 1 : 0; } diff --git a/libc/sock/internal.h b/libc/sock/internal.h index 78077ba79..da19fb706 100644 --- a/libc/sock/internal.h +++ b/libc/sock/internal.h @@ -47,9 +47,10 @@ struct msghdr_bsd { }; struct sockaddr_un_bsd { - uint8_t sun_len; /* sockaddr len including NUL on freebsd but excluding it on openbsd/xnu */ + uint8_t sun_len; /* sockaddr len including NUL on freebsd but excluding it on + openbsd/xnu */ uint8_t sun_family; - char sun_path[108]; + char sun_path[108]; }; struct SockFd { @@ -121,6 +122,7 @@ int sys_socketpair_nt_dgram(int, int, int, int[2]) hidden; int sys_socketpair_nt(int, int, int, int[2]) hidden; int sys_select_nt(int, fd_set *, fd_set *, fd_set *, struct timeval *) hidden; int sys_shutdown_nt(struct Fd *, int) hidden; +int sys_setsockopt_nt(struct Fd *, int, int, const void *, uint32_t) hidden; size_t __iovec2nt(struct NtIovec[hasatleast 16], const struct iovec *, size_t) hidden; diff --git a/libc/sock/setsockopt-nt.c b/libc/sock/setsockopt-nt.c new file mode 100644 index 000000000..ed31ffda5 --- /dev/null +++ b/libc/sock/setsockopt-nt.c @@ -0,0 +1,60 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/calls/struct/timeval.h" +#include "libc/macros.internal.h" +#include "libc/sock/internal.h" +#include "libc/sysv/consts/so.h" +#include "libc/sysv/errfuns.h" + +struct linger_nt { /* Linux+XNU+BSD ABI */ + uint16_t l_onoff; /* on/off */ + uint16_t l_linger; /* seconds */ +}; + +textwindows int sys_setsockopt_nt(struct Fd *fd, int level, int optname, + const void *optval, uint32_t optlen) { + struct timeval *tv; + struct linger *linger; + union { + uint32_t millis; + struct linger_nt linger; + } nt; + + if (optname == SO_LINGER && optval && optlen == sizeof(struct linger)) { + linger = optval; + nt.linger.l_onoff = linger->l_onoff; + nt.linger.l_linger = MIN(0xFFFF, MAX(0, linger->l_linger)); + optval = &nt.linger; + optlen = sizeof(nt.linger); + } + + if ((optname == SO_RCVTIMEO || optname == SO_SNDTIMEO) && optval && + optlen == sizeof(struct timeval)) { + tv = optval; + nt.millis = MIN(0xFFFFFFFF, MAX(0, tv->tv_sec * 1000 + tv->tv_usec / 1000)); + optval = &nt.millis; + optlen = sizeof(nt.millis); + } + + if (__sys_setsockopt_nt(fd->handle, level, optname, optval, optlen) != -1) { + return 0; + } else { + return __winsockerr(); + } +} diff --git a/libc/sock/setsockopt.c b/libc/sock/setsockopt.c index adc808662..e81b97ee9 100644 --- a/libc/sock/setsockopt.c +++ b/libc/sock/setsockopt.c @@ -33,15 +33,6 @@ static bool setsockopt_polyfill(int *optname) { return false; } -static textwindows int sys_setsockopt_nt(struct Fd *fd, int level, int optname, - const void *optval, uint32_t optlen) { - if (__sys_setsockopt_nt(fd->handle, level, optname, optval, optlen) != -1) { - return 0; - } else { - return __winsockerr(); - } -} - /** * Modifies socket settings. * diff --git a/libc/sock/sock.h b/libc/sock/sock.h index 5f365c0b6..70567190b 100644 --- a/libc/sock/sock.h +++ b/libc/sock/sock.h @@ -41,8 +41,8 @@ struct sockaddr_in { /* Linux+NT ABI */ }; struct sockaddr_un { - uint16_t sun_family; /* AF_UNIX */ - char sun_path[108];/* path */ + uint16_t sun_family; /* AF_UNIX */ + char sun_path[108]; /* path */ }; struct sockaddr_storage { @@ -53,11 +53,15 @@ struct sockaddr_storage { }; }; -struct ip_mreq { - struct in_addr imr_multiaddr; /* IP multicast address of group */ - struct in_addr imr_interface; /* local IP address of interface */ +struct ip_mreq { + struct in_addr imr_multiaddr; /* IP multicast address of group */ + struct in_addr imr_interface; /* local IP address of interface */ }; +struct linger { /* Linux+XNU+BSD ABI */ + int32_t l_onoff; /* on/off */ + int32_t l_linger; /* seconds */ +}; struct pollfd { int32_t fd; diff --git a/libc/stdio/fflush.c b/libc/stdio/fflush.c index 99a758d92..1750a18f0 100644 --- a/libc/stdio/fflush.c +++ b/libc/stdio/fflush.c @@ -37,7 +37,6 @@ */ int fflush(FILE *f) { size_t i; - ssize_t rc; if (!f) { for (i = __fflush.handles.i; i; --i) { if ((f = __fflush.handles.p[i - 1])) { @@ -45,14 +44,7 @@ int fflush(FILE *f) { } } } else if (f->fd != -1) { - while (f->beg && !f->end && (f->iomode & O_ACCMODE) != O_RDONLY) { - if ((rc = write(f->fd, f->buf, f->beg)) == -1) { - f->state = errno; - return -1; - } - if (rc != f->beg) abort(); - f->beg = 0; - } + if (__fflush_impl(f) == -1) return -1; } else if (f->beg && f->beg < f->size) { f->buf[f->beg] = 0; } diff --git a/libc/stdio/fflushimpl.c b/libc/stdio/fflushimpl.c new file mode 100644 index 000000000..9d6ecea49 --- /dev/null +++ b/libc/stdio/fflushimpl.c @@ -0,0 +1,37 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/calls/calls.h" +#include "libc/errno.h" +#include "libc/stdio/internal.h" +#include "libc/sysv/consts/o.h" + +int __fflush_impl(FILE *f) { + size_t i; + ssize_t rc; + if (f->beg && !f->end && (f->iomode & O_ACCMODE) != O_RDONLY) { + for (i = 0; i < f->beg; i += rc) { + if ((rc = write(f->fd, f->buf + i, f->beg - i)) == -1) { + f->state = errno; + return -1; + } + } + f->beg = 0; + } + return 0; +} diff --git a/libc/stdio/fseeko.c b/libc/stdio/fseeko.c index 67dd33080..8e30f72a9 100644 --- a/libc/stdio/fseeko.c +++ b/libc/stdio/fseeko.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" #include "libc/errno.h" +#include "libc/stdio/internal.h" #include "libc/stdio/stdio.h" #include "libc/sysv/consts/o.h" @@ -38,14 +39,7 @@ int fseeko(FILE *f, int64_t offset, int whence) { ssize_t rc; int64_t pos; if (f->fd != -1) { - if (f->beg && !f->end && (f->iomode & O_ACCMODE) != O_RDONLY) { - if ((rc = write(f->fd, f->buf, f->beg)) == -1) { - f->state = errno; - return -1; - } - if (rc != f->beg) abort(); - f->beg = 0; - } + if (__fflush_impl(f) == -1) return -1; if (whence == SEEK_CUR && f->beg < f->end) { offset -= f->end - f->beg; } diff --git a/libc/stdio/ftello.c b/libc/stdio/ftello.c index 7c6148aca..2b25070cf 100644 --- a/libc/stdio/ftello.c +++ b/libc/stdio/ftello.c @@ -19,6 +19,7 @@ #include "libc/calls/calls.h" #include "libc/errno.h" #include "libc/runtime/runtime.h" +#include "libc/stdio/internal.h" #include "libc/stdio/stdio.h" #include "libc/sysv/consts/o.h" @@ -29,18 +30,10 @@ * @returns current byte offset from beginning, or -1 w/ errno */ int64_t ftello(FILE *f) { - ssize_t rc; int64_t pos; uint32_t skew; if (f->fd != -1) { - if (f->beg && !f->end && (f->iomode & O_ACCMODE) != O_RDONLY) { - if ((rc = write(f->fd, f->buf, f->beg)) == -1) { - f->state = errno; - return -1; - } - if (rc != f->beg) abort(); - f->beg = 0; - } + if (__fflush_impl(f) == -1) return -1; if ((pos = lseek(f->fd, 0, SEEK_CUR)) != -1) { if (f->beg < f->end) pos -= f->end - f->beg; return pos; diff --git a/libc/stdio/fwrite.c b/libc/stdio/fwrite.c index 30f100035..395f0d41f 100644 --- a/libc/stdio/fwrite.c +++ b/libc/stdio/fwrite.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/calls/calls.h" +#include "libc/calls/internal.h" #include "libc/calls/struct/iovec.h" #include "libc/errno.h" #include "libc/fmt/conv.h" @@ -78,12 +79,10 @@ size_t fwrite(const void *data, size_t stride, size_t count, FILE *f) { iov[1].iov_base = data; iov[1].iov_len = n; n += f->beg; - if ((rc = writev(f->fd, iov, 2)) == -1) { + if (WritevUninterruptible(f->fd, iov, 2) == -1) { f->state = errno; return 0; } - m = rc; - if (n != m) abort(); f->beg = 0; return count; } diff --git a/libc/stdio/internal.h b/libc/stdio/internal.h index ba8de1ea6..a4ebd7f51 100644 --- a/libc/stdio/internal.h +++ b/libc/stdio/internal.h @@ -11,6 +11,7 @@ extern char g_stdinbuf[BUFSIZ]; extern char g_stdoutbuf[BUFSIZ]; extern char g_stderrbuf[BUFSIZ]; +int __fflush_impl(FILE *) hidden; int __fflush_register(FILE *) hidden; void __fflush_unregister(FILE *) hidden; diff --git a/libc/stdio/system.c b/libc/stdio/system.c index ef58b0fc3..dd1fee19b 100644 --- a/libc/stdio/system.c +++ b/libc/stdio/system.c @@ -42,7 +42,7 @@ int system(const char *cmdline) { struct sigaction ignore, saveint, savequit; if (!cmdline) { if (IsWindows()) return 1; - if (access(_PATH_BSHELL, X_OK) == 0) return 1; + if (!access(_PATH_BSHELL, X_OK)) return 1; return 0; } ignore.sa_flags = 0; @@ -54,13 +54,13 @@ int system(const char *cmdline) { sigaddset(&chldmask, SIGCHLD); sigprocmask(SIG_BLOCK, &chldmask, &savemask); if (!(pid = fork())) { - sigaction(SIGINT, &saveint, NULL); - sigaction(SIGQUIT, &savequit, NULL); - sigprocmask(SIG_SETMASK, &savemask, NULL); + sigaction(SIGINT, &saveint, 0); + sigaction(SIGQUIT, &savequit, 0); + sigprocmask(SIG_SETMASK, &savemask, 0); systemexec(cmdline); _exit(127); } else if (pid != -1) { - while (wait4(pid, &wstatus, 0, NULL) == -1) { + while (wait4(pid, &wstatus, 0, 0) == -1) { if (errno != EINTR) { wstatus = -1; break; @@ -69,8 +69,8 @@ int system(const char *cmdline) { } else { wstatus = -1; } - sigaction(SIGINT, &saveint, NULL); - sigaction(SIGQUIT, &savequit, NULL); - sigprocmask(SIG_SETMASK, &savemask, NULL); + sigaction(SIGINT, &saveint, 0); + sigaction(SIGQUIT, &savequit, 0); + sigprocmask(SIG_SETMASK, &savemask, 0); return wstatus; } diff --git a/libc/stdio/systemexec.c b/libc/stdio/systemexec.c index cb9b3fd76..70134991a 100644 --- a/libc/stdio/systemexec.c +++ b/libc/stdio/systemexec.c @@ -20,19 +20,28 @@ #include "libc/dce.h" #include "libc/paths.h" #include "libc/runtime/runtime.h" -#include "libc/stdio/stdio.h" #include "libc/str/str.h" +#include "libc/sysv/errfuns.h" /** * Executes system command replacing current process. * @vforksafe */ int systemexec(const char *cmdline) { - char comspec[128]; - const char *prog, *arg; - strcpy(comspec, kNtSystemDirectory); - strcat(comspec, "cmd.exe"); - prog = !IsWindows() ? _PATH_BSHELL : comspec; - arg = !IsWindows() ? "-c" : "/C"; - return execv(prog, (char *const[]){prog, arg, cmdline, NULL}); + size_t n, m; + char *a, *b, *argv[4], comspec[PATH_MAX + 1]; + if (!IsWindows()) { + argv[0] = _PATH_BSHELL; + argv[1] = "-c"; + } else { + b = "cmd.exe"; + a = kNtSystemDirectory; + if ((n = strlen(a)) + (m = strlen(b)) > PATH_MAX) return enametoolong(); + memcpy(mempcpy(comspec, a, n), b, m + 1); + argv[0] = comspec; + argv[1] = "/C"; + } + argv[2] = cmdline; + argv[3] = NULL; + return execv(argv[0], argv); } diff --git a/libc/stdio/vfprintf.c b/libc/stdio/vfprintf.c index cd2c0a2fe..96b354013 100644 --- a/libc/stdio/vfprintf.c +++ b/libc/stdio/vfprintf.c @@ -16,6 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/calls/calls.h" #include "libc/fmt/fmt.h" #include "libc/limits.h" #include "libc/stdio/stdio.h" @@ -26,9 +27,17 @@ struct state { int n; }; -static noinstrument int vfprintfputchar(int c, struct state *st) { - st->n++; - return fputc(c, st->f); +static int vfprintfputchar(const char *s, struct state *t, size_t n) { + if (n) { + if (n == 1 && *s != '\n' && t->f->beg < t->f->size && + t->f->bufmode != _IONBF) { + t->f->buf[t->f->beg++] = *s; + } else if (!fwrite(s, 1, n, t->f)) { + return -1; + } + t->n += n; + } + return 0; } int(vfprintf)(FILE *f, const char *fmt, va_list va) { diff --git a/libc/str/crc32c-pure.c b/libc/str/crc32c-pure.c deleted file mode 100644 index df67d6ee5..000000000 --- a/libc/str/crc32c-pure.c +++ /dev/null @@ -1,79 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/nexgen32e/crc32.h" - -extern const uint32_t kCrc32cTab[256]; - -/** - * Computes Castagnoli CRC-32 on old computers. - */ -uint32_t crc32c_pure(uint32_t init, const void *data, size_t size) { - const unsigned char *p = data; - uint32_t h = init ^ 0xffffffff; - unsigned i; - for (i = 0; i < size; i++) { - h = h >> 8 ^ kCrc32cTab[(h & 0xff) ^ p[i]]; - } - return h ^ 0xffffffff; -} - -/* - bench_crc32c_pure for #c per n where c ≈ 0.293ns - N x1 x8 x64 mBps - ------------------------------------------------------------ - 1 4305.000 91.375 44.203 74 - 1 75.000 55.875 44.703 73 - 2 46.500 35.188 24.617 132 - 3 40.333 26.625 19.193 169 - 4 32.250 19.969 16.215 200 - 7 18.429 15.089 12.033 270 - 8 20.625 13.547 11.607 280 - 15 15.667 10.775 9.589 339 - 16 17.562 10.695 9.419 345 - 31 12.226 8.891 8.317 391 - 32 13.219 8.480 8.078 402 - 63 9.571 8.065 7.731 420 - 64 9.672 7.955 7.633 426 - 127 8.433 7.548 7.329 443 - 128 8.492 7.528 7.352 442 - 255 7.557 7.366 7.239 449 - 256 7.699 7.342 7.305 445 - 511 7.376 7.243 7.223 450 - 512 7.408 7.233 7.225 450 - 1023 7.188 7.192 7.098 458 - 1024 7.171 7.194 7.097 458 - 2047 7.130 7.172 7.085 459 - 2048 7.117 7.170 7.169 453 - 4095 7.063 7.076 7.085 459 - 4096 7.078 7.161 7.081 459 - 8191 7.041 7.095 7.055 461 - 8192 7.051 7.098 7.087 459 - 16383 7.039 7.114 7.067 460 - 16384 6.876 6.931 7.133 456 - 32767 7.055 7.108 7.290 446 - 32768 6.868 6.887 6.974 466 - 65535 6.984 6.885 6.967 467 - 65536 6.877 6.924 10.994 296 - 131071 7.166 7.141 7.011 464 - 131072 6.853 6.971 7.694 422 - 262143 6.853 7.213 7.406 439 - 262144 6.852 6.968 7.290 446 - 524287 7.398 7.389 7.166 454 - 524288 6.851 7.094 7.159 454 -*/ diff --git a/libc/str/crc32c-sse42.c b/libc/str/crc32c-sse42.c deleted file mode 100644 index 7cb706974..000000000 --- a/libc/str/crc32c-sse42.c +++ /dev/null @@ -1,95 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/str/internal.h" - -/** - * Hashes data with hardware acceleration at 10GBps. - * @note needs Nehalem+ c. 2008 or Bulldozer+ c. 2011 - */ -optimizespeed uint32_t crc32c_sse42(uint32_t init, const void *data, size_t n) { - const unsigned char *p = (const unsigned char *)data; - const unsigned char *pe = (const unsigned char *)data + n; - uint32_t h = init ^ 0xffffffff; - if (n >= 16 + 8) { - while ((uintptr_t)p & 7) asm("crc32b\t%1,%0" : "+r"(h) : "rm"(*p++)); - uint64_t hl = h; - while (p < pe - 16ul) { - asm("crc32q\t%1,%0" : "+r"(hl) : "rm"(*(const uint64_t *)p)); - p += 8; - asm("crc32q\t%1,%0" : "+r"(hl) : "rm"(*(const uint64_t *)p)); - p += 8; - } - h = (uint32_t)hl; - } - while (p < pe) asm("crc32b\t%1,%0" : "+r"(h) : "rm"(*p++)); - return h ^ 0xffffffff; -} - -/* - bench_crc32c_sse42 for #c per n where c ≈ 0.293ns - N x1 x8 x64 mBps - ------------------------------------------------------------ - 1 877.000 43.375 40.359 81 - 1 45.000 39.625 40.484 80 - 2 34.500 27.562 20.461 159 - 3 23.000 16.708 14.245 228 - 4 18.250 13.094 11.449 284 - 7 10.429 8.339 8.185 397 - 8 42.125 8.734 6.850 475 - 15 9.400 5.375 4.884 665 - 16 7.312 5.070 4.882 666 - 31 5.258 2.923 2.680 1213 - 32 3.969 2.676 2.562 1269 - 63 3.095 1.581 1.428 2276 - 64 2.234 1.623 1.478 2199 - 127 1.205 0.901 0.900 3610 - 128 1.164 0.960 0.915 3552 - 255 0.922 0.651 0.618 5260 - 256 0.715 0.650 0.609 5341 - 511 0.558 0.482 0.477 6819 - 512 0.529 0.475 0.469 6932 - 1023 0.425 0.400 0.396 8204 - 1024 0.417 0.392 0.388 8383 - 2047 0.367 0.355 0.353 9199 - 2048 0.374 0.366 0.364 8929 - 4095 0.351 0.338 0.337 9644 - 4096 0.353 0.338 0.338 9624 - 8191 0.335 0.338 0.337 9641 - 8192 0.335 0.329 0.329 9870 - 16383 0.336 0.325 0.325 10011 - 16384 0.336 0.326 0.375 8666 - 32767 0.329 0.323 0.323 10070 - 32768 0.327 0.324 0.323 10062 - 65535 0.322 0.322 0.322 10103 - 65536 0.321 0.322 0.322 10102 - 131071 0.322 0.321 0.321 10125 - 131072 0.321 0.321 0.321 10124 - 262143 0.322 0.321 0.335 9699 - 262144 0.321 0.321 0.321 10134 - 524287 0.321 0.321 0.499 6516 - 524288 0.321 0.321 0.339 9575 - 1048575 0.322 0.321 0.322 10095 - 1048576 0.320 1.001 0.323 10048 - 2097151 0.325 0.321 0.322 10086 - 2097152 0.330 0.320 0.323 10076 - 4194303 0.331 0.322 0.321 10128 - 4194304 0.332 0.321 0.325 10004 - 8388607 0.334 0.332 0.331 9829 - 8388608 0.334 0.329 0.327 9934 -*/ diff --git a/libc/str/crc32c.S b/libc/str/crc32c.S deleted file mode 100644 index 85af9effd..000000000 --- a/libc/str/crc32c.S +++ /dev/null @@ -1,43 +0,0 @@ -/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8 -*-│ -│vi: set et ft=asm ts=8 tw=8 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/dce.h" -#include "libc/macros.internal.h" -#include "libc/nexgen32e/x86feature.h" -#include "libc/notice.inc" - -// Computes 32-bit Castagnoli Cyclic Redundancy Check. -// -// @param edi is the initial hash value (0 is fine) -// @param rsi points to the data -// @param rdx is the byte size of data -// @return eax is the new hash value -// @note Used by ISCSI, TensorFlow, etc. - .initbss 300,_init_crc32c -crc32c: .quad 0 - .endobj crc32c,globl - .previous - - .init.start 300,_init_crc32c - ezlea crc32c_pure,ax - ezlea crc32c_sse42,cx - testb X86_HAVE(SSE4_2)+kCpuids(%rip) - cmovnz %rcx,%rax - stosq - .init.end 300,_init_crc32c - .source __FILE__ diff --git a/libc/str/crc32c.c b/libc/str/crc32c.c new file mode 100644 index 000000000..b41b9340e --- /dev/null +++ b/libc/str/crc32c.c @@ -0,0 +1,50 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/nexgen32e/crc32.h" +#include "libc/nexgen32e/x86feature.h" + +/** + * Computes 32-bit Castagnoli Cyclic Redundancy Check. + * + * @param init is the initial hash value + * @param data points to the data + * @param size is the byte size of data + * @return eax is the new hash value + * @note Used by ISCSI, TensorFlow, etc. + */ +uint32_t crc32c(uint32_t init, const void *data, size_t size) { + uint64_t h; + const unsigned char *p, *pe; + p = data; + pe = p + size; + h = init ^ 0xffffffff; + if (X86_HAVE(SSE4_2)) { + for (; p + 8 <= pe; p += 8) { + asm("crc32q\t%1,%0" : "+r"(h) : "rm"(*(const uint64_t *)p)); + } + while (p < pe) { + asm("crc32b\t%1,%0" : "+r"(h) : "rm"(*p++)); + } + } else { + while (p < pe) { + h = h >> 8 ^ kCrc32cTab[(h & 0xff) ^ *p++]; + } + } + return h ^ 0xffffffff; +} diff --git a/libc/str/getzipcdir.c b/libc/str/getzipcdir.c new file mode 100644 index 000000000..18d1d956e --- /dev/null +++ b/libc/str/getzipcdir.c @@ -0,0 +1,53 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/zip.h" + +/** + * Locates End Of Central Directory record in ZIP file. + * + * The ZIP spec says this header can be anywhere in the last 64kb. + * We search it backwards for the ZIP-64 "PK♠♠" magic number. If that's + * not found, then we search again for the original "PK♣♠" magnum. The + * caller needs to check the first four bytes of the returned value to + * determine whether to use ZIP_CDIR_xxx() or ZIP_CDIR64_xxx() macros. + * + * @param p points to file memory + * @param n is byte size of file + * @return pointer to EOCD64 or EOCD, or NULL if not found + */ +uint8_t *GetZipCdir(const uint8_t *p, size_t n) { + size_t i, j; + if (n >= kZipCdirHdrMinSize) { + i = n - kZipCdirHdrMinSize; + do { + if (READ32LE(p + i) == kZipCdir64HdrMagic && IsZipCdir64(p, n, i)) { + return (/*unconst*/ uint8_t *)(p + i); + } else if (READ32LE(p + i) == kZipCdirHdrMagic && IsZipCdir32(p, n, i)) { + j = i; + do { + if (READ32LE(p + j) == kZipCdir64HdrMagic && IsZipCdir64(p, n, j)) { + return (/*unconst*/ uint8_t *)(p + j); + } + } while (j-- && i - j < 64 * 1024); + return (/*unconst*/ uint8_t *)(p + i); + } + } while (i--); + } + return NULL; +} diff --git a/test/net/http/urischeme_test.c b/libc/str/getzipcdircomment.c similarity index 83% rename from test/net/http/urischeme_test.c rename to libc/str/getzipcdircomment.c index 80a3dc53c..cefd8ab82 100644 --- a/test/net/http/urischeme_test.c +++ b/libc/str/getzipcdircomment.c @@ -1,7 +1,7 @@ /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ │vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ ╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ │ │ │ Permission to use, copy, modify, and/or distribute this software for │ │ any purpose with or without fee is hereby granted, provided that the │ @@ -16,14 +16,15 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/testlib/ezbench.h" -#include "libc/testlib/testlib.h" -#include "net/http/uri.h" +#include "libc/zip.h" -TEST(urischeme, test) { - EXPECT_EQ(kUriSchemeSip, urischeme((struct UriSlice){0, 3}, "sips")); -} - -BENCH(urischeme, bench) { - EZBENCH(donothing, urischeme((struct UriSlice){0, 3}, "sips")); +/** + * Returns comment of zip central directory. + */ +void *GetZipCdirComment(const uint8_t *eocd) { + if (READ32LE(eocd) == kZipCdir64HdrMagic) { + return ZIP_CDIR64_COMMENT(eocd); + } else { + return ZIP_CDIR_COMMENT(eocd); + } } diff --git a/net/http/uripath.c b/libc/str/getzipcdircommentsize.c similarity index 83% rename from net/http/uripath.c rename to libc/str/getzipcdircommentsize.c index 882e27f5f..6741fadac 100644 --- a/net/http/uripath.c +++ b/libc/str/getzipcdircommentsize.c @@ -1,7 +1,7 @@ /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ │vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ ╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ │ │ │ Permission to use, copy, modify, and/or distribute this software for │ │ any purpose with or without fee is hereby granted, provided that the │ @@ -16,15 +16,15 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "net/http/uri.h" +#include "libc/zip.h" -struct UriSlice uripath(const struct Uri *uri) { - if (uri->segs.i) { - return (struct UriSlice){ - uri->segs.p[0].i, - (uri->segs.p[uri->segs.i - 1].n + - (uri->segs.p[uri->segs.i - 1].i - uri->segs.p[0].i))}; +/** + * Returns comment of zip central directory. + */ +uint64_t GetZipCdirCommentSize(const uint8_t *eocd) { + if (READ32LE(eocd) == kZipCdir64HdrMagic) { + return ZIP_CDIR64_COMMENTSIZE(eocd); } else { - return (struct UriSlice){0, 0}; + return ZIP_CDIR_COMMENTSIZE(eocd); } } diff --git a/net/http/urischeme.c b/libc/str/getzipcdiroffset.c similarity index 78% rename from net/http/urischeme.c rename to libc/str/getzipcdiroffset.c index fa88868d7..c50ff6d7a 100644 --- a/net/http/urischeme.c +++ b/libc/str/getzipcdiroffset.c @@ -1,7 +1,7 @@ /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ │vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ ╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ │ │ │ Permission to use, copy, modify, and/or distribute this software for │ │ any purpose with or without fee is hereby granted, provided that the │ @@ -16,20 +16,15 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "net/http/geturischeme.inc" -#include "net/http/uri.h" +#include "libc/zip.h" /** - * Returns nonzero numeric code for resource paradigms we like. - * - * Lookups are case-insensitive and performed using a hash table that's - * literally perfect. + * Returns offset of zip central directory. */ -enum UriScheme urischeme(struct UriSlice scheme, const char *str) { - const struct UriSchemeSlot *slot; - if ((slot = in_word_set(str + scheme.i, scheme.n))) { - return slot->code; +uint64_t GetZipCdirOffset(const uint8_t *eocd) { + if (READ32LE(eocd) == kZipCdir64HdrMagic) { + return ZIP_CDIR64_OFFSET(eocd); } else { - return 0; + return ZIP_CDIR_OFFSET(eocd); } } diff --git a/libc/str/getzipcdirrecords.c b/libc/str/getzipcdirrecords.c new file mode 100644 index 000000000..722bd31d8 --- /dev/null +++ b/libc/str/getzipcdirrecords.c @@ -0,0 +1,30 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/zip.h" + +/** + * Returns number of records in zip central directory. + */ +uint64_t GetZipCdirRecords(const uint8_t *eocd) { + if (READ32LE(eocd) == kZipCdir64HdrMagic) { + return ZIP_CDIR64_RECORDS(eocd); + } else { + return ZIP_CDIR_RECORDS(eocd); + } +} diff --git a/libc/str/getzipcfilecompressedsize.c b/libc/str/getzipcfilecompressedsize.c new file mode 100644 index 000000000..9391bcce7 --- /dev/null +++ b/libc/str/getzipcfilecompressedsize.c @@ -0,0 +1,37 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/zip.h" + +/** + * Returns compressed size in bytes from zip central directory header. + */ +uint64_t GetZipCfileCompressedSize(const uint8_t *z) { + uint64_t x; + const uint8_t *p, *pe; + if ((x = ZIP_CFILE_COMPRESSEDSIZE(z)) == 0xFFFFFFFF) { + for (p = ZIP_CFILE_EXTRA(z), pe = p + ZIP_CFILE_EXTRASIZE(z); p < pe; + p += ZIP_EXTRA_SIZE(p)) { + if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64 && + 8 + 8 <= ZIP_EXTRA_CONTENTSIZE(p)) { + return READ64LE(ZIP_EXTRA_CONTENT(p) + 8); + } + } + } + return x; +} diff --git a/libc/str/getzipcfilemode.c b/libc/str/getzipcfilemode.c new file mode 100644 index 000000000..7a51b551d --- /dev/null +++ b/libc/str/getzipcfilemode.c @@ -0,0 +1,47 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/nt/enum/fileflagandattributes.h" +#include "libc/sysv/consts/s.h" +#include "libc/zip.h" + +static int ConvertWindowsToUnixMode(int x) { + int m; + if (x & kNtFileAttributeReadonly) { + m = 0444; + } else { + m = 0644; + } + if (x & kNtFileAttributeDirectory) { + m |= S_IFDIR | 0111; + } else { + m |= S_IFREG; + } + return m; +} + +/** + * Returns st_mode from ZIP central directory record. + */ +int GetZipCfileMode(const uint8_t *p) { + if (ZIP_CFILE_FILEATTRCOMPAT(p) == kZipOsUnix) { + return ZIP_CFILE_EXTERNALATTRIBUTES(p) >> 16; + } else { + return ConvertWindowsToUnixMode(ZIP_CFILE_EXTERNALATTRIBUTES(p)); + } +} diff --git a/libc/str/getzipcfileoffset.c b/libc/str/getzipcfileoffset.c new file mode 100644 index 000000000..59f519fb3 --- /dev/null +++ b/libc/str/getzipcfileoffset.c @@ -0,0 +1,37 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/zip.h" + +/** + * Returns offset of local file header. + */ +uint64_t GetZipCfileOffset(const uint8_t *z) { + uint64_t x; + const uint8_t *p, *pe; + if ((x = ZIP_CFILE_OFFSET(z)) == 0xFFFFFFFF) { + for (p = ZIP_CFILE_EXTRA(z), pe = p + ZIP_CFILE_EXTRASIZE(z); p < pe; + p += ZIP_EXTRA_SIZE(p)) { + if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64 && + 16 + 8 <= ZIP_EXTRA_CONTENTSIZE(p)) { + return READ64LE(ZIP_EXTRA_CONTENT(p) + 16); + } + } + } + return x; +} diff --git a/libc/str/getzipcfileuncompressedsize.c b/libc/str/getzipcfileuncompressedsize.c new file mode 100644 index 000000000..0db56764b --- /dev/null +++ b/libc/str/getzipcfileuncompressedsize.c @@ -0,0 +1,37 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/zip.h" + +/** + * Returns uncompressed size in bytes from zip central directory header. + */ +uint64_t GetZipCfileUncompressedSize(const uint8_t *z) { + uint64_t x; + const uint8_t *p, *pe; + if ((x = ZIP_CFILE_UNCOMPRESSEDSIZE(z)) == 0xFFFFFFFF) { + for (p = ZIP_CFILE_EXTRA(z), pe = p + ZIP_CFILE_EXTRASIZE(z); p < pe; + p += ZIP_EXTRA_SIZE(p)) { + if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64 && + 0 + 8 <= ZIP_EXTRA_CONTENTSIZE(p)) { + return READ64LE(ZIP_EXTRA_CONTENT(p) + 0); + } + } + } + return x; +} diff --git a/libc/str/getziplfilecompressedsize.c b/libc/str/getziplfilecompressedsize.c new file mode 100644 index 000000000..e2b978333 --- /dev/null +++ b/libc/str/getziplfilecompressedsize.c @@ -0,0 +1,37 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/zip.h" + +/** + * Returns compressed size in bytes from zip local file header. + */ +uint64_t GetZipLfileCompressedSize(const uint8_t *z) { + uint64_t x; + const uint8_t *p, *pe; + if ((x = ZIP_LFILE_COMPRESSEDSIZE(z)) == 0xFFFFFFFF) { + for (p = ZIP_LFILE_EXTRA(z), pe = p + ZIP_LFILE_EXTRASIZE(z); p < pe; + p += ZIP_EXTRA_SIZE(p)) { + if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64 && + 8 + 8 <= ZIP_EXTRA_CONTENTSIZE(p)) { + return READ64LE(ZIP_EXTRA_CONTENT(p) + 8); + } + } + } + return x; +} diff --git a/libc/str/getziplfileuncompressedsize.c b/libc/str/getziplfileuncompressedsize.c new file mode 100644 index 000000000..2afb9deea --- /dev/null +++ b/libc/str/getziplfileuncompressedsize.c @@ -0,0 +1,38 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/zip.h" + +/** + * Returns uncompressed size in bytes from zip local file header. + */ +uint64_t GetZipLfileUncompressedSize(const uint8_t *z) { + uint64_t x; + const uint8_t *p, *pe; + x = ZIP_LFILE_UNCOMPRESSEDSIZE(z); + if (x == 0xFFFFFFFF) { + for (p = ZIP_LFILE_EXTRA(z), pe = p + ZIP_LFILE_EXTRASIZE(z); p < pe; + p += ZIP_EXTRA_SIZE(p)) { + if (ZIP_EXTRA_HEADERID(p) == kZipExtraZip64 && + 0 + 8 <= ZIP_EXTRA_CONTENTSIZE(p)) { + return READ64LE(ZIP_EXTRA_CONTENT(p) + 0); + } + } + } + return x; +} diff --git a/libc/str/iszipcdir32.c b/libc/str/iszipcdir32.c new file mode 100644 index 000000000..27382a230 --- /dev/null +++ b/libc/str/iszipcdir32.c @@ -0,0 +1,38 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/bits/bits.h" +#include "libc/zip.h" + +/** + * Returns true if zip end of central directory header seems legit. + */ +bool IsZipCdir32(const uint8_t *p, size_t n, size_t i) { + if (i > n || n - i < kZipCdirHdrMinSize) return false; + if (READ32LE(p + i) != kZipCdirHdrMagic) return false; + if (i + ZIP_CDIR_HDRSIZE(p + i) > n) return false; + if (ZIP_CDIR_DISK(p + i) != ZIP_CDIR_STARTINGDISK(p + i)) return false; + if (ZIP_CDIR_RECORDSONDISK(p + i) != ZIP_CDIR_RECORDS(p + i)) return false; + if (ZIP_CDIR_RECORDS(p + i) * kZipCfileHdrMinSize > ZIP_CDIR_SIZE(p + i)) { + return false; + } + if (ZIP_CDIR_OFFSET(p + i) + ZIP_CDIR_SIZE(p + i) > i) { + return false; + } + return true; +} diff --git a/libc/str/iszipcdir64.c b/libc/str/iszipcdir64.c new file mode 100644 index 000000000..ca18dcee2 --- /dev/null +++ b/libc/str/iszipcdir64.c @@ -0,0 +1,41 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/bits/bits.h" +#include "libc/zip.h" + +/** + * Returns true if zip64 end of central directory header seems legit. + */ +bool IsZipCdir64(const uint8_t *p, size_t n, size_t i) { + if (i > n || n - i < kZipCdir64HdrMinSize) return false; + if (READ32LE(p + i) != kZipCdir64HdrMagic) return false; + if (i + ZIP_CDIR64_HDRSIZE(p + i) > n) return false; + if (ZIP_CDIR64_DISK(p + i) != ZIP_CDIR64_STARTINGDISK(p + i)) return false; + if (ZIP_CDIR64_RECORDSONDISK(p + i) != ZIP_CDIR64_RECORDS(p + i)) { + return false; + } + if (ZIP_CDIR64_RECORDS(p + i) * kZipCfileHdrMinSize > + ZIP_CDIR64_SIZE(p + i)) { + return false; + } + if (ZIP_CDIR64_OFFSET(p + i) + ZIP_CDIR64_SIZE(p + i) > i) { + return false; + } + return true; +} diff --git a/libc/str/memccpy.c b/libc/str/memccpy.c index adcd21eec..708a85fe5 100644 --- a/libc/str/memccpy.c +++ b/libc/str/memccpy.c @@ -16,12 +16,14 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/bits/bits.h" #include "libc/str/str.h" static inline noasan uint64_t UncheckedAlignedRead64(unsigned char *p) { - return (uint64_t)p[7] << 070 | (uint64_t)p[6] << 060 | (uint64_t)p[5] << 050 | - (uint64_t)p[4] << 040 | (uint64_t)p[3] << 030 | (uint64_t)p[2] << 020 | - (uint64_t)p[1] << 010 | (uint64_t)p[0] << 000; + return (uint64_t)(255 & p[7]) << 070 | (uint64_t)(255 & p[6]) << 060 | + (uint64_t)(255 & p[5]) << 050 | (uint64_t)(255 & p[4]) << 040 | + (uint64_t)(255 & p[3]) << 030 | (uint64_t)(255 & p[2]) << 020 | + (uint64_t)(255 & p[1]) << 010 | (uint64_t)(255 & p[0]) << 000; } /** diff --git a/libc/str/stpcpy.c b/libc/str/stpcpy.c index 0b5208189..1cf3915d4 100644 --- a/libc/str/stpcpy.c +++ b/libc/str/stpcpy.c @@ -20,7 +20,7 @@ #include "libc/intrin/pmovmskb.h" #include "libc/str/str.h" -static noasan size_t stpcpy_sse2(char *d, const char *s, size_t i) { +static inline noasan size_t stpcpy_sse2(char *d, const char *s, size_t i) { uint8_t v1[16], v2[16], vz[16]; for (;;) { memset(vz, 0, 16); diff --git a/libc/str/str.h b/libc/str/str.h index 090f469b1..e22105bfa 100644 --- a/libc/str/str.h +++ b/libc/str/str.h @@ -3,7 +3,7 @@ #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ /*───────────────────────────────────────────────────────────────────────────│─╗ -│ cosmopolitan § characters » asa x3.4-1967 ─╬─│┼ +│ cosmopolitan § characters » usas x3.4-1967 ─╬─│┼ ╚────────────────────────────────────────────────────────────────────────────│─╝ fourth age telecommunications */ diff --git a/libc/str/strcasecmp16.c b/libc/str/strcasecmp16.c index 663265ba6..5f3869e69 100644 --- a/libc/str/strcasecmp16.c +++ b/libc/str/strcasecmp16.c @@ -29,6 +29,6 @@ int strcasecmp16(const char16_t *l, const char16_t *r) { int x, y; size_t i = 0; - while ((x = tolower(l[i])) == (y = tolower(r[i])) && r[i]) ++i; + while ((x = towlower(l[i])) == (y = towlower(r[i])) && r[i]) ++i; return x - y; } diff --git a/libc/str/strchrnul.c b/libc/str/strchrnul.c index 09c4f738b..cde51302f 100644 --- a/libc/str/strchrnul.c +++ b/libc/str/strchrnul.c @@ -19,14 +19,14 @@ #include "libc/assert.h" #include "libc/str/str.h" -noasan static const unsigned char *strchrnul_x64(const unsigned char *p, - uint64_t c) { +noasan static const char *strchrnul_x64(const char *p, uint64_t c) { unsigned a, b; uint64_t w, x, y; for (c *= 0x0101010101010101;; p += 8) { - w = (uint64_t)p[7] << 070 | (uint64_t)p[6] << 060 | (uint64_t)p[5] << 050 | - (uint64_t)p[4] << 040 | (uint64_t)p[3] << 030 | (uint64_t)p[2] << 020 | - (uint64_t)p[1] << 010 | (uint64_t)p[0] << 000; + w = (uint64_t)(255 & p[7]) << 070 | (uint64_t)(255 & p[6]) << 060 | + (uint64_t)(255 & p[5]) << 050 | (uint64_t)(255 & p[4]) << 040 | + (uint64_t)(255 & p[3]) << 030 | (uint64_t)(255 & p[2]) << 020 | + (uint64_t)(255 & p[1]) << 010 | (uint64_t)(255 & p[0]) << 000; if ((x = ~(w ^ c) & ((w ^ c) - 0x0101010101010101) & 0x8080808080808080) | (y = ~w & (w - 0x0101010101010101) & 0x8080808080808080)) { if (x) { @@ -59,11 +59,11 @@ noasan static const unsigned char *strchrnul_x64(const unsigned char *p, */ char *strchrnul(const char *s, int c) { char *r; - for (c &= 0xff; (uintptr_t)s & 7; ++s) { + for (c &= 255; (uintptr_t)s & 7; ++s) { if ((*s & 0xff) == c) return s; if (!*s) return s; } - r = (char *)strchrnul_x64((const unsigned char *)s, c); - assert((*r & 0xff) == c || !*r); + r = strchrnul_x64(s, c); + assert((*r & 255) == c || !*r); return r; } diff --git a/libc/str/strcmp.c b/libc/str/strcmp.c index 53cc44cf5..0917ecac2 100644 --- a/libc/str/strcmp.c +++ b/libc/str/strcmp.c @@ -18,10 +18,11 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" -static inline noasan uint64_t UncheckedAlignedRead64(unsigned char *p) { - return (uint64_t)p[7] << 070 | (uint64_t)p[6] << 060 | (uint64_t)p[5] << 050 | - (uint64_t)p[4] << 040 | (uint64_t)p[3] << 030 | (uint64_t)p[2] << 020 | - (uint64_t)p[1] << 010 | (uint64_t)p[0] << 000; +static inline noasan uint64_t UncheckedAlignedRead64(const char *p) { + return (uint64_t)(255 & p[7]) << 070 | (uint64_t)(255 & p[6]) << 060 | + (uint64_t)(255 & p[5]) << 050 | (uint64_t)(255 & p[4]) << 040 | + (uint64_t)(255 & p[3]) << 030 | (uint64_t)(255 & p[2]) << 020 | + (uint64_t)(255 & p[1]) << 010 | (uint64_t)(255 & p[0]) << 000; } /** diff --git a/libc/str/strlen-pure.c b/libc/str/strlen-pure.c index 6df045f16..8463fce55 100644 --- a/libc/str/strlen-pure.c +++ b/libc/str/strlen-pure.c @@ -17,20 +17,15 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" +#include "libc/bits/bits.h" #include "libc/str/str.h" static noasan size_t strlen_pure_x64(const char *s, size_t i) { uint64_t w; - const unsigned char *p; - for (;;) { - p = (const unsigned char *)s + i; - w = (uint64_t)p[7] << 070 | (uint64_t)p[6] << 060 | (uint64_t)p[5] << 050 | - (uint64_t)p[4] << 040 | (uint64_t)p[3] << 030 | (uint64_t)p[2] << 020 | - (uint64_t)p[1] << 010 | (uint64_t)p[0] << 000; + for (;; i += 8) { + w = READ64LE(s + i); if ((w = ~w & (w - 0x0101010101010101) & 0x8080808080808080)) { return i + ((unsigned)__builtin_ctzll(w) >> 3); - } else { - i += 8; } } } diff --git a/libc/str/strnlen.c b/libc/str/strnlen.c index 61b326f18..f07286a36 100644 --- a/libc/str/strnlen.c +++ b/libc/str/strnlen.c @@ -17,16 +17,13 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/assert.h" +#include "libc/bits/bits.h" #include "libc/str/str.h" static noasan size_t strnlen_x64(const char *s, size_t n, size_t i) { uint64_t w; - const unsigned char *p; for (; i + 8 < n; i += 8) { - p = (const unsigned char *)s + i; - w = (uint64_t)p[7] << 070 | (uint64_t)p[6] << 060 | (uint64_t)p[5] << 050 | - (uint64_t)p[4] << 040 | (uint64_t)p[3] << 030 | (uint64_t)p[2] << 020 | - (uint64_t)p[1] << 010 | (uint64_t)p[0] << 000; + w = READ64LE(s + i); if ((w = ~w & (w - 0x0101010101010101) & 0x8080808080808080)) { i += (unsigned)__builtin_ctzll(w) >> 3; break; diff --git a/libc/str/tprecode8to16.c b/libc/str/tprecode8to16.c index 7d9956659..f06e7d104 100644 --- a/libc/str/tprecode8to16.c +++ b/libc/str/tprecode8to16.c @@ -25,8 +25,8 @@ #include "libc/str/utf16.h" /* 34x speedup for ascii */ -static noasan axdx_t tprecode8to16_sse2(char16_t *dst, size_t dstsize, - const char *src, axdx_t r) { +static inline noasan axdx_t tprecode8to16_sse2(char16_t *dst, size_t dstsize, + const char *src, axdx_t r) { uint8_t v1[16], v2[16], vz[16]; memset(vz, 0, 16); while (r.ax + 16 < dstsize) { @@ -54,26 +54,25 @@ static noasan axdx_t tprecode8to16_sse2(char16_t *dst, size_t dstsize, */ axdx_t tprecode8to16(char16_t *dst, size_t dstsize, const char *src) { axdx_t r; - unsigned n; - uint64_t w; - wint_t x, y; + unsigned w; + int x, y, a, b, i, n; r.ax = 0; r.dx = 0; for (;;) { - /* TODO(jart): Why is it now so much slower refactored? */ - /* if (!IsTiny() && !((uintptr_t)(src + r.dx) & 15)) { */ - /* tprecode8to16_sse2(dst, dstsize, src, r); */ - /* } */ - x = src[r.dx++] & 0xff; - if (ThomPikeCont(x)) continue; - if (!isascii(x)) { - n = ThomPikeLen(x); - x = ThomPikeByte(x); - while (--n) { - if ((y = src[r.dx++] & 0xff)) { - x = ThomPikeMerge(x, y); - } else { - x = 0; + if (!IsTiny() && !((uintptr_t)(src + r.dx) & 15)) { + r = tprecode8to16_sse2(dst, dstsize, src, r); + } + x = src[r.dx++] & 0377; + if (x >= 0300) { + a = ThomPikeByte(x); + n = ThomPikeLen(x) - 1; + for (i = 0;;) { + if (!(b = src[r.dx + i] & 0377)) break; + if (!ThomPikeCont(b)) break; + a = ThomPikeMerge(a, b); + if (++i == n) { + r.dx += i; + x = a; break; } } @@ -81,7 +80,7 @@ axdx_t tprecode8to16(char16_t *dst, size_t dstsize, const char *src) { if (!x) break; w = EncodeUtf16(x); while (w && r.ax + 1 < dstsize) { - dst[r.ax++] = w & 0xFFFF; + dst[r.ax++] = w; w >>= 16; } } diff --git a/libc/str/undeflate.c b/libc/str/undeflate.c index d849417d2..60b165efa 100644 --- a/libc/str/undeflate.c +++ b/libc/str/undeflate.c @@ -104,7 +104,7 @@ static struct DeflateHold undeflatesymbol(struct DeflateHold hold, uint32_t search, key; left = 0; right = treecount; - search = bitreverse16(hold.word); + search = BITREVERSE16(hold.word); search <<= 16; search |= 0xffff; while (left < right) { /* TODO(jart): Make this O(1) like Zlib. */ diff --git a/libc/str/utf16.h b/libc/str/utf16.h index 7bc999f7d..0e8e391d7 100644 --- a/libc/str/utf16.h +++ b/libc/str/utf16.h @@ -11,15 +11,15 @@ COSMOPOLITAN_C_START_ #define IsUcs2(wc) (((wc)&UTF16_MASK) != UTF16_MOAR) #define IsUtf16Cont(wc) (((wc)&UTF16_MASK) == UTF16_CONT) #define MergeUtf16(lo, hi) ((((lo)-0xD800) << 10) + ((hi)-0xDC00) + 0x10000) -#define EncodeUtf16(wc) \ - (__builtin_expect(((0x0000 <= (wc) && (wc) <= 0xFFFF) || \ - (0xE000 <= (wc) && (wc) <= 0xFFFF)), \ - 1) \ - ? (wc) \ - : 0x10000 <= (wc) && (wc) <= 0x10FFFF \ - ? (((((wc)-0x10000) >> 10) + 0xD800) | \ - ((((wc)-0x10000) & 1023) + 0xDC00) << 16) \ - : 0xFFFD) +#define EncodeUtf16(wc) \ + (__builtin_expect(((0x0000 <= (wc) && (wc) <= 0xFFFF) || \ + (0xE000 <= (wc) && (wc) <= 0xFFFF)), \ + 1) \ + ? (wc) \ + : 0x10000 <= (wc) && (wc) <= 0x10FFFF \ + ? (((((wc)-0x10000) >> 10) + 0xD800) | \ + (unsigned)((((wc)-0x10000) & 1023) + 0xDC00) << 16) \ + : 0xFFFD) COSMOPOLITAN_C_END_ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ diff --git a/libc/str/zipfindcentraldir.c b/libc/str/zipfindcentraldir.c index 431a75ea1..42a966d66 100644 --- a/libc/str/zipfindcentraldir.c +++ b/libc/str/zipfindcentraldir.c @@ -18,6 +18,8 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/zip.h" +/* TODO(jart): DELETE */ + /** * Locates End Of Central Directory record in ZIP file. * @@ -36,13 +38,7 @@ uint8_t *zipfindcentraldir(const uint8_t *p, size_t n) { if (n >= kZipCdirHdrMinSize) { i = n - kZipCdirHdrMinSize; do { - if (ZIP_CDIR_MAGIC(p + i) == kZipCdirHdrMagic && - i + ZIP_CDIR_HDRSIZE(p + i) <= n && - ZIP_CDIR_DISK(p + i) == ZIP_CDIR_STARTINGDISK(p + i) && - ZIP_CDIR_RECORDSONDISK(p + i) == ZIP_CDIR_RECORDS(p + i) && - ZIP_CDIR_RECORDS(p + i) * kZipCdirHdrMinSize <= - ZIP_CDIR_SIZE(p + i) && - ZIP_CDIR_OFFSET(p + i) + ZIP_CDIR_SIZE(p + i) <= i) { + if (ZIP_CDIR_MAGIC(p + i) == kZipCdirHdrMagic && IsZipCdir32(p, n, i)) { return (/*unconst*/ uint8_t *)(p + i); } } while (i--); diff --git a/libc/sysv/calls/__sys_getrusage.s b/libc/sysv/calls/__sys_getrusage.s new file mode 100644 index 000000000..49b33c68d --- /dev/null +++ b/libc/sysv/calls/__sys_getrusage.s @@ -0,0 +1,2 @@ +.include "o/libc/sysv/macros.internal.inc" +.scall __sys_getrusage,0x1bd0130752075062,globl,hidden diff --git a/libc/sysv/calls/__sys_mremap.s b/libc/sysv/calls/__sys_mremap.s new file mode 100644 index 000000000..9e32e0e10 --- /dev/null +++ b/libc/sysv/calls/__sys_mremap.s @@ -0,0 +1,2 @@ +.include "o/libc/sysv/macros.internal.inc" +.scall __sys_mremap,0x19bffffffffff019,globl,hidden diff --git a/libc/sysv/calls/__sys_wait4.s b/libc/sysv/calls/__sys_wait4.s new file mode 100644 index 000000000..15180408c --- /dev/null +++ b/libc/sysv/calls/__sys_wait4.s @@ -0,0 +1,2 @@ +.include "o/libc/sysv/macros.internal.inc" +.scall __sys_wait4,0x1c100b007200703d,globl,hidden diff --git a/libc/sysv/calls/rt_sigqueueinfo.s b/libc/sysv/calls/rt_sigqueueinfo.s deleted file mode 100644 index 0b821b76e..000000000 --- a/libc/sysv/calls/rt_sigqueueinfo.s +++ /dev/null @@ -1,2 +0,0 @@ -.include "o/libc/sysv/macros.internal.inc" -.scall rt_sigqueueinfo,0xfffffffffffff081,globl diff --git a/libc/sysv/calls/sigqueue.s b/libc/sysv/calls/sigqueue.s deleted file mode 100644 index 7f813ba9e..000000000 --- a/libc/sysv/calls/sigqueue.s +++ /dev/null @@ -1,2 +0,0 @@ -.include "o/libc/sysv/macros.internal.inc" -.scall sigqueue,0xffffff1c8fffffff,globl diff --git a/libc/sysv/calls/sys_getrusage.s b/libc/sysv/calls/sys_getrusage.s deleted file mode 100644 index a59cee99c..000000000 --- a/libc/sysv/calls/sys_getrusage.s +++ /dev/null @@ -1,2 +0,0 @@ -.include "o/libc/sysv/macros.internal.inc" -.scall sys_getrusage,0x1bd0130752075062,globl,hidden diff --git a/libc/sysv/calls/sys_mremap.s b/libc/sysv/calls/sys_mremap.s deleted file mode 100644 index 759973cd9..000000000 --- a/libc/sysv/calls/sys_mremap.s +++ /dev/null @@ -1,2 +0,0 @@ -.include "o/libc/sysv/macros.internal.inc" -.scall sys_mremap,0x19bffffffffff019,globl,hidden diff --git a/libc/sysv/calls/sys_sigqueue.s b/libc/sysv/calls/sys_sigqueue.s new file mode 100644 index 000000000..5faa160bf --- /dev/null +++ b/libc/sysv/calls/sys_sigqueue.s @@ -0,0 +1,2 @@ +.include "o/libc/sysv/macros.internal.inc" +.scall sys_sigqueue,0xffffff1c8fffffff,globl diff --git a/libc/sysv/calls/sys_sigqueueinfo.s b/libc/sysv/calls/sys_sigqueueinfo.s new file mode 100644 index 000000000..4e521ca9f --- /dev/null +++ b/libc/sysv/calls/sys_sigqueueinfo.s @@ -0,0 +1,2 @@ +.include "o/libc/sysv/macros.internal.inc" +.scall sys_sigqueueinfo,0x0f5ffffffffff081,globl diff --git a/libc/sysv/calls/sys_wait4.s b/libc/sysv/calls/sys_wait4.s deleted file mode 100644 index 4a1674eee..000000000 --- a/libc/sysv/calls/sys_wait4.s +++ /dev/null @@ -1,2 +0,0 @@ -.include "o/libc/sysv/macros.internal.inc" -.scall sys_wait4,0x1c100b007200703d,globl,hidden diff --git a/libc/sysv/consensus.py b/libc/sysv/consensus.py deleted file mode 100755 index fbd61bfd5..000000000 --- a/libc/sysv/consensus.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -import sys - -lineno = 0 - -def atoi(s): - try: - if s == '0': - return 0 - elif s.startswith('0x'): - return int(s[2:], 16) - elif s.startswith('0b'): - return int(s[2:], 2) - elif s.startswith('0'): - return int(s[1:], 8) - return int(s) - except ValueError: - sys.stderr.write('error: %s on line %d\n' % (s, lineno)) - sys.exit(1) - -for line in open('consts.sh'): - f = line.split() - lineno = lineno + 1 - if len(f) >= 8 and f[0] == 'syscon': - linux = atoi(f[3]) - xnu = atoi(f[4]) - freebsd = atoi(f[5]) - openbsd = atoi(f[6]) - windows = atoi(f[7]) - if linux == xnu and xnu == freebsd and freebsd == openbsd and openbsd == windows: - sys.stdout.write('%s\t%s\n' % (f[1], f[2])) diff --git a/libc/sysv/consts.sh b/libc/sysv/consts.sh index 80e50605e..0ae6131af 100755 --- a/libc/sysv/consts.sh +++ b/libc/sysv/consts.sh @@ -22,181 +22,177 @@ dir=libc/sysv/consts # The Fifth Bell System, Community Edition # » catalogue of carnage # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD Windows Commentary -syscon errno ENOSYS 38 78 78 78 78 1 # bsd consensus & kNtErrorInvalidFunction -syscon errno EPERM 1 1 1 1 1 12 # unix consensus & kNtErrorInvalidAccess (should be kNtErrorNotOwner but is that mutex only??) -syscon errno ENOENT 2 2 2 2 2 2 # unix consensus & kNtErrorFileNotFound -syscon errno ESRCH 3 3 3 3 3 566 # "no such process" & kNtErrorThreadNotInProcess (cf. kNtErrorInvalidHandle) -syscon errno EINTR 4 4 4 4 4 10004 # unix consensus & WSAEINTR -syscon errno EIO 5 5 5 5 5 1117 # unix consensus & kNtErrorIoDevice -syscon errno ENXIO 6 6 6 6 6 1112 # unix consensus & kNtErrorNoMediaInDrive -syscon errno E2BIG 7 7 7 7 7 1639 # unix consensus & kNtErrorInvalidCommandLine -syscon errno ENOEXEC 8 8 8 8 8 193 # unix consensus & kNtErrorBadExeFormat -syscon errno EBADF 9 9 9 9 9 6 # bad file descriptor; cf. EBADFD; unix consensus & kNtErrorInvalidHandle -syscon errno ECHILD 10 10 10 10 10 128 # unix consensus & kNtErrorWaitNoChildren -syscon errno EAGAIN 11 35 35 35 35 0x2733 # bsd consensus & WSAEWOULDBLOCK -syscon errno EWOULDBLOCK 11 35 35 35 35 0x2733 # bsd consensus & WSAEWOULDBLOCK -syscon errno ENOMEM 12 12 12 12 12 14 # unix consensus & kNtErrorOutofmemory -syscon errno EACCES 13 13 13 13 13 5 # unix consensus & kNtErrorAccessDenied -syscon errno EFAULT 14 14 14 14 14 487 # unix consensus & kNtErrorInvalidAddress -syscon errno ENOTBLK 15 15 15 15 15 26 # unix consensus & kNtErrorNotDosDisk -syscon errno EBUSY 16 16 16 16 16 170 # unix consensus & kNtErrorBusy -syscon errno EEXIST 17 17 17 17 17 183 # unix consensus & kNtErrorAlreadyExists (should be kNtErrorFileExists too) -syscon errno EXDEV 18 18 18 18 18 17 # unix consensus & kNtErrorNotSameDevice -syscon errno ENODEV 19 19 19 19 19 1200 # unix consensus & kNtErrorBadDevice -syscon errno ENOTDIR 20 20 20 20 20 3 # unix consensus & kNtErrorPathNotFound -syscon errno EISDIR 21 21 21 21 21 267 # unix consensus & kNtErrorDirectoryNotSupported -syscon errno EINVAL 22 22 22 22 22 87 # unix consensus & kNtErrorInvalidParameter -syscon errno ENFILE 23 23 23 23 23 331 # unix consensus & kNtErrorTooManyDescriptors -syscon errno EMFILE 24 24 24 24 24 336 # unix consensus & kNtErrorTooManyOpenFiles -syscon errno ENOTTY 25 25 25 25 25 1118 # unix consensus & kNtErrorSerialNoDevice -syscon errno ETXTBSY 26 26 26 26 26 148 # unix consensus & kNtErrorPathBusy -syscon errno EFBIG 27 27 27 27 27 223 # unix consensus & kNtErrorFileTooLarge -syscon errno ENOSPC 28 28 28 28 28 39 # unix consensus & kNtErrorDiskFull -syscon errno EDQUOT 122 69 69 69 69 0x2755 # bsd consensus -syscon errno ESPIPE 29 29 29 29 29 25 # unix consensus & kNtErrorSeek -syscon errno EROFS 30 30 30 30 30 6009 # unix consensus & kNtErrorFileReadOnly -syscon errno EMLINK 31 31 31 31 31 4 # unix consensus & kNtErrorTooManyLinks -syscon errno EPIPE 32 32 32 32 32 109 # unix consensus & kNtErrorBrokenPipe -syscon errno EDOM 33 33 33 33 33 33 # bsd consensus & fudged on NT -syscon errno ERANGE 34 34 34 34 34 34 # bsd consensus & fudged on NT -syscon errno EDEADLK 35 11 11 11 11 1131 # bsd consensus & kNtErrorPossibleDeadlock -syscon errno ENAMETOOLONG 36 63 63 63 63 0x274f # bsd consensus & WSAENAMETOOLONG -syscon errno ENOLCK 37 77 77 77 77 0 # bsd consensus -syscon errno ENOTEMPTY 39 66 66 66 66 145 # bsd consensus & kNtErrorDirNotEmpty (TODO: What is WSAENOTEMPTY? 0x2752) -syscon errno ELOOP 40 62 62 62 62 0x274e # bsd consensus & WSAELOOP -syscon errno ENOMSG 42 91 83 90 83 0 -syscon errno EIDRM 43 90 82 89 82 0 -syscon errno EUSERS 87 68 68 68 68 0x2754 # bsd consensus & WSAEUSERS -syscon errno ENOTSOCK 88 38 38 38 38 0x2736 # bsd consensus & WSAENOTSOCK -syscon errno EDESTADDRREQ 89 39 39 39 39 0x2737 # bsd consensus & WSAEDESTADDRREQ -syscon errno EMSGSIZE 90 40 40 40 40 0x2738 # bsd consensus & WSAEMSGSIZE -syscon errno EPROTOTYPE 91 41 41 41 41 0x2739 # bsd consensus & WSAEPROTOTYPE -syscon errno ENOPROTOOPT 92 42 42 42 42 0x273a # bsd consensus & WSAENOPROTOOPT -syscon errno EPROTONOSUPPORT 93 43 43 43 43 0x273b # bsd consensus & WSAEPROTONOSUPPORT -syscon errno ESOCKTNOSUPPORT 94 44 44 44 44 0x273c # bsd consensus & WSAESOCKTNOSUPPORT -syscon errno ENOTSUP 95 45 45 91 86 0x273d -syscon errno EOPNOTSUPP 95 102 45 45 45 0x273d -syscon errno EPFNOSUPPORT 96 46 46 46 46 0x273e # bsd consensus & WSAEPFNOSUPPORT -syscon errno EAFNOSUPPORT 97 47 47 47 47 0x273f # bsd consensus & WSAEAFNOSUPPORT -syscon errno EADDRINUSE 98 48 48 48 48 0x2740 # bsd consensus & WSAEADDRINUSE -syscon errno EADDRNOTAVAIL 99 49 49 49 49 0x2741 # bsd consensus & WSAEADDRNOTAVAIL -syscon errno ENETDOWN 100 50 50 50 50 0x2742 # bsd consensus & WSAENETDOWN -syscon errno ENETUNREACH 101 51 51 51 51 0x2743 # bsd consensus & WSAENETUNREACH -syscon errno ENETRESET 102 52 52 52 52 0x2744 # bsd consensus & WSAENETRESET -syscon errno ECONNABORTED 103 53 53 53 53 0x2745 # bsd consensus & WSAECONNABORTED -syscon errno ECONNRESET 104 54 54 54 54 0x2746 # bsd consensus & WSAECONNRESET -syscon errno ENOBUFS 105 55 55 55 55 0x2747 # bsd consensus & WSAENOBUFS -syscon errno EISCONN 106 56 56 56 56 0x2748 # bsd consensus & WSAEISCONN -syscon errno ENOTCONN 107 57 57 57 57 0x2749 # bsd consensus & WSAENOTCONN -syscon errno ESHUTDOWN 108 58 58 58 58 0x274a # bsd consensus & WSAESHUTDOWN -syscon errno ETOOMANYREFS 109 59 59 59 59 0x274b # bsd consensus & WSAETOOMANYREFS -syscon errno ETIMEDOUT 110 60 60 60 60 0x274c # bsd consensus & WSAETIMEDOUT -syscon errno ECONNREFUSED 111 61 61 61 61 0x274d # bsd consensus & WSAECONNREFUSED -syscon errno EHOSTDOWN 112 64 64 64 64 0x2750 # bsd consensus & WSAEHOSTDOWN -syscon errno EHOSTUNREACH 113 65 65 65 65 0x2751 # bsd consensus & WSAEHOSTUNREACH -syscon errno EALREADY 114 37 37 37 37 0x2735 # bsd consensus & WSAEALREADY -syscon errno EINPROGRESS 115 36 36 36 36 0x2734 # bsd consensus & WSAEINPROGRESS -syscon errno ESTALE 116 70 70 70 70 0x2756 # bsd consensus & WSAESTALE -syscon errno ECHRNG 44 0 0 0 0 0 # bsd consensus -syscon errno EL2NSYNC 45 0 0 0 0 0 # bsd consensus -syscon errno EL3HLT 46 0 0 0 0 0 # bsd consensus -syscon errno EL3RST 47 0 0 0 0 0 # bsd consensus -syscon errno ELNRNG 48 0 0 0 0 0 # bsd consensus -syscon errno EUNATCH 49 0 0 0 0 0 # bsd consensus -syscon errno ENOCSI 50 0 0 0 0 0 # bsd consensus -syscon errno EL2HLT 51 0 0 0 0 0 # bsd consensus -syscon errno EBADE 52 0 0 0 0 0 # bsd consensus -syscon errno EBADR 53 0 0 0 0 0 # bsd consensus -syscon errno EXFULL 54 0 0 0 0 0 # bsd consensus -syscon errno ENOANO 55 0 0 0 0 0 # bsd consensus -syscon errno EBADRQC 56 0 0 0 0 0 # bsd consensus -syscon errno EBADSLT 57 0 0 0 0 0 # bsd consensus -syscon errno EBFONT 59 0 0 0 0 0 # bsd consensus -syscon errno ENOSTR 60 99 0 0 91 0 -syscon errno ENODATA 61 96 0 0 89 0 -syscon errno ETIME 62 101 0 0 92 0 -syscon errno ENOSR 63 98 0 0 90 0 -syscon errno ENONET 64 0 0 0 0 0 # bsd consensus -syscon errno ENOPKG 65 0 0 0 0 0 # bsd consensus -syscon errno EREMOTE 66 71 71 71 71 0x2757 # bsd consensus -syscon errno ENOLINK 67 97 91 0 95 0 -syscon errno EADV 68 0 0 0 0 0 # bsd consensus -syscon errno ESRMNT 69 0 0 0 0 0 # bsd consensus -syscon errno ECOMM 70 0 0 0 0 0 # bsd consensus -syscon errno EPROTO 71 100 92 95 96 0 -syscon errno EMULTIHOP 72 95 90 0 94 0 -syscon errno EDOTDOT 73 0 0 0 0 0 # bsd consensus -syscon errno EBADMSG 74 94 89 92 88 0 -syscon errno EOVERFLOW 75 84 84 87 84 0 -syscon errno ENOTUNIQ 76 0 0 0 0 0 # bsd consensus -syscon errno EBADFD 77 9 9 9 9 6 # file descriptor in bad state; cf. EBADF; fudged on non-Linux -syscon errno EREMCHG 78 0 0 0 0 0 # bsd consensus -syscon errno ELIBACC 79 0 0 0 0 0 # bsd consensus -syscon errno ELIBBAD 80 0 0 0 0 0 # bsd consensus -syscon errno ELIBSCN 81 0 0 0 0 0 # bsd consensus -syscon errno ELIBMAX 82 0 0 0 0 0 # bsd consensus -syscon errno ELIBEXEC 83 0 0 0 0 0 # bsd consensus -syscon errno EILSEQ 84 92 86 84 85 0 -syscon errno ERESTART 85 0 0 0 -3 0 # bsd consensus -syscon errno ESTRPIPE 86 0 0 0 0 0 # bsd consensus -syscon errno EUCLEAN 117 0 0 0 0 0 # bsd consensus -syscon errno ENOTNAM 118 0 0 0 0 0 # bsd consensus -syscon errno ENAVAIL 119 0 0 0 0 0 # bsd consensus -syscon errno EISNAM 120 0 0 0 0 0 # bsd consensus -syscon errno EREMOTEIO 121 0 0 0 0 0 # bsd consensus -syscon errno ENOMEDIUM 123 0 0 85 85 0 -syscon errno EMEDIUMTYPE 124 0 0 86 86 0 -syscon errno ECANCELED 125 89 85 88 87 0 -syscon errno ENOKEY 126 0 0 0 0 0 # bsd consensus -syscon errno EKEYEXPIRED 127 0 0 0 0 0 # bsd consensus -syscon errno EKEYREVOKED 128 0 0 0 0 0 # bsd consensus -syscon errno EKEYREJECTED 129 0 0 0 0 0 # bsd consensus -syscon errno EOWNERDEAD 130 105 96 94 97 0 -syscon errno ENOTRECOVERABLE 131 104 95 93 98 0 -syscon errno ERFKILL 132 0 0 0 0 0 # bsd consensus -syscon errno EHWPOISON 133 0 0 0 0 0 # bsd consensus +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD Windows Commentary +syscon errno ENOSYS 38 78 78 78 78 1 # system call unavailable; bsd consensus; kNtErrorInvalidFunction +syscon errno EPERM 1 1 1 1 1 12 # operation not permitted; unix consensus; kNtErrorInvalidAccess (should be kNtErrorNotOwner but is that mutex only??); raised by accept(2), acct(2), add_key(2), adjtimex(2), arch_prctl(2), bdflush(2), bpf(2), capget(2), chmod(2), chown(2), chroot(2), clock_getres(2), clone(2), copy_file_range(2), create_module(2), delete_module(2), epoll_ctl(2), execve(2), fallocate(2), fanotify_init(2), fcntl(2), futex(2), get_robust_list(2), getdomainname(2), getgroups(2), gethostname(2), getpriority(2), getrlimit(2), getsid(2), gettimeofday(2), idle(2), init_module(2), io_submit(2), ioctl_console(2), ioctl_ficlonerange(2), ioctl_fideduperange(2), ioctl_ns(2), ioctl_tty(2), ioperm(2), iopl(2), ioprio_set(2), kcmp(2), kexec_load(2), keyctl(2), kill(2), link(2), lookup_dcookie(2), madvise(2), mbind(2), membarrier(2), migrate_pages(2), mkdir(2), mknod(2), mlock(2), mmap(2), mount(2), move_pages(2), msgctl(2), nice(2), open(2), open_by_handle_at(2), pciconfig_read(2), perf_event_open(2), pidfd_getfd(2), pidfd_send_signal(2), pivot_root(2), prctl(2), process_vm_readv(2), ptrace(2), quotactl(2), reboot(2), rename(2), request_key(2), rmdir(2), rt_sigqueueinfo(2), sched_setaffinity(2), sched_setattr(2), sched_setparam(2), sched_setscheduler(2), semctl(2), seteuid(2), setfsgid(2), setfsuid(2), setgid(2), setns(2), setpgid(2), setresuid(2), setreuid(2), setsid(2), setuid(2), setup(2), setxattr(2), shmctl(2), shmget(2), sigaltstack(2), spu_create(2), stime(2), swapon(2), symlink(2), syslog(2), timer_create(2), timerfd_create(2), tkill(2), truncate(2), umount(2), unlink(2), unshare(2), utime(2), utimensat(2), vhangup(2), vm86(2), write(2), unix(7), ip(7) +syscon errno ENOENT 2 2 2 2 2 2 # no such file or directory; unix consensus; kNtErrorFileNotFound; raised by access(2), acct(2), alloc_hugepages(2), bind(2), bpf(2), chdir(2), chmod(2), chown(2), chroot(2), clock_getres(2), delete_module(2), epoll_ctl(2), execve(2), execveat(2), fanotify_mark(2), getdents(2), inotify_add_watch(2), ioctl_fat(2), kcmp(2), keyctl(2), link(2), mkdir(2), mknod(2), mount(2), msgget(2), open(2), open_by_handle_at(2), perf_event_open(2), query_module(2), quotactl(2), readdir(2), readlink(2), rename(2), rmdir(2), semget(2), shmget(2), spu_create(2), stat(2), statfs(2), statx(2), swapon(2), symlink(2), truncate(2), umount(2), unlink(2), utime(2), utimensat(2), unix(7), ip(7) +syscon errno ESRCH 3 3 3 3 3 566 # no such process; kNtErrorThreadNotInProcess (cf. kNtErrorInvalidHandle); raised by capget(2), get_robust_list(2), getpriority(2), getrlimit(2), getsid(2), ioprio_set(2), kcmp(2), kill(2), migrate_pages(2), move_pages(2), perf_event_open(2), pidfd_getfd(2), pidfd_open(2), pidfd_send_signal(2), process_vm_readv(2), ptrace(2), quotactl(2), rt_sigqueueinfo(2), sched_rr_get_interval(2), sched_setaffinity(2), sched_setattr(2), sched_setparam(2), sched_setscheduler(2), set_thread_area(2), setpgid(2), tkill(2), utimensat(2), unix(7) +syscon errno EINTR 4 4 4 4 4 10004 # the greatest of all errnos; crucial for building real time reliable software; unix consensus; WSAEINTR; raised by accept(2), clock_nanosleep(2), close(2), connect(2), dup(2), epoll_wait(2), fallocate(2), fcntl(2), flock(2), futex(2), getrandom(2), io_getevents(2), msgop(2), nanosleep(2), open(2), pause(2), perf_event_open(2), poll(2), ptrace(2), read(2), recv(2), request_key(2), select(2), semop(2), send(2), sigsuspend(2), sigwaitinfo(2), spu_run(2), statfs(2), truncate(2), wait(2), write(2) +syscon errno EIO 5 5 5 5 5 1117 # unix consensus; kNtErrorIoDevice; raised by access(2) acct(2) chdir(2) chmod(2) chown(2) chroot(2) close(2) copy_file_range(2) execve(2) fallocate(2) fsync(2) ioperm(2) link(2) madvise(2) mbind(2) pciconfig_read(2) ptrace(2) read(2) readlink(2) sendfile(2) statfs(2) symlink(2) sync_file_range(2) truncate(2) unlink(2) write(2) +syscon errno ENXIO 6 6 6 6 6 1112 # no such device or address; unix consensus; kNtErrorNoMediaInDrive; raised by lseek(2), mount(2), open(2), prctl(2) +syscon errno E2BIG 7 7 7 7 7 1639 # argument list too long; unix consensus; kNtErrorInvalidCommandLine; raised by bpf(2), execve(2), getxattr(2), listxattr(2), move_pages(2), msgop(2), openat2(2), perf_event_open(2), sched_setattr(2), semop(2) +syscon errno ENOEXEC 8 8 8 8 8 193 # exec format error; unix consensus; kNtErrorBadExeFormat; raised by execve(2), init_module(2), kexec_load(2), uselib(2) +syscon errno EBADF 9 9 9 9 9 6 # bad file descriptor; cf. EBADFD; unix consensus; kNtErrorInvalidHandle; raised by accept(2), access(2), bind(2), bpf(2), chdir(2), chmod(2), chown(2), close(2), connect(2), copy_file_range(2), dup(2), epoll_ctl(2), epoll_wait(2), execveat(2), fallocate(2), fanotify_mark(2), fcntl(2), flock(2), fsync(2), futimesat(2), getdents(2), getpeername(2), getsockname(2), getsockopt(2), init_module(2), inotify_add_watch(2), inotify_rm_watch(2), io_submit(2), ioctl(2), ioctl_console(2), ioctl_ficlonerange(2), ioctl_fideduperange(2), ioctl_getfsmap(2), kcmp(2), kexec_load(2), link(2), listen(2), llseek(2), lseek(2), madvise(2), mkdir(2), mknod(2), mmap(2), open(2), open_by_handle_at(2), perf_event_open(2), pidfd_getfd(2), pidfd_send_signal(2), posix_fadvise(2), prctl(2), read(2), readahead(2), readdir(2), readlink(2), recv(2), rename(2), select(2), send(2), sendfile(2), setns(2), shutdown(2), signalfd(2), splice(2), spu_run(2), stat(2), statfs(2), statx(2), symlink(2), sync(2), sync_file_range(2), timerfd_create(2), truncate(2), unlink(2), utimensat(2), vmsplice(2), write(2), unix(7) +syscon errno ECHILD 10 10 10 10 10 128 # no child process; unix consensus; kNtErrorWaitNoChildren; raised by wait(2), waitpid(2), waitid(2), wait3(2), wait4(2) +syscon errno EAGAIN 11 35 35 35 35 10035 # resource temporarily unavailable (e.g. SO_RCVTIMEO expired, too many processes, too much memory locked, read or write with O_NONBLOCK needs polling, etc.); bsd consensus; WSAEWOULDBLOCK; raised by accept(2), clone(2), connect(2), eventfd(2), fcntl(2), fork(2), futex(2), getrandom(2), io_cancel(2), io_setup(2), io_submit(2), ioctl_userfaultfd(2), keyctl(2), madvise(2), mincore(2), mlock(2), mmap(2), mremap(2), msgop(2), openat2(2), poll(2), read(2), rt_sigqueueinfo(2), select(2), semop(2), send(2), sendfile(2), setresuid(2), setreuid(2), setuid(2), signalfd(2), sigwaitinfo(2), splice(2), tee(2), timer_create(2), timerfd_create(2), tkill(2), umount(2), vmsplice(2), write(2), ip(7) +syscon errno ENOMEM 12 12 12 12 12 14 # we require more vespene gas; unix consensus; kNtErrorOutofmemory; raised by access(2), acct(2), add_key(2), bind(2), bpf(2), chdir(2), chmod(2), chown(2), chroot(2), clone(2), copy_file_range(2), create_module(2), epoll_create(2), epoll_ctl(2), eventfd(2), execve(2), fanotify_init(2), fanotify_mark(2), fork(2), getgroups(2), getrlimit(2), init_module(2), inotify_add_watch(2), inotify_init(2), io_setup(2), ioctl_fideduperange(2), ioctl_getfsmap(2), ioperm(2), kexec_load(2), keyctl(2), link(2), lookup_dcookie(2), madvise(2), mbind(2), memfd_create(2), mincore(2), mkdir(2), mknod(2), mlock(2), mmap(2), mount(2), mprotect(2), mremap(2), msgget(2), msgop(2), msync(2), open(2), pidfd_open(2), poll(2), process_vm_readv(2), readlink(2), recv(2), rename(2), request_key(2), rmdir(2), s390_guarded_storage(2), s390_pci_mmio_write(2), s390_runtime_instr(2), s390_sthyi(2), select(2), semget(2), semop(2), send(2), sendfile(2), set_mempolicy(2), setns(2), shmctl(2), shmget(2), shmop(2), sigaltstack(2), signalfd(2), splice(2), spu_create(2), spu_run(2), stat(2), statfs(2), statx(2), subpage_prot(2), swapon(2), symlink(2), sync_file_range(2), tee(2), timer_create(2), timerfd_create(2), umount(2), unlink(2), unshare(2), userfaultfd(2), vmsplice(2), unix(7), ip(7) +syscon errno EACCES 13 13 13 13 13 5 # permission denied; unix consensus; kNtErrorAccessDenied; raised by access(2), acct(2), add_key(2), bind(2), bpf(2), chdir(2), chmod(2), chown(2), chroot(2), clock_getres(2), connect(2), execve(2), fcntl(2), futex(2), getpriority(2), inotify_add_watch(2), keyctl(2), link(2), madvise(2), mkdir(2), mknod(2), mmap(2), mount(2), move_pages(2), mprotect(2), msgctl(2), msgget(2), msgop(2), open(2), perf_event_open(2), prctl(2), ptrace(2), quotactl(2), readlink(2), rename(2), request_key(2), rmdir(2), semctl(2), semget(2), semop(2), send(2), setpgid(2), shmctl(2), shmget(2), shmop(2), socket(2), spu_create(2), stat(2), statfs(2), statx(2), symlink(2), truncate(2), unlink(2), uselib(2), utime(2), utimensat(2), ip(7) +syscon errno EFAULT 14 14 14 14 14 487 # pointer passed to system call that would otherwise segfault; unix consensus; kNtErrorInvalidAddress; raised by accept(2), access(2), acct(2), add_key(2), adjtimex(2), arch_prctl(2), bdflush(2), bind(2), bpf(2), cacheflush(2), capget(2), chdir(2), chmod(2), chown(2), chroot(2), clock_getres(2), clock_nanosleep(2), connect(2), create_module(2), delete_module(2), epoll_wait(2), execve(2), fcntl(2), futex(2), get_mempolicy(2), get_robust_list(2), getcpu(2), getdents(2), getdomainname(2), getgroups(2), gethostname(2), getitimer(2), getpeername(2), getrandom(2), getresuid(2), getrlimit(2), getrusage(2), getsockname(2), getsockopt(2), gettimeofday(2), getunwind(2), init_module(2), inotify_add_watch(2), io_cancel(2), io_destroy(2), io_getevents(2), io_setup(2), io_submit(2), ioctl(2), ioctl_getfsmap(2), ioctl_userfaultfd(2), kcmp(2), keyctl(2), link(2), llseek(2), lookup_dcookie(2), mbind(2), memfd_create(2), migrate_pages(2), mincore(2), mkdir(2), mknod(2), mmap2(2), modify_ldt(2), mount(2), move_pages(2), mremap(2), msgctl(2), msgop(2), msync(2), nanosleep(2), open(2), open_by_handle_at(2), perf_event_open(2), pipe(2), poll(2), prctl(2), process_vm_readv(2), ptrace(2), query_module(2), quotactl(2), read(2), readdir(2), readlink(2), reboot(2), recv(2), rename(2), request_key(2), rmdir(2), s390_guarded_storage(2), s390_pci_mmio_write(2), s390_sthyi(2), sched_rr_get_interval(2), sched_setaffinity(2), semctl(2), semop(2), send(2), sendfile(2), set_mempolicy(2), set_thread_area(2), shmctl(2), sigaction(2), sigaltstack(2), sigpending(2), sigprocmask(2), sigsuspend(2), socketpair(2), spu_create(2), spu_run(2), stat(2), statfs(2), statx(2), stime(2), subpage_prot(2), symlink(2), sysctl(2), sysfs(2), sysinfo(2), time(2), timer_settime(2), timerfd_create(2), times(2), truncate(2), umount(2), uname(2), unlink(2), ustat(2), utimensat(2), vm86(2), write(2), unix(7) +syscon errno ENOTBLK 15 15 15 15 15 26 # block device required; unix consensus; kNtErrorNotDosDisk; raised by mount(2), quotactl(2), umount(2) +syscon errno EBUSY 16 16 16 16 16 170 # device or resource busy; unix consensus; kNtErrorBusy; raised by bdflush(2), delete_module(2), dup(2), fcntl(2), init_module(2), ioctl_tty(2), ioctl_userfaultfd(2), kexec_load(2), mount(2), msync(2), pivot_root(2), prctl(2), ptrace(2), quotactl(2), rename(2), rmdir(2), sched_setattr(2), swapon(2), umount(2) +syscon errno EEXIST 17 17 17 17 17 183 # file exists; unix consensus; kNtErrorAlreadyExists (should be kNtErrorFileExists too); raised by bpf(2), create_module(2), epoll_ctl(2), init_module(2), inotify_add_watch(2), keyctl(2), link(2), mkdir(2), mknod(2), mmap(2), msgget(2), open(2), rename(2), rmdir(2), semget(2), setxattr(2), shmget(2), spu_create(2), symlink(2) +syscon errno EXDEV 18 18 18 18 18 17 # improper link; unix consensus; kNtErrorNotSameDevice; raised by copy_file_range(2), fanotify_mark(2), ioctl_ficlonerange(2), ioctl_fideduperange(2), link(2), openat2(2), rename(2) +syscon errno ENODEV 19 19 19 19 19 1200 # no such device; unix consensus; kNtErrorBadDevice; raised by arch_prctl(2), eventfd(2), fallocate(2), fanotify_mark(2), mmap(2), mount(2), move_pages(2), open(2), pciconfig_read(2), perf_event_open(2), pidfd_open(2), prctl(2), s390_pci_mmio_write(2), signalfd(2), spu_create(2), timerfd_create(2) +syscon errno ENOTDIR 20 20 20 20 20 3 # not a directory; unix consensus; kNtErrorPathNotFound; raised by access(2), acct(2), bind(2), chdir(2), chmod(2), chown(2), chroot(2), execve(2), execveat(2), fanotify_mark(2), fcntl(2), futimesat(2), getdents(2), inotify_add_watch(2), ioctl_fat(2), keyctl(2), link(2), mkdir(2), mknod(2), mount(2), open(2), open_by_handle_at(2), pivot_root(2), readdir(2), readlink(2), rename(2), rmdir(2), spu_create(2), stat(2), statfs(2), statx(2), symlink(2), sysctl(2), truncate(2), unlink(2), utimensat(2) +syscon errno EISDIR 21 21 21 21 21 267 # is a a directory; unix consensus; kNtErrorDirectoryNotSupported; raised by acct(2), copy_file_range(2), execve(2), ioctl_ficlonerange(2), ioctl_fideduperange(2), open(2), read(2), rename(2), truncate(2), unlink(2) +syscon errno EINVAL 22 22 22 22 22 87 # invalid argument; unix consensus; kNtErrorInvalidParameter; raised by accept(2), access(2), add_key(2), adjtimex(2), arch_prctl(2), bdflush(2), bind(2), bpf(2), cacheflush(2), capget(2), chmod(2), chown(2), clock_getres(2), clock_nanosleep(2), clone(2), copy_file_range(2), create_module(2), dup(2), epoll_create(2), epoll_ctl(2), epoll_wait(2), eventfd(2), execve(2), execveat(2), fallocate(2), fanotify_init(2), fanotify_mark(2), fcntl(2), flock(2), futex(2), get_mempolicy(2), get_robust_list(2), getdents(2), getdomainname(2), getgroups(2), gethostname(2), getitimer(2), getpeername(2), getpriority(2), getrandom(2), getrlimit(2), getrusage(2), getsockname(2), getsockopt(2), gettimeofday(2), init_module(2), inotify_add_watch(2), inotify_init(2), inotify_rm_watch(2), io_cancel(2), io_destroy(2), io_getevents(2), io_setup(2), io_submit(2), ioctl(2), ioctl_console(2), ioctl_ficlonerange(2), ioctl_fideduperange(2), ioctl_getfsmap(2), ioctl_ns(2), ioctl_tty(2), ioctl_userfaultfd(2), ioperm(2), iopl(2), ioprio_set(2), kcmp(2), kexec_load(2), keyctl(2), kill(2), link(2), llseek(2), lookup_dcookie(2), lseek(2), madvise(2), mbind(2), membarrier(2), memfd_create(2), migrate_pages(2), mincore(2), mkdir(2), mknod(2), mlock(2), mmap(2), mmap2(2), modify_ldt(2), mount(2), move_pages(2), mprotect(2), mremap(2), msgctl(2), msgop(2), msync(2), nanosleep(2), open(2), open_by_handle_at(2), openat2(2), pciconfig_read(2), perf_event_open(2), personality(2), pidfd_getfd(2), pidfd_open(2), pidfd_send_signal(2), pipe(2), pivot_root(2), pkey_alloc(2), poll(2), posix_fadvise(2), prctl(2), process_vm_readv(2), ptrace(2), query_module(2), quotactl(2), read(2), readahead(2), readdir(2), readlink(2), readv(2), reboot(2), recv(2), recvmmsg(2), remap_file_pages(2), rename(2), request_key(2), rmdir(2), rt_sigqueueinfo(2), s390_guarded_storage(2), s390_pci_mmio_write(2), s390_runtime_instr(2), s390_sthyi(2), sched_get_priority_max(2), sched_rr_get_interval(2), sched_setaffinity(2), sched_setattr(2), sched_setparam(2), sched_setscheduler(2), seccomp(2), select(2), semctl(2), semget(2), semop(2), send(2), sendfile(2), set_mempolicy(2), set_thread_area(2), seteuid(2), setfsgid(2), setfsuid(2), setgid(2), setns(2), setpgid(2), setresuid(2), setreuid(2), setuid(2), shmctl(2), shmget(2), shmop(2), shutdown(2), sigaction(2), sigaltstack(2), signal(2), signalfd(2), sigprocmask(2), sigsuspend(2), sigwaitinfo(2), socket(2), splice(2), spu_create(2), spu_run(2), stat(2), statx(2), subpage_prot(2), swapon(2), sync_file_range(2), sysfs(2), syslog(2), tee(2), timer_create(2), timer_delete(2), timer_getoverrun(2), timer_settime(2), timerfd_create(2), tkill(2), truncate(2), umount(2), unlink(2), unshare(2), userfaultfd(2), ustat(2), utimensat(2), vmsplice(2), wait(2), write(2), unix(7), ip(7) +syscon errno ENFILE 23 23 23 23 23 331 # too many open files in system; unix consensus; kNtErrorTooManyDescriptors; raised by accept(2), acct(2), epoll_create(2), eventfd(2), execve(2), futex(2), inotify_init(2), memfd_create(2), mmap(2), open(2), pidfd_getfd(2), pidfd_open(2), pipe(2), shmget(2), signalfd(2), socket(2), socketpair(2), spu_create(2), swapon(2), timerfd_create(2), uselib(2), userfaultfd(2) +syscon errno EMFILE 24 24 24 24 24 336 # too many open files; unix consensus; kNtErrorTooManyOpenFiles; raised by accept(2), dup(2), epoll_create(2), eventfd(2), execve(2), fanotify_init(2), fcntl(2), inotify_init(2), memfd_create(2), mount(2), open(2), perf_event_open(2), pidfd_getfd(2), pidfd_open(2), pipe(2), signalfd(2), socket(2), socketpair(2), spu_create(2), timerfd_create(2) +syscon errno ENOTTY 25 25 25 25 25 1118 # inappropriate i/o control operation; unix consensus; kNtErrorSerialNoDevice; raised by ioctl(2), ioctl_console(2), ioctl_fat(2), ioctl_ns(2), ioctl_tty(2) +syscon errno ETXTBSY 26 26 26 26 26 148 # won't open executable that's executing in write mode; try UnlockExecutable(); unix consensus; kNtErrorPathBusy; raised by access(2), copy_file_range(2), execve(2), fallocate(2), ioctl_ficlonerange(2), ioctl_fideduperange(2), mmap(2), open(2), truncate(2) +syscon errno EFBIG 27 27 27 27 27 223 # file too large; unix consensus; kNtErrorFileTooLarge; raised by copy_file_range(2), fallocate(2), init_module(2), open(2), semop(2), truncate(2), write(2) +syscon errno ENOSPC 28 28 28 28 28 39 # no space left on device; unix consensus; kNtErrorDiskFull; raised by copy_file_range(2), epoll_ctl(2), fallocate(2), fanotify_mark(2), fsync(2), inotify_add_watch(2), link(2), mkdir(2), mknod(2), msgget(2), open(2), perf_event_open(2), pkey_alloc(2), query_module(2), rename(2), semget(2), setxattr(2), shmget(2), spu_create(2), symlink(2), sync_file_range(2), write(2) +syscon errno EDQUOT 122 69 69 69 69 10069 # disk quota exceeded; bsd consensus; raised by add_key(2), keyctl(2), link(2), mkdir(2), mknod(2), open(2), rename(2), request_key(2), setxattr(2), symlink(2), write(2) +syscon errno ESPIPE 29 29 29 29 29 25 # invalid seek; unix consensus; kNtErrorSeek; raised by fallocate(2), lseek(2), posix_fadvise(2), sendfile(2), splice(2), sync_file_range(2) +syscon errno EROFS 30 30 30 30 30 6009 # read-only filesystem; unix consensus; kNtErrorFileReadOnly; raised by access(2), acct(2), bind(2), chmod(2), chown(2), link(2), mkdir(2), mknod(2), mount(2), open(2), rename(2), rmdir(2), symlink(2), truncate(2), unlink(2), utime(2), utimensat(2) +syscon errno EMLINK 31 31 31 31 31 4 # too many links; unix consensus; kNtErrorTooManyLinks; raised by link(2), mkdir(2), rename(2) +syscon errno EPIPE 32 32 32 32 32 109 # broken pipe; unix consensus; kNtErrorBrokenPipe; raised by send(2), write(2), tcp(7), unix(7), ip(7) +syscon errno EDOM 33 33 33 33 33 33 # mathematics argument out of domain of function; bsd consensus; fudged on NT; returned by cos(3), fmod(3), log1p(3), sin(3), tan(3), tgamma(3) +syscon errno ERANGE 34 34 34 34 34 34 # result too large; bsd consensus; fudged on NT; raised by getxattr(2), listxattr(2), lookup_dcookie(2), prctl(2), quotactl(2), semctl(2), semop(2), setxattr(2) +syscon errno EDEADLK 35 11 11 11 11 1131 # resource deadlock avoided; bsd consensus; kNtErrorPossibleDeadlock; raised by fcntl(2), keyctl(2) +syscon errno ENAMETOOLONG 36 63 63 63 63 10063 # filename too long; bsd consensus; WSAENAMETOOLONG; raised by access(2), acct(2), bind(2), chdir(2), chmod(2), chown(2), chroot(2), execve(2), gethostname(2), inotify_add_watch(2), link(2), lookup_dcookie(2), mkdir(2), mknod(2), mount(2), open(2), readlink(2), rename(2), rmdir(2), spu_create(2), stat(2), statfs(2), statx(2), symlink(2), truncate(2), umount(2), unlink(2), utimensat(2) +syscon errno ENOLCK 37 77 77 77 77 0 # no locks available; bsd consensus; raised by fcntl(2), flock(2) +syscon errno ENOTEMPTY 39 66 66 66 66 145 # directory not empty; bsd consensus; kNtErrorDirNotEmpty (TODO: What is WSAENOTEMPTY? 10066); raised by rmdir(2) +syscon errno ELOOP 40 62 62 62 62 10062 # too many levels of symbolic links; bsd consensus; WSAELOOP; raised by access(2), acct(2), bind(2), chdir(2), chmod(2), chown(2), chroot(2), epoll_ctl(2), execve(2), execveat(2), keyctl(2), link(2), mkdir(2), mknod(2), mount(2), open(2), open_by_handle_at(2), openat2(2), readlink(2), rename(2), rmdir(2), spu_create(2), stat(2), statfs(2), statx(2), symlink(2), truncate(2), unlink(2), utimensat(2) +syscon errno ENOMSG 42 91 83 90 83 0 # raised by msgop(2) +syscon errno EIDRM 43 90 82 89 82 0 # identifier removed; raised by msgctl(2), msgget(2), msgop(2), semctl(2), semop(2), shmctl(2), shmget(2), shmop(2) +syscon errno ETIME 62 101 60 60 92 0 # timer expired; timer expired; raised by connect(2), futex(2), keyctl(2), mq_receive(2), mq_send(2), rtime(2), sem_wait(2) +syscon errno EPROTO 71 100 92 95 96 0 # raised by accept(2), connect(2), socket(2), socketpair(2) +syscon errno EOVERFLOW 75 84 84 87 84 0 # raised by aio_read(2), copy_file_range(2), ctime(2), fanotify_init(2), lseek(2), mmap(2), open(2), open_by_handle_at(2), sem_post(2), sendfile(2), shmctl(2), stat(2), statfs(2), statvfs(2), time(2), timegm(2) +syscon errno EILSEQ 84 92 86 84 85 0 # returned by fgetwc(3), fputwc(3), getwchar(3), putwchar(3), scanf(3), ungetwc(3) +syscon errno EUSERS 87 68 68 68 68 10068 # too many users; bsd consensus; WSAEUSERS; raised by acct(2) +syscon errno ENOTSOCK 88 38 38 38 38 10038 # not a socket; bsd consensus; WSAENOTSOCK; raised by accept(2), bind(2), connect(2), getpeername(2), getsockname(2), getsockopt(2), listen(2), recv(2), send(2), shutdown(2) +syscon errno EDESTADDRREQ 89 39 39 39 39 10039 # destination address required; bsd consensus; WSAEDESTADDRREQ; raised by send(2), write(2) +syscon errno EMSGSIZE 90 40 40 40 40 10040 # message too long; bsd consensus; WSAEMSGSIZE; raised by keyctl(2), send(2), ip(7) +syscon errno EPROTOTYPE 91 41 41 41 41 10041 # protocol wrong type for socket; bsd consensus; WSAEPROTOTYPE; raised by connect(2), unix(7) +syscon errno ENOPROTOOPT 92 42 42 42 42 10042 # protocol not available; bsd consensus; WSAENOPROTOOPT; raised by getsockopt(2), accept(2), ip(7) +syscon errno EPROTONOSUPPORT 93 43 43 43 43 10043 # protocol not supported; bsd consensus; WSAEPROTONOSUPPORT; raised by socket(2), socketpair(2), unix(7) +syscon errno ESOCKTNOSUPPORT 94 44 44 44 44 10044 # socket type not supported; bsd consensus; WSAESOCKTNOSUPPORT; raised by unix(7), ip(7) +syscon errno ENOTSUP 95 45 45 91 86 10045 # operation not supported; raised by chmod(2), clock_getres(2), clock_nanosleep(2), getxattr(2), listxattr(2), removexattr(2), setxattr(2), timer_create(2) +syscon errno EOPNOTSUPP 95 102 45 45 45 10045 # socket operation not supported; raised by accept(2), fallocate(2), fanotify_mark(2), ioctl_ficlonerange(2), ioctl_fideduperange(2), ioctl_getfsmap(2), keyctl(2), listen(2), mmap(2), open_by_handle_at(2), pciconfig_read(2), perf_event_open(2), prctl(2), readv(2), s390_guarded_storage(2), s390_runtime_instr(2), s390_sthyi(2), send(2), socketpair(2), unix(7), ip(7) +syscon errno EPFNOSUPPORT 96 46 46 46 46 10046 # protocol family not supported; bsd consensus; WSAEPFNOSUPPORT +syscon errno EAFNOSUPPORT 97 47 47 47 47 10047 # address family not supported; bsd consensus; WSAEAFNOSUPPORT; raised by connect(2), socket(2), socketpair(2), tcp(7) +syscon errno EADDRINUSE 98 48 48 48 48 10048 # address already in use; bsd consensus; WSAEADDRINUSE; raised by bind(2), connect(2), listen(2), unix(7), ip(7) +syscon errno EADDRNOTAVAIL 99 49 49 49 49 10049 # address not available; bsd consensus; WSAEADDRNOTAVAIL; raised by bind(2), connect(2), kexec_load(2), ip(7) +syscon errno ENETDOWN 100 50 50 50 50 10050 # network is down; bsd consensus; WSAENETDOWN; raised by accept(2) +syscon errno ENETUNREACH 101 51 51 51 51 10051 # host is unreachable; bsd consensus; WSAENETUNREACH; raised by accept(2), connect(2) +syscon errno ENETRESET 102 52 52 52 52 10052 # connection reset by network; bsd consensus; WSAENETRESET +syscon errno ECONNABORTED 103 53 53 53 53 10053 # connection reset before accept; bsd consensus; WSAECONNABORTED; raised by accept(2) +syscon errno ECONNRESET 104 54 54 54 54 10054 # connection reset by client; bsd consensus; WSAECONNRESET; raised by send(2), unix(7) +syscon errno ENOBUFS 105 55 55 55 55 10055 # no buffer space available; bsd consensus; WSAENOBUFS; raised by getpeername(2), getsockname(2), send(2), ip(7) +syscon errno EISCONN 106 56 56 56 56 10056 # socket is connected; bsd consensus; WSAEISCONN; raised by connect(2), send(2), unix(7), ip(7) +syscon errno ENOTCONN 107 57 57 57 57 10057 # socket is not connected; bsd consensus; WSAENOTCONN; raised by getpeername(2), recv(2), send(2), shutdown(2), ip(7) +syscon errno ESHUTDOWN 108 58 58 58 58 10058 # cannot send after transport endpoint shutdown; note that shutdown write is an EPIPE; bsd consensus; WSAESHUTDOWN +syscon errno ETOOMANYREFS 109 59 59 59 59 10059 # too many references: cannot splice; bsd consensus; WSAETOOMANYREFS; raised by sendmsg(2), unix(7) +syscon errno ETIMEDOUT 110 60 60 60 60 10060 # connection timed out; bsd consensus; WSAETIMEDOUT; raised by connect(2), futex(2), keyctl(2), tcp(7) +syscon errno ECONNREFUSED 111 61 61 61 61 10061 # bsd consensus; WSAECONNREFUSED; raised by connect(2), listen(2), recv(2), unix(7), udp(7)system-imposed limit on the number of threads was encountered. +syscon errno EHOSTDOWN 112 64 64 64 64 10064 # bsd consensus; WSAEHOSTDOWN; raised by accept(2) +syscon errno EHOSTUNREACH 113 65 65 65 65 10065 # bsd consensus; WSAEHOSTUNREACH; raised by accept(2), ip(7) +syscon errno EALREADY 114 37 37 37 37 10037 # connection already in progress; bsd consensus; WSAEALREADY; raised by connect(2), send(2), ip(7) +syscon errno EINPROGRESS 115 36 36 36 36 10036 # bsd consensus; WSAEINPROGRESS; raised by connect(2) w/ O_NONBLOCK +syscon errno ESTALE 116 70 70 70 70 10070 # bsd consensus; WSAESTALE; raised by open_by_handle_at(2) +syscon errno EREMOTE 66 71 71 71 71 10071 # bsd consensus +syscon errno EBADMSG 74 94 89 92 88 0 # raised by ioctl_getfsmap(2) +syscon errno ECANCELED 125 89 85 88 87 0 # raised by timerfd_create(2) +syscon errno EOWNERDEAD 130 105 96 94 97 0 # raised by pthread_cond_timedwait(3), pthread_mutex_consistent(3), pthread_mutex_getprioceiling(3), pthread_mutex_lock(3), pthread_mutex_timedlock(3), pthread_mutexattr_getrobust(3), pthread_mutexattr_setrobust(3) +syscon errno ENOTRECOVERABLE 131 104 95 93 98 0 # raised by pthread_cond_timedwait(3), pthread_mutex_consistent(3), pthread_mutex_getprioceiling(3), pthread_mutex_lock(3), pthread_mutex_timedlock(3), pthread_mutexattr_getrobust(3), pthread_mutexattr_setrobust(3) +syscon errno ENONET 64 0 0 0 0 0 # bsd consensus; raised by accept(2) +syscon errno ERESTART 85 0 0 0 -3 0 # bsd consensus; should only be seen in ptrace() +syscon junkerr ECHRNG 44 0 0 0 0 0 # bsd consensus +syscon junkerr EL2NSYNC 45 0 0 0 0 0 # bsd consensus +syscon junkerr EL3HLT 46 0 0 0 0 0 # bsd consensus +syscon junkerr EL3RST 47 0 0 0 0 0 # bsd consensus +syscon junkerr ELNRNG 48 0 0 0 0 0 # bsd consensus +syscon junkerr EUNATCH 49 0 0 0 0 0 # bsd consensus +syscon junkerr ENOCSI 50 0 0 0 0 0 # bsd consensus +syscon junkerr EL2HLT 51 0 0 0 0 0 # bsd consensus +syscon junkerr EBADE 52 0 0 0 0 0 # bsd consensus +syscon junkerr EBADR 53 0 0 0 0 0 # bsd consensus +syscon junkerr EXFULL 54 0 0 0 0 0 # bsd consensus +syscon junkerr ENOANO 55 0 0 0 0 0 # bsd consensus +syscon junkerr EBADRQC 56 0 0 0 0 0 # bsd consensus +syscon junkerr EBADSLT 57 0 0 0 0 0 # bsd consensus +syscon junkerr ENOSTR 60 99 0 0 91 0 # +syscon junkerr ENODATA 61 96 0 0 89 0 # raised by getxattr(2), removexattr(2), setxattr(2) +syscon junkerr ENOSR 63 98 0 0 90 0 # +syscon junkerr ENOPKG 65 0 0 0 0 0 # bsd consensus, ip(7) +syscon junkerr ENOLINK 67 97 91 0 95 0 # +syscon junkerr EADV 68 0 0 0 0 0 # bsd consensus +syscon junkerr ESRMNT 69 0 0 0 0 0 # bsd consensus +syscon junkerr ECOMM 70 0 0 0 0 0 # bsd consensus +syscon junkerr EMULTIHOP 72 95 90 0 94 0 # +syscon junkerr EDOTDOT 73 0 0 0 0 0 # bsd consensus +syscon junkerr ENOTUNIQ 76 0 0 0 0 0 # bsd consensus +syscon junkerr EREMCHG 78 0 0 0 0 0 # bsd consensus +syscon junkerr ELIBACC 79 0 0 0 0 0 # bsd consensus +syscon junkerr ELIBBAD 80 0 0 0 0 0 # bsd consensus +syscon junkerr ELIBSCN 81 0 0 0 0 0 # bsd consensus +syscon junkerr ELIBMAX 82 0 0 0 0 0 # bsd consensus +syscon junkerr ELIBEXEC 83 0 0 0 0 0 # bsd consensus +syscon junkerr ESTRPIPE 86 0 0 0 0 0 # bsd consensus +syscon junkerr EUCLEAN 117 0 0 0 0 0 # bsd consensus +syscon junkerr ENOTNAM 118 0 0 0 0 0 # bsd consensus +syscon junkerr ENAVAIL 119 0 0 0 0 0 # bsd consensus +syscon junkerr EISNAM 120 0 0 0 0 0 # bsd consensus +syscon junkerr EREMOTEIO 121 0 0 0 0 0 # bsd consensus +syscon junkerr ENOMEDIUM 123 0 0 85 85 0 # +syscon junkerr EMEDIUMTYPE 124 0 0 86 86 0 # +syscon junkerr ENOKEY 126 0 0 0 0 0 # bsd consensus +syscon junkerr EKEYEXPIRED 127 0 0 0 0 0 # bsd consensus +syscon junkerr EKEYREVOKED 128 0 0 0 0 0 # bsd consensus +syscon junkerr EKEYREJECTED 129 0 0 0 0 0 # bsd consensus +syscon junkerr ERFKILL 132 0 0 0 0 0 # bsd consensus +syscon junkerr EHWPOISON 133 0 0 0 0 0 # bsd consensus +syscon junkerr EBADFD 77 9 9 9 9 6 # file descriptor in bad state; cf. EBADF; fudged on non-Linux +syscon compat EWOULDBLOCK 11 35 35 35 35 10035 # same as EWOULDBLOCK # signals # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary -syscon sig SIGHUP 1 1 1 1 1 1 # unix consensus & faked on nt -syscon sig SIGINT 2 2 2 2 2 2 # unix consensus & faked on nt -syscon sig SIGQUIT 3 3 3 3 3 3 # unix consensus & faked on nt -syscon sig SIGILL 4 4 4 4 4 4 # unix consensus & faked on nt -syscon sig SIGTRAP 5 5 5 5 5 5 # unix consensus & faked on nt -syscon sig SIGABRT 6 6 6 6 6 6 # unix consensus & faked on nt -syscon sig SIGIOT 6 6 6 6 6 6 # unix consensus & faked on nt -syscon sig SIGFPE 8 8 8 8 8 8 # unix consensus & faked on nt -syscon sig SIGKILL 9 9 9 9 9 9 # unix consensus & faked on nt -syscon sig SIGSEGV 11 11 11 11 11 11 # unix consensus & faked on nt -syscon sig SIGPIPE 13 13 13 13 13 13 # unix consensus & faked on nt -syscon sig SIGALRM 14 14 14 14 14 14 # unix consensus & faked on nt -syscon sig SIGTERM 15 15 15 15 15 15 # unix consensus & faked on nt -syscon sig SIGTTIN 21 21 21 21 21 21 # unix consensus & faked on nt -syscon sig SIGTTOU 22 22 22 22 22 22 # unix consensus & faked on nt -syscon sig SIGXCPU 24 24 24 24 24 24 # unix consensus & faked on nt -syscon sig SIGXFSZ 25 25 25 25 25 25 # unix consensus & faked on nt -syscon sig SIGVTALRM 26 26 26 26 26 26 # unix consensus & faked on nt -syscon sig SIGPROF 27 27 27 27 27 27 # unix consensus & faked on nt -syscon sig SIGWINCH 28 28 28 28 28 28 # unix consensus & faked on nt -syscon sig SIGBUS 7 10 10 10 10 7 # bsd consensus -syscon sig SIGUSR1 10 30 30 30 30 10 # bsd consensus -syscon sig SIGCHLD 17 20 20 20 20 17 # bsd consensus -syscon sig SIGCONT 18 19 19 19 19 18 # bsd consensus +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary +syscon sig SIGHUP 1 1 1 1 1 1 # terminal hangup or daemon reload; resumable; auto-broadcasted to process group; unix consensus & faked on nt +syscon sig SIGINT 2 2 2 2 2 2 # terminal ctrl-c keystroke; resumable; auto-broadcasted to process group; unix consensus & faked on nt +syscon sig SIGQUIT 3 3 3 3 3 3 # terminal ctrl-\ keystroke; resumable; unix consensus & faked on nt +syscon sig SIGILL 4 4 4 4 4 4 # illegal instruction; unresumable (unless you longjmp() or edit ucontex->rip+=ild(ucontex->rip)); unix consensus & faked on nt +syscon sig SIGTRAP 5 5 5 5 5 5 # int3 instruction; resumable; unix consensus & faked on nt +syscon sig SIGABRT 6 6 6 6 6 6 # process aborted; resumable; unix consensus & faked on nt +syscon sig SIGBUS 7 10 10 10 10 7 # valid memory access that went beyond underlying end of file; bsd consensus +syscon sig SIGFPE 8 8 8 8 8 8 # illegal math; unresumable (unless you longjmp() or edit ucontex->rip+=ild(ucontex->rip)); unix consensus & faked on nt +syscon sig SIGKILL 9 9 9 9 9 9 # terminate with extreme prejudice; unreceivable; unix consensus & faked on nt +syscon sig SIGUSR1 10 30 30 30 30 10 # do whatever you want; bsd consensus +syscon sig SIGSEGV 11 11 11 11 11 11 # invalid memory access; unresumable (unless you longjmp() or edit ucontex->rip+=ild(ucontex->rip)); unix consensus & faked on nt +syscon sig SIGUSR2 12 31 31 31 31 12 # do whatever you want; bsd consensus +syscon sig SIGPIPE 13 13 13 13 13 13 # write to closed file descriptor; unix consensus & faked on nt +syscon sig SIGALRM 14 14 14 14 14 14 # sent by setitimer(2) or timer_settime(2); unix consensus & faked on nt +syscon sig SIGTERM 15 15 15 15 15 15 # terminate; resumable; unix consensus & faked on nt +syscon sig SIGCHLD 17 20 20 20 20 17 # child process exited or terminated and is now a zombie (unless this is SIG_IGN or SA_NOCLDWAIT) or child process stopped due to terminal i/o or profiling/debugging (unless you used SA_NOCLDSTOP); bsd consensus +syscon sig SIGCONT 18 19 19 19 19 18 # child process resumed from profiling/debugging; bsd consensus +syscon sig SIGSTOP 19 17 17 17 17 19 # child process stopped due to profiling/debugging; bsd consensus +syscon sig SIGTSTP 20 18 18 18 18 20 # terminal ctrl-z keystroke; bsd consensus +syscon sig SIGTTIN 21 21 21 21 21 21 # terminal input for background process; resumable; unix consensus & faked on nt +syscon sig SIGTTOU 22 22 22 22 22 22 # terminal output for background process; resumable; unix consensus & faked on nt +syscon sig SIGURG 23 16 16 16 16 23 # bsd consensus +syscon sig SIGXCPU 24 24 24 24 24 24 # cpu time limit exceeded; unix consensus & faked on nt +syscon sig SIGXFSZ 25 25 25 25 25 25 # file size limit exceeded; unix consensus & faked on nt +syscon sig SIGVTALRM 26 26 26 26 26 26 # virtual alarm clock; wut; unix consensus & faked on nt +syscon sig SIGPROF 27 27 27 27 27 27 # profiling timer expired; unix consensus & faked on nt +syscon sig SIGWINCH 28 28 28 28 28 28 # terminal resized; unix consensus & faked on nt syscon sig SIGIO 29 23 23 23 23 29 # bsd consensus -syscon sig SIGSTOP 19 17 17 17 17 19 # bsd consensus -syscon sig SIGSYS 31 12 12 12 12 31 # bsd consensus -syscon sig SIGTSTP 20 18 18 18 18 20 # bsd consensus -syscon sig SIGURG 23 0x10 0x10 0x10 0x10 23 # bsd consensus -syscon sig SIGUSR2 12 31 31 31 31 12 # bsd consensus -syscon sig SIGSTKSZ 0x2000 0x020000 0x8800 0x7000 0x7000 0x2000 -syscon sig SIGPOLL 29 0 0 0 0 29 -syscon sig SIGPWR 30 0 0 0 32 30 -syscon sig SIGSTKFLT 0x10 0 0 0 0 0x10 -syscon sig SIGUNUSED 31 0 0 0 0 31 +syscon sig SIGSYS 31 12 12 12 12 31 # wut; bsd consensus syscon sig SIGRTMAX 0 0 126 0 63 0 syscon sig SIGRTMIN 0 0 65 0 33 0 +syscon compat SIGPOLL 29 23 23 23 23 29 # same as SIGIO +syscon compat SIGIOT 6 6 6 6 6 6 # PDP-11 feature; same as SIGABRT +syscon compat SIGPWR 30 30 30 30 32 30 # not implemented in most community editions of system five; consider doing this using SIGUSR1 or SIGUSR2 instead # open() flags ┌──────hoo boy # ┌──────┐ @@ -204,7 +200,7 @@ syscon sig SIGRTMIN 0 0 65 0 33 0 # ┌││─────┐ # │││ │ ┌┴───dwDesiredAccess # N │││ │ │ -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD T │││┌─┴┐│ Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD T │││┌─┴┐│ Commentary syscon open O_RDONLY 0 0 0 0 0 0xA0000000 # unix consensus & kNtGenericRead|kNtGenericExecute syscon open O_WRONLY 1 1 1 1 1 0x40000000 # unix consensus & kNtGenericWrite syscon open O_RDWR 2 2 2 2 2 0xE0000000 # unix consensus & kNtGenericRead|kNtGenericWrite|kNtGenericExecute @@ -232,6 +228,10 @@ syscon open O_EXEC 0 0 0x040000 0 0x4000000 0 syscon open O_TTY_INIT 0 0 0x080000 0 0 0 syscon compat O_LARGEFILE 0 0 0 0 0 0 +# mmap() flags +# the revolutionary praxis of malloc() +# +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon compat MAP_FILE 0 0 0 0 0 0 # consensus syscon mmap MAP_SHARED 1 1 1 1 1 1 # forced consensus & faked nt syscon mmap MAP_PRIVATE 2 2 2 2 2 2 # forced consensus & faked nt @@ -254,6 +254,10 @@ syscon compat MAP_EXECUTABLE 0x1000 0 0 0 0 0 # ignored syscon compat MAP_DENYWRITE 0x0800 0 0 0 0 0 syscon compat MAP_32BIT 0x40 0 0x080000 0 0 0 # iffy +# madvise() flags +# beneath the iceberg memory management +# +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon madv MADV_NORMAL 0 0 0 0 0 0x00000080 # consensus & kNtFileAttributeNormal syscon compat POSIX_FADV_NORMAL 0 0 0 0 0 0x00000080 # consensus & kNtFileAttributeNormal syscon compat POSIX_MADV_NORMAL 0 0 0 0 0 0x00000080 # consensus & kNtFileAttributeNormal @@ -276,7 +280,7 @@ syscon madv MADV_HUGEPAGE 14 0 0 0 0 0 # TODO(jart): why would we syscon madv MADV_NOHUGEPAGE 15 0 0 0 0 0 # TODO(jart): why would we need it? syscon madv MADV_DODUMP 17 0 0 0 0 0 # TODO(jart): what is it? syscon madv MADV_DOFORK 11 0 0 0 0 0 # TODO(jart): what is it? -syscon madv MADV_DONTDUMP 0x10 0 0 0 0 0 # TODO(jart): what is it? +syscon madv MADV_DONTDUMP 16 0 0 0 0 0 # TODO(jart): what is it? syscon madv MADV_DONTFORK 10 0 0 0 0 0 # TODO(jart): what is it? syscon madv MADV_HWPOISON 100 0 0 0 0 0 # TODO(jart): what is it? syscon madv MADV_REMOVE 9 0 0 0 0 0 # TODO(jart): what is it? @@ -285,7 +289,7 @@ syscon fadv POSIX_FADV_NOREUSE 5 0 5 0 5 0 # wut # mmap(), mprotect(), etc. # digital restrictions management for the people # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon mprot PROT_NONE 0 0 0 0 0 0 # mmap, mprotect, unix consensus (nt needs special business logic here) syscon mprot PROT_READ 1 1 1 1 1 1 # mmap, mprotect, unix consensus syscon mprot PROT_WRITE 2 2 2 2 2 2 # mmap, mprotect, unix consensus @@ -293,9 +297,16 @@ syscon mprot PROT_EXEC 4 4 4 4 4 4 # mmap, mprotect, unix consens syscon mprot PROT_GROWSDOWN 0x01000000 0 0 0 0 0 # intended for mprotect; see MAP_GROWSDOWN for mmap() (todo: what was 0x01000000 on nt) syscon mprot PROT_GROWSUP 0x02000000 0 0 0 0 0 # intended for mprotect; see MAP_GROWSDOWN for mmap() +# mremap() flags +# the revolutionary praxis of realloc() +# +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon mremap MREMAP_MAYMOVE 1 1 1 1 1 1 # faked non-linux (b/c linux only) syscon mremap MREMAP_FIXED 2 2 2 2 2 2 # faked non-linux (b/c linux only) +# splice() flags +# +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon splice SPLICE_F_MOVE 1 0 0 0 0 0 # can be safely ignored by polyfill; it's a hint syscon splice SPLICE_F_NONBLOCK 2 0 0 0 0 0 # can be safely ignored by polyfill, since linux says it doesn't apply to underlying FDs syscon splice SPLICE_F_MORE 4 0 0 0 0 0 # can be safely ignored by polyfill; it's a hint @@ -303,7 +314,7 @@ syscon splice SPLICE_F_GIFT 8 0 0 0 0 0 # can probably be ignored # access() flags # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon access F_OK 0 0 0 0 0 0 # consensus syscon access X_OK 1 1 1 1 1 0xa0000000 # unix consensus and kNtGenericExecute | kNtGenericRead syscon access W_OK 2 2 2 2 2 0x40000000 # unix consensus and kNtGenericWrite @@ -311,7 +322,7 @@ syscon access R_OK 4 4 4 4 4 0x80000000 # unix consensus and kNtG # flock() flags # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon lock LOCK_SH 1 1 1 1 1 0 # shared [unix consensus] syscon lock LOCK_EX 2 2 2 2 2 2 # exclusive [consensus!] syscon lock LOCK_NB 4 4 4 4 4 1 # non-blocking [unix consensus] @@ -319,60 +330,51 @@ syscon lock LOCK_UN 8 8 8 8 8 8 # unlock [unix consensus & faked # waitpid() / wait4() options # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary -syscon waitpid WNOHANG 1 1 1 1 1 0 # unix consensus +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary +syscon waitpid WNOHANG 1 1 1 1 1 0 # helps you reap zombies; unix consensus syscon waitpid WUNTRACED 2 2 2 2 2 0 # unix consensus syscon waitpid WCONTINUED 8 0x10 4 8 16 0 # waitid() options # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon waitid WEXITED 4 4 0x10 0 32 0 syscon waitid WSTOPPED 2 8 2 0 2 0 syscon waitid WNOWAIT 0x01000000 0x20 8 0 0x10000 0 # stat::st_mode constants # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary -syscon stat S_IFREG 0100000 0100000 0100000 0100000 0100000 0100000 -syscon stat S_IFBLK 0060000 0060000 0060000 0060000 0060000 0060000 -syscon stat S_IFCHR 0020000 0020000 0020000 0020000 0020000 0020000 -syscon stat S_IFDIR 0040000 0040000 0040000 0040000 0040000 0040000 -syscon stat S_IFIFO 0010000 0010000 0010000 0010000 0010000 0010000 -syscon stat S_IFMT 0170000 0170000 0170000 0170000 0170000 0170000 -syscon stat S_IFLNK 0120000 0120000 0120000 0120000 0120000 0120000 -syscon stat S_IFSOCK 0140000 0140000 0140000 0140000 0140000 0140000 - -# chmod() permission flag constants -# consider just typing the octal codes -# -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary -syscon stat S_ISVTX 01000 01000 01000 01000 01000 01000 # unix consensus STICKY BIT -syscon stat S_ISGID 02000 02000 02000 02000 02000 02000 # unix consensus a.k.a. setgid bit -syscon stat S_ISUID 04000 04000 04000 04000 04000 04000 # unix consensus a.k.a. setuid bit - -syscon stat S_IEXEC 00100 00100 00100 00100 00100 00100 # unix consensus -syscon stat S_IWRITE 00200 00200 00200 00200 00200 00200 # unix consensus -syscon stat S_IREAD 00400 00400 00400 00400 00400 00400 # unix consensus - -syscon stat S_IXUSR 00100 00100 00100 00100 00100 00100 # unix consensus -syscon stat S_IWUSR 00200 00200 00200 00200 00200 00200 # unix consensus -syscon stat S_IRUSR 00400 00400 00400 00400 00400 00400 # unix consensus -syscon stat S_IRWXU 00700 00700 00700 00700 00700 00700 # unix consensus - -syscon stat S_IXGRP 00010 00010 00010 00010 00010 00010 # unix consensus -syscon stat S_IWGRP 00020 00020 00020 00020 00020 00020 # unix consensus -syscon stat S_IRGRP 00040 00040 00040 00040 00040 00040 # unix consensus -syscon stat S_IRWXG 00070 00070 00070 00070 00070 00070 # unix consensus - -syscon stat S_IXOTH 00001 00001 00001 00001 00001 00001 # unix consensus -syscon stat S_IWOTH 00002 00002 00002 00002 00002 00002 # unix consensus -syscon stat S_IROTH 00004 00004 00004 00004 00004 00004 # unix consensus -syscon stat S_IRWXO 00007 00007 00007 00007 00007 00007 # unix consensus +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary +syscon stat S_IFREG 0100000 0100000 0100000 0100000 0100000 0100000 # regular file (unix consensus; faked nt) +syscon stat S_IFBLK 0060000 0060000 0060000 0060000 0060000 0060000 # block device (unix consensus; faked nt) +syscon stat S_IFCHR 0020000 0020000 0020000 0020000 0020000 0020000 # character device (unix consensus; faked nt) +syscon stat S_IFDIR 0040000 0040000 0040000 0040000 0040000 0040000 # directory (unix consensus; faked nt) +syscon stat S_IFIFO 0010000 0010000 0010000 0010000 0010000 0010000 # pipe (unix consensus; faked nt) +syscon stat S_IFLNK 0120000 0120000 0120000 0120000 0120000 0120000 # symbolic link (unix consensus; faked nt) +syscon stat S_IFSOCK 0140000 0140000 0140000 0140000 0140000 0140000 # socket (unix consensus; faked nt) +syscon stat S_IFMT 0170000 0170000 0170000 0170000 0170000 0170000 # FILE TYPE MASK (unix consensus; faked nt) +syscon stat S_ISVTX 0001000 0001000 0001000 0001000 0001000 0001000 # THE STICKY BIT (unix consensus; faked nt) +syscon stat S_ISGID 0002000 0002000 0002000 0002000 0002000 0002000 # the setgid bit (unix consensus; faked nt) +syscon stat S_ISUID 0004000 0004000 0004000 0004000 0004000 0004000 # the setuid bit (unix consensus; faked nt) +syscon stat S_IEXEC 0000100 0000100 0000100 0000100 0000100 0000100 # just use octal (unix consensus; faked nt) +syscon stat S_IWRITE 0000200 0000200 0000200 0000200 0000200 0000200 # just use octal (unix consensus; faked nt) +syscon stat S_IREAD 0000400 0000400 0000400 0000400 0000400 0000400 # just use octal (unix consensus; faked nt) +syscon stat S_IXUSR 0000100 0000100 0000100 0000100 0000100 0000100 # just use octal (unix consensus; faked nt) +syscon stat S_IWUSR 0000200 0000200 0000200 0000200 0000200 0000200 # just use octal (unix consensus; faked nt) +syscon stat S_IRUSR 0000400 0000400 0000400 0000400 0000400 0000400 # just use octal (unix consensus; faked nt) +syscon stat S_IRWXU 0000700 0000700 0000700 0000700 0000700 0000700 # just use octal (unix consensus; faked nt) +syscon stat S_IXGRP 0000010 0000010 0000010 0000010 0000010 0000010 # just use octal (unix consensus; faked nt) +syscon stat S_IWGRP 0000020 0000020 0000020 0000020 0000020 0000020 # just use octal (unix consensus; faked nt) +syscon stat S_IRGRP 0000040 0000040 0000040 0000040 0000040 0000040 # just use octal (unix consensus; faked nt) +syscon stat S_IRWXG 0000070 0000070 0000070 0000070 0000070 0000070 # just use octal (unix consensus; faked nt) +syscon stat S_IXOTH 0000001 0000001 0000001 0000001 0000001 0000001 # just use octal (unix consensus; faked nt) +syscon stat S_IWOTH 0000002 0000002 0000002 0000002 0000002 0000002 # just use octal (unix consensus; faked nt) +syscon stat S_IROTH 0000004 0000004 0000004 0000004 0000004 0000004 # just use octal (unix consensus; faked nt) +syscon stat S_IRWXO 0000007 0000007 0000007 0000007 0000007 0000007 # just use octal (unix consensus; faked nt) # fcntl() # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon fcntl2 F_DUPFD 0 0 0 0 0 0 # consensus syscon fcntl2 F_GETFD 1 1 1 1 1 1 # unix consensus & faked nt @@ -419,7 +421,7 @@ syscon fcntl F_GETPIPE_SZ 0x0408 0 0 0 0 0 # openat(), fstatat(), linkat(), etc. magnums # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon at AT_FDCWD -100 -2 -100 -100 -100 -100 # faked nt syscon at AT_SYMLINK_FOLLOW 0x0400 0x40 0x0400 4 0x400 0 syscon at AT_SYMLINK_NOFOLLOW 0x0100 0x20 0x0200 2 0x200 0 # TODO(jart): What should NT do? @@ -428,18 +430,25 @@ syscon at AT_EACCESS 0x0200 0x10 0x0100 1 0x100 0 syscon at AT_SYMLINK_FOLLOW 0x0400 0x40 0x0400 4 4 0 syscon at AT_EMPTY_PATH 0x1000 0 0 0 0 0 # linux 2.6.39+; see unlink, O_TMPFILE, etc. +# memfd_create() flags +# +# Unsupported flags are encoded as 0. +# +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon memfd MFD_CLOEXEC 1 0 0 0 0 0 syscon memfd MFD_ALLOW_SEALING 2 0 0 0 0 0 -# utimensat() +# utimensat() special values # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary -syscon utime UTIME_NOW 0x3fffffff 0x3fffffff -1 -2 0x3fffffff -2 # polyfilled xnu/nt -syscon utime UTIME_OMIT 0x3ffffffe 0x3ffffffe -2 -1 0x3ffffffe -1 # polyfilled xnu/nt +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary +syscon utime UTIME_NOW 0x3fffffff 0x3fffffff -1 -2 0x3fffffff -2 # timespec::tv_sec may be this; polyfilled xnu/nt +syscon utime UTIME_OMIT 0x3ffffffe 0x3ffffffe -2 -1 0x3ffffffe -1 # timespec::tv_nsec may be this; polyfilled xnu/nt # getauxval() keys # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# Unsupported values are encoded as 0. +# +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon auxv AT_EXECFD 2 0 2 0 2 0 # file descriptor of program syscon auxv AT_PHDR 3 0 3 0 3 0 # address of program headers of executable syscon auxv AT_PHENT 4 0 4 0 4 0 @@ -468,85 +477,140 @@ syscon auxv AT_EXECFN 31 31 999 999 2014 31 # address of string c syscon auxv AT_SYSINFO_EHDR 33 0 0 0 0 0 syscon auxv AT_NO_AUTOMOUNT 0x0800 0 0 0 0 0 -# ptrace() codes +# getrlimit() / setrlimit() resource parameter # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary -syscon ptrace PTRACE_TRACEME 0 0 0 0 -1 -1 # unix consensus a.k.a. PT_TRACE_ME -syscon ptrace PTRACE_PEEKTEXT 1 1 1 1 -1 -1 # unix consensus a.k.a. PT_READ_I -syscon ptrace PTRACE_PEEKDATA 2 2 2 2 -1 -1 # unix consensus a.k.a. PT_READ_D -syscon ptrace PTRACE_PEEKUSER 3 3 -1 -1 -1 -1 # a.k.a. PT_READ_U -syscon ptrace PTRACE_POKETEXT 4 4 4 4 -1 -1 # unix consensus a.k.a. PT_WRITE_I -syscon ptrace PTRACE_POKEDATA 5 5 5 5 -1 -1 # unix consensus a.k.a. PT_WRITE_D -syscon ptrace PTRACE_POKEUSER 6 6 -1 -1 -1 -1 # a.k.a. PT_WRITE_U -syscon ptrace PTRACE_CONT 7 7 7 7 -1 -1 # unix consensus a.k.a. PT_CONTINUE -syscon ptrace PTRACE_KILL 8 8 8 8 -1 -1 # unix consensus a.k.a. PT_KILL -syscon ptrace PTRACE_SINGLESTEP 9 9 9 32 -1 -1 # a.k.a. PT_STEP -syscon ptrace PTRACE_GETREGS 12 -1 33 33 -1 -1 # a.k.a. PT_GETREGS -syscon ptrace PTRACE_SETREGS 13 -1 34 34 -1 -1 # a.k.a. PT_SETREGS -syscon ptrace PTRACE_GETFPREGS 14 -1 35 35 -1 -1 # a.k.a. PT_GETFPREGS -syscon ptrace PTRACE_SETFPREGS 15 -1 36 36 -1 -1 # a.k.a. PT_SETFPREGS -syscon ptrace PTRACE_ATTACH 16 10 10 9 -1 -1 # a.k.a. PT_ATTACH -syscon ptrace PTRACE_DETACH 17 11 11 10 -1 -1 # a.k.a. PT_DETACH -syscon ptrace PTRACE_GETFPXREGS 18 -1 -1 -1 -1 -1 # a.k.a. PT_GETFPXREGS -syscon ptrace PTRACE_SETFPXREGS 19 -1 -1 -1 -1 -1 # a.k.a. PT_SETFPXREGS -syscon ptrace PTRACE_SYSCALL 24 -1 22 -1 -1 -1 # a.k.a. PT_SYSCALL -syscon ptrace PTRACE_GETEVENTMSG 0x4201 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_GETSIGINFO 0x4202 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_SETOPTIONS 0x4200 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_SETSIGINFO 0x4203 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_GETREGSET 0x4204 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_GETSIGMASK 0x420a -1 -1 -1 -1 -1 -syscon ptrace PTRACE_INTERRUPT 0x4207 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_LISTEN 0x4208 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_PEEKSIGINFO 0x4209 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_SECCOMP_GET_FILTER 0x420c -1 -1 -1 -1 -1 -syscon ptrace PTRACE_SEIZE 0x4206 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_SETREGSET 0x4205 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_SETSIGMASK 0x420b -1 -1 -1 -1 -1 -syscon ptrace PTRACE_O_TRACESYSGOOD 0x0001 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_O_TRACEFORK 0x0002 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_O_TRACEVFORK 0x0004 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_O_TRACECLONE 0x0008 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_O_TRACEEXEC 0x0010 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_O_TRACEVFORKDONE 0x0020 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_O_TRACEEXIT 0x0040 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_O_MASK 0x007f -1 -1 -1 -1 -1 -syscon ptrace PTRACE_EVENT_FORK 1 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_EVENT_VFORK 2 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_EVENT_CLONE 3 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_EVENT_EXEC 4 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_EVENT_VFORK_DONE 5 -1 -1 -1 -1 -1 -syscon ptrace PTRACE_EVENT_EXIT 6 -1 -1 -1 -1 -1 +# Unsupported values are encoded as 127. +# +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary +syscon rlimit RLIMIT_CPU 0 0 0 0 0 127 # max cpu time in seconds; see SIGXCPU; unix consensus +syscon rlimit RLIMIT_FSIZE 1 1 1 1 1 127 # max file size in bytes; unix consensus +syscon rlimit RLIMIT_DATA 2 2 2 2 2 127 # max mmap() / brk() / sbrk() size in bytes; unix consensus +syscon rlimit RLIMIT_STACK 3 3 3 3 3 127 # max stack size in bytes; see SIGXFSZ; unix consensus +syscon rlimit RLIMIT_CORE 4 4 4 4 4 127 # max core file size in bytes; unix consensus +syscon rlimit RLIMIT_RSS 5 5 5 5 5 127 # max physical memory size in bytes; see mmap()→ENOMEM; unix consensus +syscon rlimit RLIMIT_NPROC 6 7 7 7 7 127 # max number of processes; see fork()→EAGAIN; bsd consensus +syscon rlimit RLIMIT_NOFILE 7 8 8 8 8 127 # max number of open files; see accept()→EMFILE/ENFILE; bsd consensus +syscon rlimit RLIMIT_MEMLOCK 8 6 6 6 6 127 # max locked-in-memory address space; bsd consensus +syscon rlimit RLIMIT_AS 9 5 10 127 10 127 # max virtual memory size in bytes +syscon rlimit RLIMIT_LOCKS 10 127 127 127 127 127 # max flock() / fcntl() locks; bsd consensus +syscon rlimit RLIMIT_SIGPENDING 11 127 127 127 127 127 # max sigqueue() can enqueue; bsd consensus +syscon rlimit RLIMIT_MSGQUEUE 12 127 127 127 127 127 # meh posix message queues; bsd consensus +syscon rlimit RLIMIT_NICE 13 127 127 127 127 127 # max scheduling priority; 𝑥 ∈ [1,40]; niceness is traditionally displayed as as 𝟸𝟶-𝑥, therefore 𝑥=1 (lowest priority) prints as 19 and 𝑥=40 (highest priority) prints as -20; bsd consensus +syscon rlimit RLIMIT_RTPRIO 14 127 127 127 127 127 # bsd consensus +syscon compat RLIMIT_VMEM 9 5 10 127 10 127 # same as RLIMIT_AS + +# resource limit special values +# +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary +syscon rlim RLIM_NLIMITS 16 9 15 9 12 0 # no clue why we need it +syscon rlim RLIM_INFINITY 0xffffffffffffffff 0x7fffffffffffffff 0x7fffffffffffffff 0x7fffffffffffffff 0x7fffffffffffffff 0 +syscon rlim RLIM_SAVED_CUR 0xffffffffffffffff 0x7fffffffffffffff 0x7fffffffffffffff 0x7fffffffffffffff 0x7fffffffffffffff 0 +syscon rlim RLIM_SAVED_MAX 0xffffffffffffffff 0x7fffffffffffffff 0x7fffffffffffffff 0x7fffffffffffffff 0x7fffffffffffffff 0 # sigaction() codes # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary -syscon sigact SA_RESTORER 0x04000000 0 0 0 0 0 -syscon sigact SA_ONSTACK 0x08000000 1 1 1 1 0 # bsd consensus -syscon sigact SA_RESTART 0x10000000 2 2 2 2 0 # bsd consensus -syscon sigact SA_NOCLDSTOP 1 8 8 8 8 0 # bsd consensus -syscon sigact SA_NOCLDWAIT 2 0x20 0x20 0x20 0x20 0 # bsd consensus -syscon sigact SA_SIGINFO 4 0x40 0x40 0x40 0x40 0 # bsd consensus -syscon sigact SA_NODEFER 0x40000000 0x10 0x10 0x10 0x10 0 # bsd consensus -syscon sigact SA_NOMASK 0x40000000 0x10 0x10 0x10 0x10 0 # linux/obsolete -syscon sigact SA_RESETHAND 0x80000000 4 4 4 4 0 # bsd consensus -syscon sigact SA_ONESHOT 0x80000000 0 0 0 0 0 +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary +syscon sigact SA_NOCLDSTOP 1 8 8 8 8 1 # lets you set SIGCHLD handler that's only notified on exit/termination and not notified on SIGSTOP/SIGTSTP/SIGTTIN/SIGTTOU/SIGCONT lool; bsd consensus +syscon sigact SA_NOCLDWAIT 2 32 32 32 32 2 # changes SIGCHLD so the zombie is gone and you can't call wait(2) anymore; similar to SIGCHLD+SIG_IGN but may still deliver the SIGCHLD; bsd consensus +syscon sigact SA_SIGINFO 4 64 64 64 64 4 # asks kernel to provide ucontext_t argument, which has mutable cpu/fpu state of signalled process; and it is polyfilled by cosmopolitan; bsd consensus +syscon sigact SA_ONSTACK 0x08000000 1 1 1 1 0x08000000 # causes signal handler to be called on stack provided by sigaltstack(2); bsd consensus +syscon sigact SA_RESTART 0x10000000 2 2 2 2 0x10000000 # prevents signal delivery from triggering EINTR on i/o calls (e.g. read/write/open/wait/accept) but doesn't impact non-i/o blocking calls (e.g. poll, sigsuspend, nanosleep) which will still EINTR; bsd consensus +syscon sigact SA_NODEFER 0x40000000 16 16 16 16 0x40000000 # blocks signal delivery during signal handling (i.e. lets you use longjmp() in the signal handler); bsd consensus +syscon sigact SA_RESETHAND 0x80000000 4 4 4 4 0x80000000 # causes signal handler to be called at most once and then set to SIG_DFL automatically; bsd consensus +syscon compat SA_NOMASK 0x40000000 16 16 16 16 0x40000000 # same as SA_NODEFER +syscon compat SA_ONESHOT 0x80000000 4 4 4 4 0x80000000 # same as SA_RESETHAND +# siginfo::si_code values +# +# Windows NT is polyfilled as Linux. +# Unsupported values are encoded as 0x80000000. +# +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary +syscon sicode SI_USER 0 0x010001 0x010001 0 0 0 # sent by kill(2); openbsd defines si_code<=0 as originating from user +syscon sicode SI_QUEUE -1 0x010002 0x010002 -2 -1 -1 # sent by sigqueue(2) +syscon sicode SI_TIMER -2 0x010003 0x010003 -3 -2 -2 # sent by setitimer(2) or clock_settime(2) +syscon sicode SI_TKILL -6 0x80000000 0x010007 -1 -5 -6 # sent by tkill(2) or tgkill(2) or thr_kill(2) or lwp_kill(2) or _lwp_kill(2); cries +syscon sicode SI_MESGQ -3 0x010005 0x010005 0x80000000 -4 -3 # sent by mq_notify(2); lool +syscon sicode SI_ASYNCIO -4 0x010004 0x010004 0x80000000 -3 -4 # aio completion; no thank you +syscon sicode SI_ASYNCNL -60 0x80000000 0x80000000 0x80000000 0x80000000 0x80000000 # aio completion for dns; the horror +syscon sicode SI_KERNEL 0x80 0x80000000 0x010006 0x80000000 0x80000000 0x80 # wut; openbsd defines as si_code>0 +syscon sicode SI_NOINFO 32767 0x80000000 0 32767 32767 32767 # no signal specific info available +syscon sicode CLD_EXITED 1 1 1 1 1 1 # SIGCHLD; child exited; unix consensus +syscon sicode CLD_KILLED 2 2 2 2 2 2 # SIGCHLD; child terminated w/o core; unix consensus +syscon sicode CLD_DUMPED 3 3 3 3 3 3 # SIGCHLD; child terminated w/ core; unix consensus +syscon sicode CLD_TRAPPED 4 4 4 4 4 4 # SIGCHLD; traced child trapped; unix consensus +syscon sicode CLD_STOPPED 5 5 5 5 5 5 # SIGCHLD; child stopped; unix consensus +syscon sicode CLD_CONTINUED 6 6 6 6 6 6 # SIGCHLD; stopped child continued; unix consensus +syscon sicode TRAP_BRKPT 1 1 1 1 1 1 # SIGTRAP; unix consensus +syscon sicode TRAP_TRACE 2 2 2 2 2 2 # SIGTRAP; unix consensus +syscon sicode SEGV_MAPERR 1 1 1 1 1 1 # SIGSEGV; unix consensus +syscon sicode SEGV_ACCERR 2 2 2 2 2 2 # SIGSEGV; unix consensus +syscon sicode FPE_INTDIV 1 7 2 1 1 1 # SIGFPE; integer divide by zero +syscon sicode FPE_INTOVF 2 8 1 2 2 2 # SIGFPE; integer overflow +syscon sicode FPE_FLTDIV 3 1 3 3 3 3 # SIGFPE; floating point divide by zero +syscon sicode FPE_FLTOVF 4 2 4 4 4 4 # SIGFPE; floating point overflow +syscon sicode FPE_FLTUND 5 3 5 5 5 5 # SIGFPE; floating point underflow +syscon sicode FPE_FLTRES 6 4 6 6 6 6 # SIGFPE; floating point inexact +syscon sicode FPE_FLTINV 7 5 7 7 7 7 # SIGFPE; invalid floating point operation +syscon sicode FPE_FLTSUB 8 6 8 8 8 8 # SIGFPE; subscript out of range +syscon sicode ILL_ILLOPC 1 1 1 1 1 1 # SIGILL; illegal opcode; unix consensus +syscon sicode ILL_ILLOPN 2 4 2 2 2 2 # SIGILL; illegal operand +syscon sicode ILL_ILLADR 3 5 3 3 3 3 # SIGILL; illegal addressing mode +syscon sicode ILL_ILLTRP 4 2 4 4 4 4 # SIGILL; illegal trap +syscon sicode ILL_PRVOPC 5 3 5 5 5 5 # SIGILL; privileged opcode +syscon sicode ILL_PRVREG 6 6 6 6 6 6 # SIGILL; privileged register; unix consensus +syscon sicode ILL_COPROC 7 7 7 7 7 7 # SIGILL; coprocessor error; unix consensus +syscon sicode ILL_BADSTK 8 8 8 8 8 8 # SIGILL; internal stack error; unix consensus +syscon sicode BUS_ADRALN 1 1 1 1 1 1 # SIGBUS; invalid address alignment; unix consensus +syscon sicode BUS_ADRERR 2 2 2 2 2 2 # SIGBUS; non-existent physical address; unix consensus +syscon sicode BUS_OBJERR 3 3 3 3 3 3 # SIGBUS; object specific hardware error; unix consensus +syscon sicode BUS_MCEERR_AR 4 0x80000000 0x80000000 0x80000000 0x80000000 0x80000000 # SIGBUS; Linux 2.6.32+ +syscon sicode BUS_MCEERR_AO 5 0x80000000 0x80000000 0x80000000 0x80000000 0x80000000 # SIGBUS; Linux 2.6.32+ +syscon sicode POLL_IN 1 1 1 1 1 1 # SIGIO; data input available; unix consensus +syscon sicode POLL_OUT 2 2 2 2 2 2 # SIGIO; output buffer available; unix consensus +syscon sicode POLL_MSG 3 3 3 3 3 3 # SIGIO; input message available; unix consensus +syscon sicode POLL_ERR 4 4 4 4 4 4 # SIGIO; i/o error; unix consensus +syscon sicode POLL_PRI 5 5 5 5 5 5 # SIGIO; high priority input available; unix consensus +syscon sicode POLL_HUP 6 6 6 6 6 6 # SIGIO; device disconnected; unix consensus + +# sigalstack() values +# +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary +syscon ss SIGSTKSZ 0x2000 0x020000 0x8800 0x7000 0x7000 0x2000 + +# clock_{gettime,settime} timers +# +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon clock CLOCK_REALTIME 0 0 0 0 0 0 # consensus -syscon clock CLOCK_MONOTONIC 1 1 4 3 3 1 # XNU/NT faked -syscon clock CLOCK_PROCESS_CPUTIME_ID 2 0 15 2 0x40000000 0 -syscon clock CLOCK_THREAD_CPUTIME_ID 3 0 14 4 0x20000000 0 -syscon clock CLOCK_MONOTONIC_RAW 4 4 0x4000 0x4000 0x4000 4 # XNU/NT/FreeBSD/OpenBSD faked, not available on RHEL5 -syscon clock CLOCK_REALTIME_COARSE 5 0 0 0 0 0 # bsd consensus -syscon clock CLOCK_MONOTONIC_COARSE 6 0 0 0 0 0 # bsd consensus -syscon clock CLOCK_BOOTTIME 7 0 0 6 6 0 -syscon clock CLOCK_REALTIME_ALARM 8 0 0 0 0 0 # bsd consensus -syscon clock CLOCK_BOOTTIME_ALARM 9 0 0 0 0 0 # bsd consensus -syscon clock CLOCK_TAI 11 0 0 0 0 0 # bsd consensus +syscon clock CLOCK_MONOTONIC 1 1 4 3 3 1 # XNU/NT faked; could move backwards if NTP introduces negative leap second +syscon clock CLOCK_PROCESS_CPUTIME_ID 2 -1 15 2 0x40000000 -1 +syscon clock CLOCK_THREAD_CPUTIME_ID 3 -1 14 4 0x20000000 -1 +syscon clock CLOCK_MONOTONIC_RAW 4 4 0x4000 0x4000 0x4000 4 # actually monotonic; not subject to NTP adjustments; Linux 2.6.28+; XNU/NT/FreeBSD/OpenBSD faked; not available on RHEL5 +syscon clock CLOCK_REALTIME_COARSE 5 -1 -1 -1 -1 -1 # Linux 2.6.32+; bsd consensus; not available on RHEL5 +syscon clock CLOCK_MONOTONIC_COARSE 6 -1 -1 -1 -1 -1 # Linux 2.6.32+; bsd consensus; not available on RHEL5 +syscon clock CLOCK_BOOTTIME 7 -1 -1 6 6 -1 +syscon clock CLOCK_REALTIME_ALARM 8 -1 -1 -1 -1 -1 # bsd consensus +syscon clock CLOCK_BOOTTIME_ALARM 9 -1 -1 -1 -1 -1 # bsd consensus +syscon clock CLOCK_TAI 11 -1 -1 -1 -1 -1 # bsd consensus + +# poll() +# +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary +syscon poll POLLIN 1 1 1 1 1 0x300 # unix consensus +syscon poll POLLPRI 2 2 2 2 2 0x0400 # unix consensus +syscon poll POLLOUT 4 4 4 4 4 0x10 # unix consensus +syscon poll POLLERR 8 8 8 8 8 1 # unix consensus +syscon poll POLLHUP 0x10 0x10 0x10 0x10 0x10 2 # unix consensus +syscon poll POLLNVAL 0x20 0x20 0x20 0x20 0x20 4 # unix consensus +syscon poll POLLRDBAND 0x80 0x80 0x80 0x80 0x80 0x0200 # unix consensus +syscon poll POLLRDNORM 0x40 0x40 0x40 0x40 0x40 0x0100 # unix consensus +syscon poll POLLWRBAND 0x0200 0x0100 0x0100 0x0100 0x0100 0x20 # bsd consensus +syscon poll POLLWRNORM 0x0100 4 4 4 4 0x10 # bsd consensus +syscon poll POLLRDHUP 0x2000 0x10 0x10 0x10 0x10 2 # bsd consensus (POLLHUP on non-Linux) # epoll # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon epoll EPOLL_CLOEXEC 0x080000 0x01000000 0x100000 0x010000 0x010000 0x80000 # O_CLOEXEC syscon epoll EPOLL_CTL_ADD 1 1 1 1 1 1 # forced consensus, linux only natively, polyfilled elsewhere syscon epoll EPOLL_CTL_DEL 2 2 2 2 2 2 # forced consensus, linux only natively, polyfilled elsewhere @@ -572,24 +636,24 @@ syscon epoll EPOLLET 0x80000000 0x80000000 0x80000000 0x80000000 0x80000 # * 0 we define as EINVAL # * -1 we define as no-op # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon so SO_REUSEPORT 15 0x0200 0x0200 0x0200 0x0200 4 # bsd consensus (NT calls it SO_REUSEADDR) syscon so SO_REUSEADDR 2 4 4 4 4 0 # bsd consensus (default behavior on NT) syscon so SO_KEEPALIVE 9 8 8 8 8 8 # bsd consensus syscon so SO_DONTROUTE 5 0x10 0x10 0x10 0x10 0x10 # bsd consensus syscon so SO_BROADCAST 6 0x20 0x20 0x20 0x20 0x20 # bsd consensus -syscon so SO_LINGER 13 0x80 0x80 0x80 0x80 0x80 # bsd consensus +syscon so SO_LINGER 13 0x80 0x80 0x80 0x80 0x80 # takes struct linger; causes close() return value to actually mean something; bsd consensus syscon so SO_DEBUG 1 1 1 1 1 1 # consensus -syscon so SO_ACCEPTCONN 30 2 2 2 2 2 # bsd consensus -syscon so SO_ERROR 4 0x1007 0x1007 0x1007 0x1007 0x1007 # bsd consensus +syscon so SO_ACCEPTCONN 30 2 2 2 2 2 # takes int pointer and stores boolean indicating if listen() was called on fd; bsd consensus +syscon so SO_ERROR 4 0x1007 0x1007 0x1007 0x1007 0x1007 # takes int pointer and stores/clears the pending error code; bsd consensus syscon so SO_OOBINLINE 10 0x0100 0x0100 0x0100 0x0100 0x0100 # bsd consensus syscon so SO_SNDBUF 7 0x1001 0x1001 0x1001 0x1001 0x1001 # bsd consensus syscon so SO_RCVBUF 8 0x1002 0x1002 0x1002 0x1002 0x1002 # bsd consensus +syscon so SO_RCVTIMEO 20 0x1006 0x1006 0x1006 0x100c 0x1006 # recv timeout; takes struct timeval (overrides SA_RESTART restoring EINTR behavior on recv/send/connect/accept/etc.; bsd consensus) +syscon so SO_SNDTIMEO 21 0x1005 0x1005 0x1005 0x100b 0x1005 # send timeout; takes struct timeval; bsd consensus syscon so SO_RCVLOWAT 18 0x1004 0x1004 0x1004 0x1004 0x1004 # bsd consensus -syscon so SO_RCVTIMEO 20 0x1006 0x1006 0x1006 0x100c 0x1006 # bsd consensus syscon so SO_EXCLUSIVEADDRUSE 0 0 0 0 0 0xfffffffb # hoo boy syscon so SO_SNDLOWAT 19 0x1003 0x1003 0x1003 0x1003 0x1003 # bsd consensus -syscon so SO_SNDTIMEO 21 0x1005 0x1005 0x1005 0x100b 0x1005 # bsd consensus syscon so SO_TYPE 3 0x1008 0x1008 0x1008 0x1008 0x1008 # bsd consensus syscon so SO_TIMESTAMP 29 0x0400 0x0400 0x0800 0x2000 0 syscon so SO_DOMAIN 39 0 0x1019 0 0 0 @@ -668,22 +732,22 @@ syscon sol SOL_X25 262 0 0 0 0 0 # @see https://www.kernel.org/doc/Documentation/networking/ip-sysctl.txt # @see https://www.iana.org/assignments/tcp-parameters/tcp-parameters.txt # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary -syscon tcp TCP_NODELAY 1 1 1 1 1 1 # strong consensus for disabling nagle's algorithm +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary +syscon tcp TCP_NODELAY 1 1 1 1 1 1 # strong consensus for disabling nagle's algorithm; so be sure to disable it by turning this on +syscon tcp TCP_CORK 3 4 4 16 0 0 # nagle's algorithm strikes again; TCP_NOPUSH on BSD; be sure to turn it off; protip: mmap+writev vs. write+sendfile; see also /proc/sys/net/ipv4/tcp_autocorking; netbsd is 4 but not implemented syscon tcp TCP_MAXSEG 2 2 2 2 2 0 # reduces tcp segment size; see also tcp offloading -syscon tcp TCP_FASTOPEN 23 261 0x0401 0 0 15 # reduces roundtrips; for listener; Linux 3.7+ (c. 2012) / or is windows it 0x22? /proc/sys/net/ipv4/tcp_fastopen TODO(jart): MSG_FASTOPEN -syscon tcp TCP_KEEPIDLE 4 0 0x100 0 0 0 # keepalives -syscon tcp TCP_KEEPINTVL 5 0x101 0x200 0 0 0 # keepalives -syscon tcp TCP_KEEPCNT 6 0x102 0x400 0 0 0 # keepalives +syscon tcp TCP_FASTOPEN 23 0 0x0401 0 0 15 # reduces roundtrips; for listener; Linux 3.7+ (c. 2012) / or is windows it 0x22? /proc/sys/net/ipv4/tcp_fastopen TODO(jart): MSG_FASTOPEN; XNU sources say 261 but not sure if that's true +syscon tcp TCP_KEEPIDLE 4 0 0x100 0 3 0 # keepalives +syscon tcp TCP_KEEPINTVL 5 0x101 0x200 0 5 0 # keepalives +syscon tcp TCP_KEEPCNT 6 0x102 0x400 0 6 0 # keepalives syscon tcp TCP_SYNCNT 7 0 0 0 0 0 # how hard to syn packet the enemy syscon tcp TCP_COOKIE_TRANSACTIONS 15 0 0 0 0 0 # defense against the syn packets syscon tcp TCP_LINGER2 8 0 0 0 0 0 # orphaned fin-wait-2 lifetime cf. net.ipv4.tcp_fin_timeout see cloudflare blog -syscon tcp TCP_CORK 3 0 0 0 0 0 # linux tries to automate iovec syscon tcp TCP_NOTSENT_LOWAT 25 513 0 0 0 0 # limit unset byte queue -syscon tcp TCP_INFO 11 0 0x20 0 0 0 # get connection info +syscon tcp TCP_INFO 11 0 0x20 0 9 0 # get connection info syscon tcp TCP_CC_INFO 26 0 0 0 0 0 # get congestion control info syscon tcp TCP_CONGESTION 13 0 0x40 0 0 0 # set traffic control -syscon tcp TCP_MD5SIG 14 0 0x10 4 4 0 # what is it (rfc2385) +syscon tcp TCP_MD5SIG 14 0 0x10 4 16 0 # what is it (rfc2385) syscon tcp TCP_MD5SIG_MAXKEYLEN 80 0 0 0 0 0 # what is it syscon tcp TCP_TIMESTAMP 24 0 0 0 0 0 # what is it syscon tcp TCP_USER_TIMEOUT 18 0 0 0 0 0 # what is it @@ -699,6 +763,107 @@ syscon tcp TCP_REPAIR_OPTIONS 22 0 0 0 0 0 # what is it syscon tcp TCP_REPAIR_QUEUE 20 0 0 0 0 0 # what is it syscon tcp TCP_THIN_LINEAR_TIMEOUTS 16 0 0 0 0 0 # what is it +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary +syscon ip IP_DEFAULT_MULTICAST_LOOP 1 1 1 1 1 1 # consensus +syscon ip IP_DEFAULT_MULTICAST_TTL 1 1 1 1 1 1 # consensus +syscon ip IP_PMTUDISC_DONT 0 0 0 0 0 0 # consensus +syscon ip IP_HDRINCL 3 2 2 2 2 2 # bsd consensus +syscon ip IP_MAX_MEMBERSHIPS 20 0x0fff 0x0fff 0x0fff 0x0fff 20 # bsd consensus +syscon ip IP_OPTIONS 4 1 1 1 1 1 # bsd consensus +syscon ip IP_TOS 1 3 3 3 3 8 # bsd consensus +syscon ip IP_RECVTTL 12 24 65 31 23 21 +syscon ip IP_ADD_MEMBERSHIP 35 12 12 12 12 0 # bsd consensus +syscon ip IP_DROP_MEMBERSHIP 36 13 13 13 13 0 # bsd consensus +syscon ip IP_MULTICAST_IF 0x20 9 9 9 9 0 # bsd consensus +syscon ip IP_MULTICAST_LOOP 34 11 11 11 11 0 # bsd consensus +syscon ip IP_MULTICAST_TTL 33 10 10 10 10 0 # bsd consensus +syscon ip IP_RECVOPTS 6 5 5 5 5 0 # bsd consensus +syscon ip IP_RECVRETOPTS 7 6 6 6 6 0 # bsd consensus +syscon ip IP_RETOPTS 7 8 8 8 8 0 # bsd consensus +syscon ip IP_TTL 2 4 4 4 4 0 # bsd consensus +syscon ip IP_ADD_SOURCE_MEMBERSHIP 39 70 70 0 0 15 +syscon ip IP_BLOCK_SOURCE 38 72 72 0 0 17 +syscon ip IP_DROP_SOURCE_MEMBERSHIP 40 71 71 0 0 0x10 +syscon ip IP_UNBLOCK_SOURCE 37 73 73 0 0 18 +syscon ip IP_IPSEC_POLICY 0x10 21 21 0 0 0 +syscon ip IP_MINTTL 21 0 66 32 24 0 # minimum ttl for packet or drop +syscon ip IP_MSFILTER 41 74 74 0 0 0 +syscon ip IP_PKTINFO 8 26 0 0 25 19 +syscon ip IP_RECVTOS 13 0 68 0 0 40 +syscon ip IP_MTU 14 0 0 0 0 73 # bsd consensus +syscon ip IP_MTU_DISCOVER 10 0 0 0 0 71 # bsd consensus +syscon ip IP_RECVERR 11 0 0 0 0 75 # bsd consensus +syscon ip IP_UNICAST_IF 50 0 0 0 0 31 # bsd consensus +syscon ip IP_ORIGDSTADDR 20 0 27 0 0 0 +syscon ip IP_RECVORIGDSTADDR 20 0 27 0 0 0 +syscon ip IP_BIND_ADDRESS_NO_PORT 24 0 0 0 0 0 +syscon ip IP_CHECKSUM 23 0 0 0 0 0 +syscon ip IP_FREEBIND 15 0 0 0 0 0 +syscon ip IP_MULTICAST_ALL 49 0 0 0 0 0 +syscon ip IP_NODEFRAG 22 0 0 0 0 0 +syscon ip IP_PASSSEC 18 0 0 0 0 0 +syscon ip IP_PKTOPTIONS 9 0 0 0 0 0 +syscon ip IP_PMTUDISC 10 0 0 0 0 0 +syscon ip IP_PMTUDISC_DO 2 0 0 0 0 0 +syscon ip IP_PMTUDISC_INTERFACE 4 0 0 0 0 0 +syscon ip IP_PMTUDISC_OMIT 5 0 0 0 0 0 +syscon ip IP_PMTUDISC_PROBE 3 0 0 0 0 0 +syscon ip IP_PMTUDISC_WANT 1 0 0 0 0 0 +syscon ip IP_ROUTER_ALERT 5 0 0 0 0 0 +syscon ip IP_TRANSPARENT 19 0 0 0 0 0 +syscon ip IP_XFRM_POLICY 17 0 0 0 0 0 +syscon ip INET_ADDRSTRLEN 0x10 0x10 0x10 0x10 0x10 22 # unix consensus + +# ptrace() codes +# +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary +syscon ptrace PTRACE_TRACEME 0 0 0 0 -1 -1 # unix consensus a.k.a. PT_TRACE_ME +syscon ptrace PTRACE_PEEKTEXT 1 1 1 1 -1 -1 # unix consensus a.k.a. PT_READ_I +syscon ptrace PTRACE_PEEKDATA 2 2 2 2 -1 -1 # unix consensus a.k.a. PT_READ_D +syscon ptrace PTRACE_PEEKUSER 3 3 -1 -1 -1 -1 # a.k.a. PT_READ_U +syscon ptrace PTRACE_POKETEXT 4 4 4 4 -1 -1 # unix consensus a.k.a. PT_WRITE_I +syscon ptrace PTRACE_POKEDATA 5 5 5 5 -1 -1 # unix consensus a.k.a. PT_WRITE_D +syscon ptrace PTRACE_POKEUSER 6 6 -1 -1 -1 -1 # a.k.a. PT_WRITE_U +syscon ptrace PTRACE_CONT 7 7 7 7 -1 -1 # unix consensus a.k.a. PT_CONTINUE +syscon ptrace PTRACE_KILL 8 8 8 8 -1 -1 # unix consensus a.k.a. PT_KILL +syscon ptrace PTRACE_SINGLESTEP 9 9 9 32 -1 -1 # a.k.a. PT_STEP +syscon ptrace PTRACE_GETREGS 12 -1 33 33 -1 -1 # a.k.a. PT_GETREGS +syscon ptrace PTRACE_SETREGS 13 -1 34 34 -1 -1 # a.k.a. PT_SETREGS +syscon ptrace PTRACE_GETFPREGS 14 -1 35 35 -1 -1 # a.k.a. PT_GETFPREGS +syscon ptrace PTRACE_SETFPREGS 15 -1 36 36 -1 -1 # a.k.a. PT_SETFPREGS +syscon ptrace PTRACE_ATTACH 16 10 10 9 -1 -1 # a.k.a. PT_ATTACH +syscon ptrace PTRACE_DETACH 17 11 11 10 -1 -1 # a.k.a. PT_DETACH +syscon ptrace PTRACE_GETFPXREGS 18 -1 -1 -1 -1 -1 # a.k.a. PT_GETFPXREGS +syscon ptrace PTRACE_SETFPXREGS 19 -1 -1 -1 -1 -1 # a.k.a. PT_SETFPXREGS +syscon ptrace PTRACE_SYSCALL 24 -1 22 -1 -1 -1 # a.k.a. PT_SYSCALL +syscon ptrace PTRACE_GETEVENTMSG 0x4201 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_GETSIGINFO 0x4202 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_SETOPTIONS 0x4200 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_SETSIGINFO 0x4203 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_GETREGSET 0x4204 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_GETSIGMASK 0x420a -1 -1 -1 -1 -1 +syscon ptrace PTRACE_INTERRUPT 0x4207 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_LISTEN 0x4208 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_PEEKSIGINFO 0x4209 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_SECCOMP_GET_FILTER 0x420c -1 -1 -1 -1 -1 +syscon ptrace PTRACE_SEIZE 0x4206 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_SETREGSET 0x4205 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_SETSIGMASK 0x420b -1 -1 -1 -1 -1 +syscon ptrace PTRACE_O_TRACESYSGOOD 0x0001 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_O_TRACEFORK 0x0002 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_O_TRACEVFORK 0x0004 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_O_TRACECLONE 0x0008 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_O_TRACEEXEC 0x0010 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_O_TRACEVFORKDONE 0x0020 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_O_TRACEEXIT 0x0040 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_O_MASK 0x007f -1 -1 -1 -1 -1 +syscon ptrace PTRACE_EVENT_FORK 1 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_EVENT_VFORK 2 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_EVENT_CLONE 3 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_EVENT_EXEC 4 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_EVENT_VFORK_DONE 5 -1 -1 -1 -1 -1 +syscon ptrace PTRACE_EVENT_EXIT 6 -1 -1 -1 -1 -1 + syscon iproto IPPROTO_IP 0 0 0 0 0 0 # consensus syscon iproto IPPROTO_ICMP 1 1 1 1 1 1 # consensus syscon iproto IPPROTO_TCP 6 6 6 6 6 6 # consensus @@ -1195,56 +1360,6 @@ syscon pf PF_VSOCK 40 0 0 0 0 0 syscon pf PF_WANPIPE 25 0 0 0 0 0 syscon pf PF_X25 9 0 0 0 0 0 -syscon ip IP_DEFAULT_MULTICAST_LOOP 1 1 1 1 1 1 # consensus -syscon ip IP_DEFAULT_MULTICAST_TTL 1 1 1 1 1 1 # consensus -syscon ip IP_PMTUDISC_DONT 0 0 0 0 0 0 # consensus -syscon ip IP_HDRINCL 3 2 2 2 2 2 # bsd consensus -syscon ip IP_MAX_MEMBERSHIPS 20 0x0fff 0x0fff 0x0fff 0x0fff 20 # bsd consensus -syscon ip IP_OPTIONS 4 1 1 1 1 1 # bsd consensus -syscon ip IP_TOS 1 3 3 3 3 8 # bsd consensus -syscon ip IP_RECVTTL 12 24 65 31 31 21 -syscon ip IP_ADD_MEMBERSHIP 35 12 12 12 12 0 # bsd consensus -syscon ip IP_DROP_MEMBERSHIP 36 13 13 13 13 0 # bsd consensus -syscon ip IP_MULTICAST_IF 0x20 9 9 9 9 0 # bsd consensus -syscon ip IP_MULTICAST_LOOP 34 11 11 11 11 0 # bsd consensus -syscon ip IP_MULTICAST_TTL 33 10 10 10 10 0 # bsd consensus -syscon ip IP_RECVOPTS 6 5 5 5 5 0 # bsd consensus -syscon ip IP_RECVRETOPTS 7 6 6 6 6 0 # bsd consensus -syscon ip IP_RETOPTS 7 8 8 8 8 0 # bsd consensus -syscon ip IP_TTL 2 4 4 4 4 0 # bsd consensus -syscon ip IP_ADD_SOURCE_MEMBERSHIP 39 70 70 0 0 15 -syscon ip IP_BLOCK_SOURCE 38 72 72 0 0 17 -syscon ip IP_DROP_SOURCE_MEMBERSHIP 40 71 71 0 0 0x10 -syscon ip IP_UNBLOCK_SOURCE 37 73 73 0 0 18 -syscon ip IP_IPSEC_POLICY 0x10 21 21 0 0 0 -syscon ip IP_MINTTL 21 0 66 0x20 0x20 0 -syscon ip IP_MSFILTER 41 74 74 0 0 0 -syscon ip IP_PKTINFO 8 26 0 0 0 19 -syscon ip IP_RECVTOS 13 0 68 0 0 40 -syscon ip IP_MTU 14 0 0 0 0 73 # bsd consensus -syscon ip IP_MTU_DISCOVER 10 0 0 0 0 71 # bsd consensus -syscon ip IP_RECVERR 11 0 0 0 0 75 # bsd consensus -syscon ip IP_UNICAST_IF 50 0 0 0 0 31 # bsd consensus -syscon ip IP_ORIGDSTADDR 20 0 27 0 0 0 -syscon ip IP_RECVORIGDSTADDR 20 0 27 0 0 0 -syscon ip IP_BIND_ADDRESS_NO_PORT 24 0 0 0 0 0 -syscon ip IP_CHECKSUM 23 0 0 0 0 0 -syscon ip IP_FREEBIND 15 0 0 0 0 0 -syscon ip IP_MULTICAST_ALL 49 0 0 0 0 0 -syscon ip IP_NODEFRAG 22 0 0 0 0 0 -syscon ip IP_PASSSEC 18 0 0 0 0 0 -syscon ip IP_PKTOPTIONS 9 0 0 0 0 0 -syscon ip IP_PMTUDISC 10 0 0 0 0 0 -syscon ip IP_PMTUDISC_DO 2 0 0 0 0 0 -syscon ip IP_PMTUDISC_INTERFACE 4 0 0 0 0 0 -syscon ip IP_PMTUDISC_OMIT 5 0 0 0 0 0 -syscon ip IP_PMTUDISC_PROBE 3 0 0 0 0 0 -syscon ip IP_PMTUDISC_WANT 1 0 0 0 0 0 -syscon ip IP_ROUTER_ALERT 5 0 0 0 0 0 -syscon ip IP_TRANSPARENT 19 0 0 0 0 0 -syscon ip IP_XFRM_POLICY 17 0 0 0 0 0 -syscon ip INET_ADDRSTRLEN 0x10 0x10 0x10 0x10 0x10 22 # unix consensus - syscon ipv6 IPV6_PMTUDISC_DONT 0 0 0 0 0 0 # consensus syscon ipv6 IPV6_RTHDR_LOOSE 0 0 0 0 0 0 # consensus syscon ipv6 IPV6_RTHDR_TYPE_0 0 0 0 0 0 0 # consensus @@ -1306,46 +1421,6 @@ syscon ipv6 IPV6_ORIGDSTADDR 0 0 72 0 0 0 syscon ipv6 IPV6_RECVORIGDSTADDR 0 0 72 0 0 0 syscon ipv6 INET6_ADDRSTRLEN 46 46 46 46 46 65 # unix consensus -syscon poll POLLIN 1 1 1 1 1 0x300 # unix consensus -syscon poll POLLPRI 2 2 2 2 2 0x0400 # unix consensus -syscon poll POLLOUT 4 4 4 4 4 0x10 # unix consensus -syscon poll POLLERR 8 8 8 8 8 1 # unix consensus -syscon poll POLLHUP 0x10 0x10 0x10 0x10 0x10 2 # unix consensus -syscon poll POLLNVAL 0x20 0x20 0x20 0x20 0x20 4 # unix consensus -syscon poll POLLRDBAND 0x80 0x80 0x80 0x80 0x80 0x0200 # unix consensus -syscon poll POLLRDNORM 0x40 0x40 0x40 0x40 0x40 0x0100 # unix consensus -syscon poll POLLWRBAND 0x0200 0x0100 0x0100 0x0100 0x0100 0x20 # bsd consensus -syscon poll POLLWRNORM 0x0100 4 4 4 4 0x10 # bsd consensus -syscon poll POLLRDHUP 0x2000 0x10 0x10 0x10 0x10 2 # bsd consensus (POLLHUP on non-Linux) - -syscon sigpoll POLL_ERR 4 4 4 0 0 0 -syscon sigpoll POLL_HUP 6 6 6 0 0 0 -syscon sigpoll POLL_IN 1 1 1 0 0 0 -syscon sigpoll POLL_MSG 3 3 3 0 0 0 -syscon sigpoll POLL_OUT 2 2 2 0 0 0 -syscon sigpoll POLL_PRI 5 5 5 0 0 0 - -syscon c C_IXOTH 0000001 0000001 0000001 0000001 0000001 0 # unix consensus -syscon c C_IWOTH 0000002 0000002 0000002 0000002 0000002 0 # unix consensus -syscon c C_IROTH 0000004 0000004 0000004 0000004 0000004 0 # unix consensus -syscon c C_IXGRP 0000010 0000010 0000010 0000010 0000010 0 # unix consensus -syscon c C_IWGRP 0000020 0000020 0000020 0000020 0000020 0 # unix consensus -syscon c C_IRGRP 0000040 0000040 0000040 0000040 0000040 0 # unix consensus -syscon c C_IXUSR 0000100 0000100 0000100 0000100 0000100 0 # unix consensus -syscon c C_IWUSR 0000200 0000200 0000200 0000200 0000200 0 # unix consensus -syscon c C_IRUSR 0000400 0000400 0000400 0000400 0000400 0 # unix consensus -syscon c C_ISVTX 0001000 0001000 0001000 0001000 0001000 0 # unix consensus -syscon c C_ISGID 0002000 0002000 0002000 0002000 0002000 0 # unix consensus -syscon c C_ISUID 0004000 0004000 0004000 0004000 0004000 0 # unix consensus -syscon c C_ISFIFO 0010000 0010000 0010000 0010000 0010000 0 # unix consensus -syscon c C_ISCHR 0020000 0020000 0020000 0020000 0020000 0 # unix consensus -syscon c C_ISDIR 0040000 0040000 0040000 0040000 0040000 0 # unix consensus -syscon c C_ISBLK 0060000 0060000 0060000 0060000 0060000 0 # unix consensus -syscon c C_ISREG 0100000 0100000 0100000 0100000 0100000 0 # unix consensus -syscon c C_ISCTG 0110000 0110000 0110000 0110000 0110000 0 # unix consensus -syscon c C_ISLNK 0120000 0120000 0120000 0120000 0120000 0 # unix consensus -syscon c C_ISSOCK 0140000 0140000 0140000 0140000 0140000 0 # unix consensus - syscon fan FAN_CLASS_NOTIF 0 0 0 0 0 0 # consensus syscon fan FAN_ACCESS 1 0 0 0 0 0 syscon fan FAN_ACCESS_PERM 0x020000 0 0 0 0 0 @@ -1392,7 +1467,7 @@ syscon exit EXIT_FAILURE 1 1 1 1 1 1 # consensus # - Dating back to 1980 in 4.0BSD; # - That won't be standardized. # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon ex EX_OK 0 0 0 0 0 0 # consensus syscon ex EX_USAGE 64 64 64 64 64 64 # unix consensus & force NT syscon ex EX_DATAERR 65 65 65 65 65 65 # unix consensus & force NT @@ -1414,7 +1489,7 @@ syscon ex EX__MAX 78 78 78 78 78 78 # unix consensus & force NT # getdents() constants # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon dt DT_UNKNOWN 0 0 0 0 0 0 # consensus syscon dt DT_FIFO 1 1 1 1 1 1 # unix consensus & faked nt syscon dt DT_CHR 2 2 2 2 2 2 # unix consensus & faked nt @@ -1426,14 +1501,14 @@ syscon dt DT_SOCK 12 12 12 12 12 12 # unix consensus & faked nt # msync() flags # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon ms MS_SYNC 4 16 0 2 4 4 # faked nt syscon ms MS_ASYNC 1 1 1 1 1 1 # consensus (faked nt) syscon ms MS_INVALIDATE 2 2 2 4 2 0 # mount flags # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon mount MS_ACTIVE 0x40000000 0 0 0 0 0 syscon mount MS_BIND 0x1000 0 0 0 0 0 syscon mount MS_DIRSYNC 0x80 0 0 0 0 0 @@ -1547,23 +1622,6 @@ syscon nd ND_ROUTER_ADVERT 134 134 134 134 134 0 # unix consensus syscon nd ND_ROUTER_SOLICIT 133 133 133 133 133 0 # unix consensus syscon nd ND_RA_FLAG_HOME_AGENT 0x20 0 0 0 0 0x20 # bsd consensus -syscon rlim RLIMIT_CPU 0 0 0 0 0 127 # unix consensus -syscon rlim RLIMIT_FSIZE 1 1 1 1 1 127 # unix consensus -syscon rlim RLIMIT_DATA 2 2 2 2 2 127 # unix consensus -syscon rlim RLIMIT_STACK 3 3 3 3 3 127 # unix consensus -syscon rlim RLIMIT_CORE 4 4 4 4 4 127 # unix consensus -syscon rlim RLIMIT_RSS 5 5 5 5 5 127 # unix consensus -syscon rlim RLIMIT_NPROC 6 7 7 7 7 127 # bsd consensus -syscon rlim RLIMIT_NOFILE 7 8 8 8 8 127 # bsd consensus -syscon rlim RLIMIT_MEMLOCK 8 6 6 6 6 127 # bsd consensus -syscon rlim RLIMIT_AS 9 5 10 127 127 127 -syscon rlim RLIMIT_LOCKS 10 127 127 127 127 127 # bsd consensus -syscon rlim RLIMIT_SIGPENDING 11 127 127 127 127 127 # bsd consensus -syscon rlim RLIMIT_MSGQUEUE 12 127 127 127 127 127 # bsd consensus -syscon rlim RLIMIT_NICE 13 127 127 127 127 127 # bsd consensus -syscon rlim RLIMIT_RTPRIO 14 127 127 127 127 127 # bsd consensus -syscon rlim RLIMIT_NLIMITS 16 127 127 127 127 127 # bsd consensus - syscon misc TCFLSH 0x540b 0 0 0 0 0 syscon misc TCIFLUSH 0 1 1 1 1 0 # bsd consensus syscon misc TCIOFF 2 3 3 3 3 0 # bsd consensus @@ -1771,13 +1829,7 @@ syscon misc SCSI_IOCTL_SYNC 4 0 0 0 0 0 syscon misc SCSI_IOCTL_TAGGED_DISABLE 0x5384 0 0 0 0 0 syscon misc SCSI_IOCTL_TAGGED_ENABLE 0x5383 0 0 0 0 0 syscon misc SCSI_IOCTL_TEST_UNIT_READY 2 0 0 0 0 0 - -syscon misc CLD_CONTINUED 6 6 6 6 6 6 # unix consensus -syscon misc CLD_DUMPED 3 3 3 3 3 3 # unix consensus -syscon misc CLD_EXITED 1 1 1 1 1 1 # unix consensus -syscon misc CLD_KILLED 2 2 2 2 2 2 # unix consensus -syscon misc CLD_STOPPED 5 5 5 5 5 5 # unix consensus -syscon misc CLD_TRAPPED 4 4 4 4 4 4 # unix consensus +syscon misc BUS_DEVICE_RESET 12 0 0 0 0 0 # SIGBUS; syscon misc READ_10 40 0 0 0 0 0 syscon misc READ_12 168 0 0 0 0 0 @@ -1794,7 +1846,7 @@ syscon misc READ_TOC 67 0 0 0 0 0 # getpriority() / setpriority() magnums (a.k.a. nice) # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon prio PRIO_PROCESS 0 0 0 0 0 0 # consensus / poly nt syscon prio PRIO_PGRP 1 1 1 1 1 1 # unix consensus / poly nt syscon prio PRIO_USER 2 2 2 2 2 2 # unix consensus / poly nt @@ -1804,7 +1856,7 @@ syscon prio NZERO 20 20 20 20 20 20 # unix consensus / polyfille # getaddrinfo() flags # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon gai AI_PASSIVE 1 1 1 1 1 1 # consensus syscon gai AI_CANONNAME 2 2 2 2 2 2 # consensus syscon gai AI_NUMERICHOST 4 4 4 4 4 4 # consensus @@ -1838,15 +1890,6 @@ syscon misc WRITE_SAME 65 0 0 0 0 0 syscon misc WRITE_VERIFY 46 0 0 0 0 0 syscon misc WRITE_VERIFY_12 174 0 0 0 0 0 -syscon misc ILL_BADSTK 8 8 8 8 8 0 # unix consensus -syscon misc ILL_COPROC 7 7 7 7 7 0 # unix consensus -syscon misc ILL_ILLOPC 1 1 1 1 1 0 # unix consensus -syscon misc ILL_PRVREG 6 6 6 6 6 0 # unix consensus -syscon misc ILL_ILLADR 3 5 3 3 3 0 -syscon misc ILL_ILLOPN 2 4 2 2 2 0 -syscon misc ILL_ILLTRP 4 2 4 4 4 0 -syscon misc ILL_PRVOPC 5 3 5 5 5 0 - syscon lock LOCK_UNLOCK_CACHE 54 0 0 0 0 0 # wut syscon misc ARPHRD_ETHER 1 1 1 1 1 0 # unix consensus @@ -1858,13 +1901,6 @@ syscon misc ARPHRD_IEEE802154 804 0 0 0 0 0 syscon misc ARPHRD_IEEE802_TR 800 0 0 0 0 0 syscon misc ARPHRD_LOCALTLK 773 0 0 0 0 0 -syscon misc BUS_ADRALN 1 1 1 1 1 0 # unix consensus -syscon misc BUS_ADRERR 2 2 2 2 2 0 # unix consensus -syscon misc BUS_OBJERR 3 3 3 3 3 0 # unix consensus -syscon misc BUS_DEVICE_RESET 12 0 0 0 0 0 -syscon misc BUS_MCEERR_AO 5 0 0 0 0 0 -syscon misc BUS_MCEERR_AR 4 0 0 0 0 0 - syscon misc IP6F_MORE_FRAG 0x0100 0x0100 0x0100 0x0100 0x0100 0x0100 # consensus syscon misc IP6F_OFF_MASK 0xf8ff 0xf8ff 0xf8ff 0xf8ff 0xf8ff 0xf8ff # consensus syscon misc IP6F_RESERVED_MASK 0x0600 0x0600 0x0600 0x0600 0x0600 0x0600 # consensus @@ -1954,17 +1990,6 @@ syscon misc SEARCH_HIGH_12 176 0 0 0 0 0 syscon misc SEARCH_LOW 50 0 0 0 0 0 syscon misc SEARCH_LOW_12 178 0 0 0 0 0 -syscon misc SI_QUEUE -1 0x010002 0x010002 -2 -2 0 -syscon misc SI_TIMER -2 0x010003 0x010003 -3 -3 0 -syscon misc SI_ASYNCIO -4 0x010004 0x010004 0 0 0 -syscon misc SI_MESGQ -3 0x010005 0x010005 0 0 0 -syscon misc SI_KERNEL 0x80 0 0x010006 0 0 0 -syscon misc SI_USER 0 0x010001 0x010001 0 0 0 -syscon misc SI_ASYNCNL -60 0 0 0 0 0 -syscon misc SI_LOAD_SHIFT 0x10 0 0 0 0 0 -syscon misc SI_SIGIO -5 0 0 0 0 0 -syscon misc SI_TKILL -6 0 0 0 0 0 - syscon misc STRU_F 1 1 1 1 1 0 # unix consensus syscon misc STRU_P 3 3 3 3 3 0 # unix consensus syscon misc STRU_R 2 2 2 2 2 0 # unix consensus @@ -2050,12 +2075,6 @@ syscon misc SCHED_BATCH 3 0 0 0 0 0 syscon misc SCHED_IDLE 5 0 0 0 0 0 syscon misc SCHED_RESET_ON_FORK 0x40000000 0 0 0 0 0 -syscon misc SEGV_ACCERR 2 2 2 2 2 0 # unix consensus -syscon misc SEGV_MAPERR 1 1 1 1 1 0 # unix consensus - -syscon misc TRAP_BRKPT 1 1 1 1 1 0 # unix consensus -syscon misc TRAP_TRACE 2 2 2 2 2 0 # unix consensus - syscon misc WRDE_APPEND 0 1 1 0 0 0 syscon misc WRDE_BADCHAR 0 1 1 0 0 0 syscon misc WRDE_BADVAL 0 2 2 0 0 0 @@ -2112,14 +2131,6 @@ syscon misc TFD_NONBLOCK 0x0800 0 0 0 0 0 syscon misc TFD_TIMER_ABSTIME 1 0 0 0 0 0 syscon misc USRQUOTA 0 0 0 0 0 0 -syscon misc FPE_FLTDIV 3 1 3 3 3 0 -syscon misc FPE_FLTINV 7 5 7 7 7 0 -syscon misc FPE_FLTOVF 4 2 4 4 4 0 -syscon misc FPE_FLTRES 6 4 6 6 6 0 -syscon misc FPE_FLTSUB 8 6 8 8 8 0 -syscon misc FPE_FLTUND 5 3 5 5 5 0 -syscon misc FPE_INTDIV 1 7 2 1 1 0 -syscon misc FPE_INTOVF 2 8 1 2 2 0 syscon misc ABDAY_1 0x020000 14 14 13 13 0 syscon misc ABDAY_2 0x020001 15 15 14 14 0 @@ -2201,7 +2212,7 @@ syscon misc EXPR_NEST_MAX 0x20 0x20 0x20 0x20 0x20 0 # unix conse # linux fallocate() flags # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon misc FALLOC_FL_KEEP_SIZE 0x01 -1 -1 -1 -1 -1 # bsd consensus syscon misc FALLOC_FL_PUNCH_HOLE 0x02 -1 -1 -1 -1 -1 # bsd consensus syscon misc FALLOC_FL_NO_HIDE_STALE 0x04 -1 -1 -1 -1 -1 # bsd consensus @@ -2287,11 +2298,6 @@ syscon misc BC_DIM_MAX 0x0800 0x0800 0x0800 0xffff 0xffff 0 syscon misc BC_SCALE_MAX 99 99 99 0x7fffffff 0x7fffffff 0 syscon misc BC_STRING_MAX 0x03e8 0x03e8 0x03e8 0x7fffffff 0x7fffffff 0 -syscon misc RLIM_NLIMITS 0x10 9 15 9 9 0 -syscon misc RLIM_INFINITY -1 0 0x7fffffffffffffff 0 0 0 -syscon misc RLIM_SAVED_CUR -1 0 0x7fffffffffffffff 0 0 0 -syscon misc RLIM_SAVED_MAX -1 0 0x7fffffffffffffff 0 0 0 - syscon misc ABORTED_COMMAND 11 0 0 0 0 0 syscon misc ACORE 0 8 8 8 8 0 # bsd consensus syscon misc AFORK 0 1 1 1 1 0 # bsd consensus @@ -2355,7 +2361,7 @@ syscon misc ERA_T_FMT 0x020031 48 48 0 0 0 # ≈ TCSETA → About 12,600 results (0.32 seconds) # = TIOCSETA → About 3,110 results (0.41 seconds) # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon termios TCGETS 0x5401 0x40487413 0x402c7413 0x402c7413 0x402c7413 0 # Gets console settings; tcgetattr(tty, argp) → ioctl(tty, TCGETS, struct termios *argp); polyfilled NT syscon compat TIOCGETA 0x5401 0x40487413 0x402c7413 0x402c7413 0x402c7413 0 # Gets console settings; = tcgetattr(tty, struct termios *argp) #syscon compat TCGETA 0x5405 0 0 0 0 0 # Gets console settings; ≈ ioctl(fd, TCGETA, struct termio *argp) @@ -2512,26 +2518,26 @@ syscon termios VDISCARD 13 15 15 15 15 0 # termios.c_cc[VDISCARD] syscon termios VWERASE 14 4 4 4 4 0 # termios.c_cc[VWERASE]=𝑥 syscon termios VLNEXT 15 14 14 14 14 0 # termios.c_cc[VLNEXT]=𝑥 -syscon termios TIOCSERGETLSR 0x5459 0 0 0 0 0 # -syscon termios TIOCSERGETMULTI 0x545a 0 0 0 0 0 # -syscon termios TIOCSERSETMULTI 0x545b 0 0 0 0 0 # -syscon termios TIOCSER_TEMT 1 0 0 0 0 0 # +syscon termios TIOCSERGETLSR 0x5459 0 0 0 0 0 # +syscon termios TIOCSERGETMULTI 0x545a 0 0 0 0 0 # +syscon termios TIOCSERSETMULTI 0x545b 0 0 0 0 0 # +syscon termios TIOCSER_TEMT 1 0 0 0 0 0 # syscon termios VERIFY 47 0 0 0 0 0 -syscon termios PARENB 0x0100 0x1000 0x1000 0x1000 0x1000 0 # -syscon termios PARODD 0x0200 0x2000 0x2000 0x2000 0x2000 0 # +syscon termios PARENB 0x0100 0x1000 0x1000 0x1000 0x1000 0 # +syscon termios PARODD 0x0200 0x2000 0x2000 0x2000 0x2000 0 # syscon termios CIBAUD 0x100f0000 0 0 0 0 0 -syscon termios CLOCAL 0x0800 0x8000 0x8000 0x8000 0x8000 0 # +syscon termios CLOCAL 0x0800 0x8000 0x8000 0x8000 0x8000 0 # syscon termios CMSPAR 0x40000000 0 0 0 0 0 syscon termios BUSY 4 0 0 0 0 0 syscon termios CANBSIZ 255 0 0 0 0 0 syscon termios CBAUD 0x100f 0 0 0 0 0 syscon termios CBAUDEX 0x1000 0 0 0 0 0 -syscon termios CBRK 0 255 255 255 255 0 # -syscon termios CEOL 0 255 255 255 255 0 # +syscon termios CBRK 0 255 255 255 255 0 # +syscon termios CEOL 0 255 255 255 255 0 # # Pseudoteletypewriter Control # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon pty TIOCPKT 0x5420 0x80047470 0x80047470 0x80047470 0x80047470 -1 # boop syscon pty TIOCPKT_DATA 0 0 0 0 0 0 # consensus syscon pty TIOCPKT_FLUSHREAD 1 1 1 1 1 1 # unix consensus @@ -2546,7 +2552,7 @@ syscon pty PTMGET 0 0 0 0x40287401 0x40287401 -1 # for /dev/ptm # Modem Control # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX Commentary syscon modem TIOCMGET 0x5415 0x4004746a 0x4004746a 0x4004746a 0x4004746a -1 # get status of modem bits; ioctl(fd, TIOCMGET, int *argp) syscon modem TIOCMSET 0x5418 0x8004746d 0x8004746d 0x8004746d 0x8004746d -1 # set status of modem bits; ioctl(fd, TIOCMSET, const int *argp) syscon modem TIOCMBIC 0x5417 0x8004746b 0x8004746b 0x8004746b 0x8004746b -1 # clear indicated modem bits; ioctl(fd, TIOCMBIC, int *argp) @@ -2721,7 +2727,7 @@ syscon misc YESSTR 0x050002 54 54 46 46 0 # System Call Numbers. # -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX +# group name GNU/Systemd XNU's Not UNIX! FreeBSD OpenBSD NetBSD XENIX syscon nr __NR_exit 0x003c 0x2000001 0x0001 0x0001 0x001 0xfff syscon nr __NR_exit_group 0x00e7 0x2000001 0x0001 0x0001 0x001 0xfff syscon nr __NR_read 0x0000 0x2000003 0x0003 0x0003 0x003 0xfff diff --git a/libc/sysv/consts/BUS_ADRALN.S b/libc/sysv/consts/BUS_ADRALN.S index f5c0c5e04..1ef06bbbc 100644 --- a/libc/sysv/consts/BUS_ADRALN.S +++ b/libc/sysv/consts/BUS_ADRALN.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,BUS_ADRALN,1,1,1,1,1,0 +.syscon sicode,BUS_ADRALN,1,1,1,1,1,1 diff --git a/libc/sysv/consts/BUS_ADRERR.S b/libc/sysv/consts/BUS_ADRERR.S index b51d4eab4..67cd338da 100644 --- a/libc/sysv/consts/BUS_ADRERR.S +++ b/libc/sysv/consts/BUS_ADRERR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,BUS_ADRERR,2,2,2,2,2,0 +.syscon sicode,BUS_ADRERR,2,2,2,2,2,2 diff --git a/libc/sysv/consts/BUS_MCEERR_AO.S b/libc/sysv/consts/BUS_MCEERR_AO.S index ba125b0fa..6da2b9896 100644 --- a/libc/sysv/consts/BUS_MCEERR_AO.S +++ b/libc/sysv/consts/BUS_MCEERR_AO.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,BUS_MCEERR_AO,5,0,0,0,0,0 +.syscon sicode,BUS_MCEERR_AO,5,0x80000000,0x80000000,0x80000000,0x80000000,0x80000000 diff --git a/libc/sysv/consts/BUS_MCEERR_AR.S b/libc/sysv/consts/BUS_MCEERR_AR.S index 1ed98654b..45e32fdbe 100644 --- a/libc/sysv/consts/BUS_MCEERR_AR.S +++ b/libc/sysv/consts/BUS_MCEERR_AR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,BUS_MCEERR_AR,4,0,0,0,0,0 +.syscon sicode,BUS_MCEERR_AR,4,0x80000000,0x80000000,0x80000000,0x80000000,0x80000000 diff --git a/libc/sysv/consts/BUS_OBJERR.S b/libc/sysv/consts/BUS_OBJERR.S index 160ad33bb..96dc0771c 100644 --- a/libc/sysv/consts/BUS_OBJERR.S +++ b/libc/sysv/consts/BUS_OBJERR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,BUS_OBJERR,3,3,3,3,3,0 +.syscon sicode,BUS_OBJERR,3,3,3,3,3,3 diff --git a/libc/sysv/consts/CLD_CONTINUED.S b/libc/sysv/consts/CLD_CONTINUED.S index 556196233..3665d1432 100644 --- a/libc/sysv/consts/CLD_CONTINUED.S +++ b/libc/sysv/consts/CLD_CONTINUED.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,CLD_CONTINUED,6,6,6,6,6,6 +.syscon sicode,CLD_CONTINUED,6,6,6,6,6,6 diff --git a/libc/sysv/consts/CLD_DUMPED.S b/libc/sysv/consts/CLD_DUMPED.S index 1edbbadfa..5dbe99925 100644 --- a/libc/sysv/consts/CLD_DUMPED.S +++ b/libc/sysv/consts/CLD_DUMPED.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,CLD_DUMPED,3,3,3,3,3,3 +.syscon sicode,CLD_DUMPED,3,3,3,3,3,3 diff --git a/libc/sysv/consts/CLD_EXITED.S b/libc/sysv/consts/CLD_EXITED.S index d6b6c972f..ff63e185d 100644 --- a/libc/sysv/consts/CLD_EXITED.S +++ b/libc/sysv/consts/CLD_EXITED.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,CLD_EXITED,1,1,1,1,1,1 +.syscon sicode,CLD_EXITED,1,1,1,1,1,1 diff --git a/libc/sysv/consts/CLD_KILLED.S b/libc/sysv/consts/CLD_KILLED.S index 04d2a2f0f..3453b6985 100644 --- a/libc/sysv/consts/CLD_KILLED.S +++ b/libc/sysv/consts/CLD_KILLED.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,CLD_KILLED,2,2,2,2,2,2 +.syscon sicode,CLD_KILLED,2,2,2,2,2,2 diff --git a/libc/sysv/consts/CLD_STOPPED.S b/libc/sysv/consts/CLD_STOPPED.S index 0dc66af27..2ec88545d 100644 --- a/libc/sysv/consts/CLD_STOPPED.S +++ b/libc/sysv/consts/CLD_STOPPED.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,CLD_STOPPED,5,5,5,5,5,5 +.syscon sicode,CLD_STOPPED,5,5,5,5,5,5 diff --git a/libc/sysv/consts/CLD_TRAPPED.S b/libc/sysv/consts/CLD_TRAPPED.S index 7b027f015..35f858ef6 100644 --- a/libc/sysv/consts/CLD_TRAPPED.S +++ b/libc/sysv/consts/CLD_TRAPPED.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,CLD_TRAPPED,4,4,4,4,4,4 +.syscon sicode,CLD_TRAPPED,4,4,4,4,4,4 diff --git a/libc/sysv/consts/CLOCK_BOOTTIME.S b/libc/sysv/consts/CLOCK_BOOTTIME.S index 6093b3969..4a093dab4 100644 --- a/libc/sysv/consts/CLOCK_BOOTTIME.S +++ b/libc/sysv/consts/CLOCK_BOOTTIME.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon clock,CLOCK_BOOTTIME,7,0,0,6,6,0 +.syscon clock,CLOCK_BOOTTIME,7,-1,-1,6,6,-1 diff --git a/libc/sysv/consts/CLOCK_BOOTTIME_ALARM.S b/libc/sysv/consts/CLOCK_BOOTTIME_ALARM.S index 1c510dc53..aa660bfd3 100644 --- a/libc/sysv/consts/CLOCK_BOOTTIME_ALARM.S +++ b/libc/sysv/consts/CLOCK_BOOTTIME_ALARM.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon clock,CLOCK_BOOTTIME_ALARM,9,0,0,0,0,0 +.syscon clock,CLOCK_BOOTTIME_ALARM,9,-1,-1,-1,-1,-1 diff --git a/libc/sysv/consts/CLOCK_MONOTONIC_COARSE.S b/libc/sysv/consts/CLOCK_MONOTONIC_COARSE.S index 431a181a0..d12e8ec95 100644 --- a/libc/sysv/consts/CLOCK_MONOTONIC_COARSE.S +++ b/libc/sysv/consts/CLOCK_MONOTONIC_COARSE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon clock,CLOCK_MONOTONIC_COARSE,6,0,0,0,0,0 +.syscon clock,CLOCK_MONOTONIC_COARSE,6,-1,-1,-1,-1,-1 diff --git a/libc/sysv/consts/CLOCK_PROCESS_CPUTIME_ID.S b/libc/sysv/consts/CLOCK_PROCESS_CPUTIME_ID.S index 507a56999..5a080feb2 100644 --- a/libc/sysv/consts/CLOCK_PROCESS_CPUTIME_ID.S +++ b/libc/sysv/consts/CLOCK_PROCESS_CPUTIME_ID.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon clock,CLOCK_PROCESS_CPUTIME_ID,2,0,15,2,0x40000000,0 +.syscon clock,CLOCK_PROCESS_CPUTIME_ID,2,-1,15,2,0x40000000,-1 diff --git a/libc/sysv/consts/CLOCK_REALTIME_ALARM.S b/libc/sysv/consts/CLOCK_REALTIME_ALARM.S index 4845de579..795e372e4 100644 --- a/libc/sysv/consts/CLOCK_REALTIME_ALARM.S +++ b/libc/sysv/consts/CLOCK_REALTIME_ALARM.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon clock,CLOCK_REALTIME_ALARM,8,0,0,0,0,0 +.syscon clock,CLOCK_REALTIME_ALARM,8,-1,-1,-1,-1,-1 diff --git a/libc/sysv/consts/CLOCK_REALTIME_COARSE.S b/libc/sysv/consts/CLOCK_REALTIME_COARSE.S index cb2e53004..7f40a4d9e 100644 --- a/libc/sysv/consts/CLOCK_REALTIME_COARSE.S +++ b/libc/sysv/consts/CLOCK_REALTIME_COARSE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon clock,CLOCK_REALTIME_COARSE,5,0,0,0,0,0 +.syscon clock,CLOCK_REALTIME_COARSE,5,-1,-1,-1,-1,-1 diff --git a/libc/sysv/consts/CLOCK_TAI.S b/libc/sysv/consts/CLOCK_TAI.S index 144ee41e5..0925bb74a 100644 --- a/libc/sysv/consts/CLOCK_TAI.S +++ b/libc/sysv/consts/CLOCK_TAI.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon clock,CLOCK_TAI,11,0,0,0,0,0 +.syscon clock,CLOCK_TAI,11,-1,-1,-1,-1,-1 diff --git a/libc/sysv/consts/CLOCK_THREAD_CPUTIME_ID.S b/libc/sysv/consts/CLOCK_THREAD_CPUTIME_ID.S index 59a0db26f..d7358df70 100644 --- a/libc/sysv/consts/CLOCK_THREAD_CPUTIME_ID.S +++ b/libc/sysv/consts/CLOCK_THREAD_CPUTIME_ID.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon clock,CLOCK_THREAD_CPUTIME_ID,3,0,14,4,0x20000000,0 +.syscon clock,CLOCK_THREAD_CPUTIME_ID,3,-1,14,4,0x20000000,-1 diff --git a/libc/sysv/consts/C_IRGRP.S b/libc/sysv/consts/C_IRGRP.S deleted file mode 100644 index b1006c45e..000000000 --- a/libc/sysv/consts/C_IRGRP.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_IRGRP,0000040,0000040,0000040,0000040,0000040,0 diff --git a/libc/sysv/consts/C_IROTH.S b/libc/sysv/consts/C_IROTH.S deleted file mode 100644 index 9ea57cb64..000000000 --- a/libc/sysv/consts/C_IROTH.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_IROTH,0000004,0000004,0000004,0000004,0000004,0 diff --git a/libc/sysv/consts/C_IRUSR.S b/libc/sysv/consts/C_IRUSR.S deleted file mode 100644 index 347b4777c..000000000 --- a/libc/sysv/consts/C_IRUSR.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_IRUSR,0000400,0000400,0000400,0000400,0000400,0 diff --git a/libc/sysv/consts/C_ISBLK.S b/libc/sysv/consts/C_ISBLK.S deleted file mode 100644 index 69b4cca94..000000000 --- a/libc/sysv/consts/C_ISBLK.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_ISBLK,0060000,0060000,0060000,0060000,0060000,0 diff --git a/libc/sysv/consts/C_ISCHR.S b/libc/sysv/consts/C_ISCHR.S deleted file mode 100644 index 43a7bb05a..000000000 --- a/libc/sysv/consts/C_ISCHR.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_ISCHR,0020000,0020000,0020000,0020000,0020000,0 diff --git a/libc/sysv/consts/C_ISCTG.S b/libc/sysv/consts/C_ISCTG.S deleted file mode 100644 index dc6ff92b4..000000000 --- a/libc/sysv/consts/C_ISCTG.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_ISCTG,0110000,0110000,0110000,0110000,0110000,0 diff --git a/libc/sysv/consts/C_ISDIR.S b/libc/sysv/consts/C_ISDIR.S deleted file mode 100644 index 831407b85..000000000 --- a/libc/sysv/consts/C_ISDIR.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_ISDIR,0040000,0040000,0040000,0040000,0040000,0 diff --git a/libc/sysv/consts/C_ISFIFO.S b/libc/sysv/consts/C_ISFIFO.S deleted file mode 100644 index 359785b16..000000000 --- a/libc/sysv/consts/C_ISFIFO.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_ISFIFO,0010000,0010000,0010000,0010000,0010000,0 diff --git a/libc/sysv/consts/C_ISGID.S b/libc/sysv/consts/C_ISGID.S deleted file mode 100644 index 2d1f968e2..000000000 --- a/libc/sysv/consts/C_ISGID.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_ISGID,0002000,0002000,0002000,0002000,0002000,0 diff --git a/libc/sysv/consts/C_ISLNK.S b/libc/sysv/consts/C_ISLNK.S deleted file mode 100644 index 7a2cbb0a0..000000000 --- a/libc/sysv/consts/C_ISLNK.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_ISLNK,0120000,0120000,0120000,0120000,0120000,0 diff --git a/libc/sysv/consts/C_ISREG.S b/libc/sysv/consts/C_ISREG.S deleted file mode 100644 index 087b3758c..000000000 --- a/libc/sysv/consts/C_ISREG.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_ISREG,0100000,0100000,0100000,0100000,0100000,0 diff --git a/libc/sysv/consts/C_ISSOCK.S b/libc/sysv/consts/C_ISSOCK.S deleted file mode 100644 index 2b4763ae6..000000000 --- a/libc/sysv/consts/C_ISSOCK.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_ISSOCK,0140000,0140000,0140000,0140000,0140000,0 diff --git a/libc/sysv/consts/C_ISUID.S b/libc/sysv/consts/C_ISUID.S deleted file mode 100644 index f81ab9a11..000000000 --- a/libc/sysv/consts/C_ISUID.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_ISUID,0004000,0004000,0004000,0004000,0004000,0 diff --git a/libc/sysv/consts/C_ISVTX.S b/libc/sysv/consts/C_ISVTX.S deleted file mode 100644 index 7b99e59e7..000000000 --- a/libc/sysv/consts/C_ISVTX.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_ISVTX,0001000,0001000,0001000,0001000,0001000,0 diff --git a/libc/sysv/consts/C_IWGRP.S b/libc/sysv/consts/C_IWGRP.S deleted file mode 100644 index 0ced59dfc..000000000 --- a/libc/sysv/consts/C_IWGRP.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_IWGRP,0000020,0000020,0000020,0000020,0000020,0 diff --git a/libc/sysv/consts/C_IWOTH.S b/libc/sysv/consts/C_IWOTH.S deleted file mode 100644 index ca130045e..000000000 --- a/libc/sysv/consts/C_IWOTH.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_IWOTH,0000002,0000002,0000002,0000002,0000002,0 diff --git a/libc/sysv/consts/C_IWUSR.S b/libc/sysv/consts/C_IWUSR.S deleted file mode 100644 index 4103b20a4..000000000 --- a/libc/sysv/consts/C_IWUSR.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_IWUSR,0000200,0000200,0000200,0000200,0000200,0 diff --git a/libc/sysv/consts/C_IXGRP.S b/libc/sysv/consts/C_IXGRP.S deleted file mode 100644 index 851b49c76..000000000 --- a/libc/sysv/consts/C_IXGRP.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_IXGRP,0000010,0000010,0000010,0000010,0000010,0 diff --git a/libc/sysv/consts/C_IXOTH.S b/libc/sysv/consts/C_IXOTH.S deleted file mode 100644 index 0fbd89f15..000000000 --- a/libc/sysv/consts/C_IXOTH.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_IXOTH,0000001,0000001,0000001,0000001,0000001,0 diff --git a/libc/sysv/consts/C_IXUSR.S b/libc/sysv/consts/C_IXUSR.S deleted file mode 100644 index a010bf01f..000000000 --- a/libc/sysv/consts/C_IXUSR.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon c,C_IXUSR,0000100,0000100,0000100,0000100,0000100,0 diff --git a/libc/sysv/consts/EADDRINUSE.S b/libc/sysv/consts/EADDRINUSE.S index 12ac6e8e9..8012373a8 100644 --- a/libc/sysv/consts/EADDRINUSE.S +++ b/libc/sysv/consts/EADDRINUSE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EADDRINUSE,98,48,48,48,48,0x2740 +.syscon errno,EADDRINUSE,98,48,48,48,48,10048 diff --git a/libc/sysv/consts/EADDRNOTAVAIL.S b/libc/sysv/consts/EADDRNOTAVAIL.S index 1c7f18fdd..d38a66c67 100644 --- a/libc/sysv/consts/EADDRNOTAVAIL.S +++ b/libc/sysv/consts/EADDRNOTAVAIL.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EADDRNOTAVAIL,99,49,49,49,49,0x2741 +.syscon errno,EADDRNOTAVAIL,99,49,49,49,49,10049 diff --git a/libc/sysv/consts/EADV.S b/libc/sysv/consts/EADV.S index 08cbe9082..aa434b681 100644 --- a/libc/sysv/consts/EADV.S +++ b/libc/sysv/consts/EADV.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EADV,68,0,0,0,0,0 +.syscon junkerr,EADV,68,0,0,0,0,0 diff --git a/libc/sysv/consts/EAFNOSUPPORT.S b/libc/sysv/consts/EAFNOSUPPORT.S index 79d1a0eae..9c46c22e3 100644 --- a/libc/sysv/consts/EAFNOSUPPORT.S +++ b/libc/sysv/consts/EAFNOSUPPORT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EAFNOSUPPORT,97,47,47,47,47,0x273f +.syscon errno,EAFNOSUPPORT,97,47,47,47,47,10047 diff --git a/libc/sysv/consts/EAGAIN.S b/libc/sysv/consts/EAGAIN.S index bc983c660..549be0fb9 100644 --- a/libc/sysv/consts/EAGAIN.S +++ b/libc/sysv/consts/EAGAIN.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EAGAIN,11,35,35,35,35,0x2733 +.syscon errno,EAGAIN,11,35,35,35,35,10035 diff --git a/libc/sysv/consts/EALREADY.S b/libc/sysv/consts/EALREADY.S index cade0decd..b55024332 100644 --- a/libc/sysv/consts/EALREADY.S +++ b/libc/sysv/consts/EALREADY.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EALREADY,114,37,37,37,37,0x2735 +.syscon errno,EALREADY,114,37,37,37,37,10037 diff --git a/libc/sysv/consts/EBADE.S b/libc/sysv/consts/EBADE.S index ecaf458fc..74b94ea93 100644 --- a/libc/sysv/consts/EBADE.S +++ b/libc/sysv/consts/EBADE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EBADE,52,0,0,0,0,0 +.syscon junkerr,EBADE,52,0,0,0,0,0 diff --git a/libc/sysv/consts/EBADFD.S b/libc/sysv/consts/EBADFD.S index 71f5f1687..3d23845e6 100644 --- a/libc/sysv/consts/EBADFD.S +++ b/libc/sysv/consts/EBADFD.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EBADFD,77,9,9,9,9,6 +.syscon junkerr,EBADFD,77,9,9,9,9,6 diff --git a/libc/sysv/consts/EBADR.S b/libc/sysv/consts/EBADR.S index b1375b239..c63e4745e 100644 --- a/libc/sysv/consts/EBADR.S +++ b/libc/sysv/consts/EBADR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EBADR,53,0,0,0,0,0 +.syscon junkerr,EBADR,53,0,0,0,0,0 diff --git a/libc/sysv/consts/EBADRQC.S b/libc/sysv/consts/EBADRQC.S index 134bfb5af..da7aa46d1 100644 --- a/libc/sysv/consts/EBADRQC.S +++ b/libc/sysv/consts/EBADRQC.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EBADRQC,56,0,0,0,0,0 +.syscon junkerr,EBADRQC,56,0,0,0,0,0 diff --git a/libc/sysv/consts/EBADSLT.S b/libc/sysv/consts/EBADSLT.S index fb1bff43d..da3094623 100644 --- a/libc/sysv/consts/EBADSLT.S +++ b/libc/sysv/consts/EBADSLT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EBADSLT,57,0,0,0,0,0 +.syscon junkerr,EBADSLT,57,0,0,0,0,0 diff --git a/libc/sysv/consts/ECHRNG.S b/libc/sysv/consts/ECHRNG.S index 861ee6ebd..53c7a71ce 100644 --- a/libc/sysv/consts/ECHRNG.S +++ b/libc/sysv/consts/ECHRNG.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ECHRNG,44,0,0,0,0,0 +.syscon junkerr,ECHRNG,44,0,0,0,0,0 diff --git a/libc/sysv/consts/ECOMM.S b/libc/sysv/consts/ECOMM.S index f84f311a4..4b86f5212 100644 --- a/libc/sysv/consts/ECOMM.S +++ b/libc/sysv/consts/ECOMM.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ECOMM,70,0,0,0,0,0 +.syscon junkerr,ECOMM,70,0,0,0,0,0 diff --git a/libc/sysv/consts/ECONNABORTED.S b/libc/sysv/consts/ECONNABORTED.S index bedbbe5c4..b66fb3fbc 100644 --- a/libc/sysv/consts/ECONNABORTED.S +++ b/libc/sysv/consts/ECONNABORTED.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ECONNABORTED,103,53,53,53,53,0x2745 +.syscon errno,ECONNABORTED,103,53,53,53,53,10053 diff --git a/libc/sysv/consts/ECONNREFUSED.S b/libc/sysv/consts/ECONNREFUSED.S index 366123c7a..342f48b1e 100644 --- a/libc/sysv/consts/ECONNREFUSED.S +++ b/libc/sysv/consts/ECONNREFUSED.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ECONNREFUSED,111,61,61,61,61,0x274d +.syscon errno,ECONNREFUSED,111,61,61,61,61,10061 diff --git a/libc/sysv/consts/ECONNRESET.S b/libc/sysv/consts/ECONNRESET.S index 7e5708c6a..45a3463ed 100644 --- a/libc/sysv/consts/ECONNRESET.S +++ b/libc/sysv/consts/ECONNRESET.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ECONNRESET,104,54,54,54,54,0x2746 +.syscon errno,ECONNRESET,104,54,54,54,54,10054 diff --git a/libc/sysv/consts/EDESTADDRREQ.S b/libc/sysv/consts/EDESTADDRREQ.S index 6782be649..a1cdc8ed0 100644 --- a/libc/sysv/consts/EDESTADDRREQ.S +++ b/libc/sysv/consts/EDESTADDRREQ.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EDESTADDRREQ,89,39,39,39,39,0x2737 +.syscon errno,EDESTADDRREQ,89,39,39,39,39,10039 diff --git a/libc/sysv/consts/EDOTDOT.S b/libc/sysv/consts/EDOTDOT.S index 8329e10d7..743fbc8ed 100644 --- a/libc/sysv/consts/EDOTDOT.S +++ b/libc/sysv/consts/EDOTDOT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EDOTDOT,73,0,0,0,0,0 +.syscon junkerr,EDOTDOT,73,0,0,0,0,0 diff --git a/libc/sysv/consts/EDQUOT.S b/libc/sysv/consts/EDQUOT.S index 7f6ede6a9..2d4bae78a 100644 --- a/libc/sysv/consts/EDQUOT.S +++ b/libc/sysv/consts/EDQUOT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EDQUOT,122,69,69,69,69,0x2755 +.syscon errno,EDQUOT,122,69,69,69,69,10069 diff --git a/libc/sysv/consts/EHOSTDOWN.S b/libc/sysv/consts/EHOSTDOWN.S index 66865b63d..f754f9ea3 100644 --- a/libc/sysv/consts/EHOSTDOWN.S +++ b/libc/sysv/consts/EHOSTDOWN.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EHOSTDOWN,112,64,64,64,64,0x2750 +.syscon errno,EHOSTDOWN,112,64,64,64,64,10064 diff --git a/libc/sysv/consts/EHOSTUNREACH.S b/libc/sysv/consts/EHOSTUNREACH.S index aaee71d2c..7c96eaec9 100644 --- a/libc/sysv/consts/EHOSTUNREACH.S +++ b/libc/sysv/consts/EHOSTUNREACH.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EHOSTUNREACH,113,65,65,65,65,0x2751 +.syscon errno,EHOSTUNREACH,113,65,65,65,65,10065 diff --git a/libc/sysv/consts/EHWPOISON.S b/libc/sysv/consts/EHWPOISON.S index 7c94d3942..ff444df5f 100644 --- a/libc/sysv/consts/EHWPOISON.S +++ b/libc/sysv/consts/EHWPOISON.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EHWPOISON,133,0,0,0,0,0 +.syscon junkerr,EHWPOISON,133,0,0,0,0,0 diff --git a/libc/sysv/consts/EINPROGRESS.S b/libc/sysv/consts/EINPROGRESS.S index ec5c077e6..c62c9fbb2 100644 --- a/libc/sysv/consts/EINPROGRESS.S +++ b/libc/sysv/consts/EINPROGRESS.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EINPROGRESS,115,36,36,36,36,0x2734 +.syscon errno,EINPROGRESS,115,36,36,36,36,10036 diff --git a/libc/sysv/consts/EISCONN.S b/libc/sysv/consts/EISCONN.S index 70f5ae4e6..b62829acb 100644 --- a/libc/sysv/consts/EISCONN.S +++ b/libc/sysv/consts/EISCONN.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EISCONN,106,56,56,56,56,0x2748 +.syscon errno,EISCONN,106,56,56,56,56,10056 diff --git a/libc/sysv/consts/EISNAM.S b/libc/sysv/consts/EISNAM.S index 12029e087..bdcc5c3e9 100644 --- a/libc/sysv/consts/EISNAM.S +++ b/libc/sysv/consts/EISNAM.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EISNAM,120,0,0,0,0,0 +.syscon junkerr,EISNAM,120,0,0,0,0,0 diff --git a/libc/sysv/consts/EKEYEXPIRED.S b/libc/sysv/consts/EKEYEXPIRED.S index 161ed2852..fd5498a77 100644 --- a/libc/sysv/consts/EKEYEXPIRED.S +++ b/libc/sysv/consts/EKEYEXPIRED.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EKEYEXPIRED,127,0,0,0,0,0 +.syscon junkerr,EKEYEXPIRED,127,0,0,0,0,0 diff --git a/libc/sysv/consts/EKEYREJECTED.S b/libc/sysv/consts/EKEYREJECTED.S index e8f1fb54a..c9e5d2225 100644 --- a/libc/sysv/consts/EKEYREJECTED.S +++ b/libc/sysv/consts/EKEYREJECTED.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EKEYREJECTED,129,0,0,0,0,0 +.syscon junkerr,EKEYREJECTED,129,0,0,0,0,0 diff --git a/libc/sysv/consts/EKEYREVOKED.S b/libc/sysv/consts/EKEYREVOKED.S index beb4031f6..be58ba181 100644 --- a/libc/sysv/consts/EKEYREVOKED.S +++ b/libc/sysv/consts/EKEYREVOKED.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EKEYREVOKED,128,0,0,0,0,0 +.syscon junkerr,EKEYREVOKED,128,0,0,0,0,0 diff --git a/libc/sysv/consts/EL2HLT.S b/libc/sysv/consts/EL2HLT.S index 0415c820d..e55005ac5 100644 --- a/libc/sysv/consts/EL2HLT.S +++ b/libc/sysv/consts/EL2HLT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EL2HLT,51,0,0,0,0,0 +.syscon junkerr,EL2HLT,51,0,0,0,0,0 diff --git a/libc/sysv/consts/EL2NSYNC.S b/libc/sysv/consts/EL2NSYNC.S index 31ddd4a99..4da833ae8 100644 --- a/libc/sysv/consts/EL2NSYNC.S +++ b/libc/sysv/consts/EL2NSYNC.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EL2NSYNC,45,0,0,0,0,0 +.syscon junkerr,EL2NSYNC,45,0,0,0,0,0 diff --git a/libc/sysv/consts/EL3HLT.S b/libc/sysv/consts/EL3HLT.S index c0e150d1c..607b6f6a6 100644 --- a/libc/sysv/consts/EL3HLT.S +++ b/libc/sysv/consts/EL3HLT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EL3HLT,46,0,0,0,0,0 +.syscon junkerr,EL3HLT,46,0,0,0,0,0 diff --git a/libc/sysv/consts/EL3RST.S b/libc/sysv/consts/EL3RST.S index 96e3fa638..0b5ea0c3c 100644 --- a/libc/sysv/consts/EL3RST.S +++ b/libc/sysv/consts/EL3RST.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EL3RST,47,0,0,0,0,0 +.syscon junkerr,EL3RST,47,0,0,0,0,0 diff --git a/libc/sysv/consts/ELIBACC.S b/libc/sysv/consts/ELIBACC.S index 76c50141b..97fe15688 100644 --- a/libc/sysv/consts/ELIBACC.S +++ b/libc/sysv/consts/ELIBACC.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ELIBACC,79,0,0,0,0,0 +.syscon junkerr,ELIBACC,79,0,0,0,0,0 diff --git a/libc/sysv/consts/ELIBBAD.S b/libc/sysv/consts/ELIBBAD.S index 9596cc363..6622fadb0 100644 --- a/libc/sysv/consts/ELIBBAD.S +++ b/libc/sysv/consts/ELIBBAD.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ELIBBAD,80,0,0,0,0,0 +.syscon junkerr,ELIBBAD,80,0,0,0,0,0 diff --git a/libc/sysv/consts/ELIBEXEC.S b/libc/sysv/consts/ELIBEXEC.S index cd9ae7540..3245cdf4f 100644 --- a/libc/sysv/consts/ELIBEXEC.S +++ b/libc/sysv/consts/ELIBEXEC.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ELIBEXEC,83,0,0,0,0,0 +.syscon junkerr,ELIBEXEC,83,0,0,0,0,0 diff --git a/libc/sysv/consts/ELIBMAX.S b/libc/sysv/consts/ELIBMAX.S index 2f18e3b08..b319adea2 100644 --- a/libc/sysv/consts/ELIBMAX.S +++ b/libc/sysv/consts/ELIBMAX.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ELIBMAX,82,0,0,0,0,0 +.syscon junkerr,ELIBMAX,82,0,0,0,0,0 diff --git a/libc/sysv/consts/ELIBSCN.S b/libc/sysv/consts/ELIBSCN.S index 680f8da4d..3776c44d9 100644 --- a/libc/sysv/consts/ELIBSCN.S +++ b/libc/sysv/consts/ELIBSCN.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ELIBSCN,81,0,0,0,0,0 +.syscon junkerr,ELIBSCN,81,0,0,0,0,0 diff --git a/libc/sysv/consts/ELNRNG.S b/libc/sysv/consts/ELNRNG.S index bda2fc53d..236df0e89 100644 --- a/libc/sysv/consts/ELNRNG.S +++ b/libc/sysv/consts/ELNRNG.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ELNRNG,48,0,0,0,0,0 +.syscon junkerr,ELNRNG,48,0,0,0,0,0 diff --git a/libc/sysv/consts/ELOOP.S b/libc/sysv/consts/ELOOP.S index 013927291..e18cf2483 100644 --- a/libc/sysv/consts/ELOOP.S +++ b/libc/sysv/consts/ELOOP.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ELOOP,40,62,62,62,62,0x274e +.syscon errno,ELOOP,40,62,62,62,62,10062 diff --git a/libc/sysv/consts/EMEDIUMTYPE.S b/libc/sysv/consts/EMEDIUMTYPE.S index ba830f328..488841a65 100644 --- a/libc/sysv/consts/EMEDIUMTYPE.S +++ b/libc/sysv/consts/EMEDIUMTYPE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EMEDIUMTYPE,124,0,0,86,86,0 +.syscon junkerr,EMEDIUMTYPE,124,0,0,86,86,0 diff --git a/libc/sysv/consts/EMSGSIZE.S b/libc/sysv/consts/EMSGSIZE.S index 2cb9f6d7f..d79b21a32 100644 --- a/libc/sysv/consts/EMSGSIZE.S +++ b/libc/sysv/consts/EMSGSIZE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EMSGSIZE,90,40,40,40,40,0x2738 +.syscon errno,EMSGSIZE,90,40,40,40,40,10040 diff --git a/libc/sysv/consts/EMULTIHOP.S b/libc/sysv/consts/EMULTIHOP.S index 434e78754..cfff27b7d 100644 --- a/libc/sysv/consts/EMULTIHOP.S +++ b/libc/sysv/consts/EMULTIHOP.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EMULTIHOP,72,95,90,0,94,0 +.syscon junkerr,EMULTIHOP,72,95,90,0,94,0 diff --git a/libc/sysv/consts/ENAMETOOLONG.S b/libc/sysv/consts/ENAMETOOLONG.S index 4dc1a675a..914e0fa58 100644 --- a/libc/sysv/consts/ENAMETOOLONG.S +++ b/libc/sysv/consts/ENAMETOOLONG.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENAMETOOLONG,36,63,63,63,63,0x274f +.syscon errno,ENAMETOOLONG,36,63,63,63,63,10063 diff --git a/libc/sysv/consts/ENAVAIL.S b/libc/sysv/consts/ENAVAIL.S index 5cbd8fda4..2b89fb282 100644 --- a/libc/sysv/consts/ENAVAIL.S +++ b/libc/sysv/consts/ENAVAIL.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENAVAIL,119,0,0,0,0,0 +.syscon junkerr,ENAVAIL,119,0,0,0,0,0 diff --git a/libc/sysv/consts/ENETDOWN.S b/libc/sysv/consts/ENETDOWN.S index 31aeec71a..0dda8c4ef 100644 --- a/libc/sysv/consts/ENETDOWN.S +++ b/libc/sysv/consts/ENETDOWN.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENETDOWN,100,50,50,50,50,0x2742 +.syscon errno,ENETDOWN,100,50,50,50,50,10050 diff --git a/libc/sysv/consts/ENETRESET.S b/libc/sysv/consts/ENETRESET.S index 073489b62..b143aaf05 100644 --- a/libc/sysv/consts/ENETRESET.S +++ b/libc/sysv/consts/ENETRESET.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENETRESET,102,52,52,52,52,0x2744 +.syscon errno,ENETRESET,102,52,52,52,52,10052 diff --git a/libc/sysv/consts/ENETUNREACH.S b/libc/sysv/consts/ENETUNREACH.S index bb921e4b4..a5bc55641 100644 --- a/libc/sysv/consts/ENETUNREACH.S +++ b/libc/sysv/consts/ENETUNREACH.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENETUNREACH,101,51,51,51,51,0x2743 +.syscon errno,ENETUNREACH,101,51,51,51,51,10051 diff --git a/libc/sysv/consts/ENOANO.S b/libc/sysv/consts/ENOANO.S index 235babdad..2ecd8abe2 100644 --- a/libc/sysv/consts/ENOANO.S +++ b/libc/sysv/consts/ENOANO.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOANO,55,0,0,0,0,0 +.syscon junkerr,ENOANO,55,0,0,0,0,0 diff --git a/libc/sysv/consts/ENOBUFS.S b/libc/sysv/consts/ENOBUFS.S index c4a329760..c366d39ca 100644 --- a/libc/sysv/consts/ENOBUFS.S +++ b/libc/sysv/consts/ENOBUFS.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOBUFS,105,55,55,55,55,0x2747 +.syscon errno,ENOBUFS,105,55,55,55,55,10055 diff --git a/libc/sysv/consts/ENOCSI.S b/libc/sysv/consts/ENOCSI.S index 9c5de5dd5..29453b515 100644 --- a/libc/sysv/consts/ENOCSI.S +++ b/libc/sysv/consts/ENOCSI.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOCSI,50,0,0,0,0,0 +.syscon junkerr,ENOCSI,50,0,0,0,0,0 diff --git a/libc/sysv/consts/ENODATA.S b/libc/sysv/consts/ENODATA.S index e9b938bbb..c406f9ae6 100644 --- a/libc/sysv/consts/ENODATA.S +++ b/libc/sysv/consts/ENODATA.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENODATA,61,96,0,0,89,0 +.syscon junkerr,ENODATA,61,96,0,0,89,0 diff --git a/libc/sysv/consts/ENOKEY.S b/libc/sysv/consts/ENOKEY.S index bc11fdebf..46c2fc42a 100644 --- a/libc/sysv/consts/ENOKEY.S +++ b/libc/sysv/consts/ENOKEY.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOKEY,126,0,0,0,0,0 +.syscon junkerr,ENOKEY,126,0,0,0,0,0 diff --git a/libc/sysv/consts/ENOLINK.S b/libc/sysv/consts/ENOLINK.S index 875ea6b1b..9d890098e 100644 --- a/libc/sysv/consts/ENOLINK.S +++ b/libc/sysv/consts/ENOLINK.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOLINK,67,97,91,0,95,0 +.syscon junkerr,ENOLINK,67,97,91,0,95,0 diff --git a/libc/sysv/consts/ENOMEDIUM.S b/libc/sysv/consts/ENOMEDIUM.S index 0c9a5d03a..7243999b8 100644 --- a/libc/sysv/consts/ENOMEDIUM.S +++ b/libc/sysv/consts/ENOMEDIUM.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOMEDIUM,123,0,0,85,85,0 +.syscon junkerr,ENOMEDIUM,123,0,0,85,85,0 diff --git a/libc/sysv/consts/ENOPKG.S b/libc/sysv/consts/ENOPKG.S index d05ef3a03..e2580a4ab 100644 --- a/libc/sysv/consts/ENOPKG.S +++ b/libc/sysv/consts/ENOPKG.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOPKG,65,0,0,0,0,0 +.syscon junkerr,ENOPKG,65,0,0,0,0,0 diff --git a/libc/sysv/consts/ENOPROTOOPT.S b/libc/sysv/consts/ENOPROTOOPT.S index 0f516fa21..1ba684676 100644 --- a/libc/sysv/consts/ENOPROTOOPT.S +++ b/libc/sysv/consts/ENOPROTOOPT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOPROTOOPT,92,42,42,42,42,0x273a +.syscon errno,ENOPROTOOPT,92,42,42,42,42,10042 diff --git a/libc/sysv/consts/ENOSR.S b/libc/sysv/consts/ENOSR.S index 86ff4c52b..ea4d91cf0 100644 --- a/libc/sysv/consts/ENOSR.S +++ b/libc/sysv/consts/ENOSR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOSR,63,98,0,0,90,0 +.syscon junkerr,ENOSR,63,98,0,0,90,0 diff --git a/libc/sysv/consts/ENOSTR.S b/libc/sysv/consts/ENOSTR.S index 749624fa4..9dde57279 100644 --- a/libc/sysv/consts/ENOSTR.S +++ b/libc/sysv/consts/ENOSTR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOSTR,60,99,0,0,91,0 +.syscon junkerr,ENOSTR,60,99,0,0,91,0 diff --git a/libc/sysv/consts/ENOTCONN.S b/libc/sysv/consts/ENOTCONN.S index 5bb5712d8..82dfb5b2e 100644 --- a/libc/sysv/consts/ENOTCONN.S +++ b/libc/sysv/consts/ENOTCONN.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOTCONN,107,57,57,57,57,0x2749 +.syscon errno,ENOTCONN,107,57,57,57,57,10057 diff --git a/libc/sysv/consts/ENOTNAM.S b/libc/sysv/consts/ENOTNAM.S index b1b4db47e..94e0ff0d3 100644 --- a/libc/sysv/consts/ENOTNAM.S +++ b/libc/sysv/consts/ENOTNAM.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOTNAM,118,0,0,0,0,0 +.syscon junkerr,ENOTNAM,118,0,0,0,0,0 diff --git a/libc/sysv/consts/ENOTSOCK.S b/libc/sysv/consts/ENOTSOCK.S index 3575547e7..9c302f5e9 100644 --- a/libc/sysv/consts/ENOTSOCK.S +++ b/libc/sysv/consts/ENOTSOCK.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOTSOCK,88,38,38,38,38,0x2736 +.syscon errno,ENOTSOCK,88,38,38,38,38,10038 diff --git a/libc/sysv/consts/ENOTSUP.S b/libc/sysv/consts/ENOTSUP.S index 77a0a8a3d..73d5ec045 100644 --- a/libc/sysv/consts/ENOTSUP.S +++ b/libc/sysv/consts/ENOTSUP.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOTSUP,95,45,45,91,86,0x273d +.syscon errno,ENOTSUP,95,45,45,91,86,10045 diff --git a/libc/sysv/consts/ENOTUNIQ.S b/libc/sysv/consts/ENOTUNIQ.S index 3212f49c8..a4b4922f9 100644 --- a/libc/sysv/consts/ENOTUNIQ.S +++ b/libc/sysv/consts/ENOTUNIQ.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ENOTUNIQ,76,0,0,0,0,0 +.syscon junkerr,ENOTUNIQ,76,0,0,0,0,0 diff --git a/libc/sysv/consts/EOPNOTSUPP.S b/libc/sysv/consts/EOPNOTSUPP.S index d301e8d98..dc9a2e8ec 100644 --- a/libc/sysv/consts/EOPNOTSUPP.S +++ b/libc/sysv/consts/EOPNOTSUPP.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EOPNOTSUPP,95,102,45,45,45,0x273d +.syscon errno,EOPNOTSUPP,95,102,45,45,45,10045 diff --git a/libc/sysv/consts/EPFNOSUPPORT.S b/libc/sysv/consts/EPFNOSUPPORT.S index 45daea4a5..cd75b77bb 100644 --- a/libc/sysv/consts/EPFNOSUPPORT.S +++ b/libc/sysv/consts/EPFNOSUPPORT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EPFNOSUPPORT,96,46,46,46,46,0x273e +.syscon errno,EPFNOSUPPORT,96,46,46,46,46,10046 diff --git a/libc/sysv/consts/EPROTONOSUPPORT.S b/libc/sysv/consts/EPROTONOSUPPORT.S index 622320562..045280e56 100644 --- a/libc/sysv/consts/EPROTONOSUPPORT.S +++ b/libc/sysv/consts/EPROTONOSUPPORT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EPROTONOSUPPORT,93,43,43,43,43,0x273b +.syscon errno,EPROTONOSUPPORT,93,43,43,43,43,10043 diff --git a/libc/sysv/consts/EPROTOTYPE.S b/libc/sysv/consts/EPROTOTYPE.S index c9e206fe3..f151689f1 100644 --- a/libc/sysv/consts/EPROTOTYPE.S +++ b/libc/sysv/consts/EPROTOTYPE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EPROTOTYPE,91,41,41,41,41,0x2739 +.syscon errno,EPROTOTYPE,91,41,41,41,41,10041 diff --git a/libc/sysv/consts/EREMCHG.S b/libc/sysv/consts/EREMCHG.S index 0097bc85d..40c2b77fb 100644 --- a/libc/sysv/consts/EREMCHG.S +++ b/libc/sysv/consts/EREMCHG.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EREMCHG,78,0,0,0,0,0 +.syscon junkerr,EREMCHG,78,0,0,0,0,0 diff --git a/libc/sysv/consts/EREMOTE.S b/libc/sysv/consts/EREMOTE.S index 0143242e0..69f56be92 100644 --- a/libc/sysv/consts/EREMOTE.S +++ b/libc/sysv/consts/EREMOTE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EREMOTE,66,71,71,71,71,0x2757 +.syscon errno,EREMOTE,66,71,71,71,71,10071 diff --git a/libc/sysv/consts/EREMOTEIO.S b/libc/sysv/consts/EREMOTEIO.S index 99326c177..274433d49 100644 --- a/libc/sysv/consts/EREMOTEIO.S +++ b/libc/sysv/consts/EREMOTEIO.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EREMOTEIO,121,0,0,0,0,0 +.syscon junkerr,EREMOTEIO,121,0,0,0,0,0 diff --git a/libc/sysv/consts/ERFKILL.S b/libc/sysv/consts/ERFKILL.S index 2f331d26e..fb48e5305 100644 --- a/libc/sysv/consts/ERFKILL.S +++ b/libc/sysv/consts/ERFKILL.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ERFKILL,132,0,0,0,0,0 +.syscon junkerr,ERFKILL,132,0,0,0,0,0 diff --git a/libc/sysv/consts/ESHUTDOWN.S b/libc/sysv/consts/ESHUTDOWN.S index 10a5e7205..27b16dd80 100644 --- a/libc/sysv/consts/ESHUTDOWN.S +++ b/libc/sysv/consts/ESHUTDOWN.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ESHUTDOWN,108,58,58,58,58,0x274a +.syscon errno,ESHUTDOWN,108,58,58,58,58,10058 diff --git a/libc/sysv/consts/ESOCKTNOSUPPORT.S b/libc/sysv/consts/ESOCKTNOSUPPORT.S index c7f91e388..38f9c165e 100644 --- a/libc/sysv/consts/ESOCKTNOSUPPORT.S +++ b/libc/sysv/consts/ESOCKTNOSUPPORT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ESOCKTNOSUPPORT,94,44,44,44,44,0x273c +.syscon errno,ESOCKTNOSUPPORT,94,44,44,44,44,10044 diff --git a/libc/sysv/consts/ESRMNT.S b/libc/sysv/consts/ESRMNT.S index 99b5f9605..7c3147570 100644 --- a/libc/sysv/consts/ESRMNT.S +++ b/libc/sysv/consts/ESRMNT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ESRMNT,69,0,0,0,0,0 +.syscon junkerr,ESRMNT,69,0,0,0,0,0 diff --git a/libc/sysv/consts/ESTALE.S b/libc/sysv/consts/ESTALE.S index ba34d2e49..b086b85fb 100644 --- a/libc/sysv/consts/ESTALE.S +++ b/libc/sysv/consts/ESTALE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ESTALE,116,70,70,70,70,0x2756 +.syscon errno,ESTALE,116,70,70,70,70,10070 diff --git a/libc/sysv/consts/ESTRPIPE.S b/libc/sysv/consts/ESTRPIPE.S index 8892e8b26..f89d8fa13 100644 --- a/libc/sysv/consts/ESTRPIPE.S +++ b/libc/sysv/consts/ESTRPIPE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ESTRPIPE,86,0,0,0,0,0 +.syscon junkerr,ESTRPIPE,86,0,0,0,0,0 diff --git a/libc/sysv/consts/ETIME.S b/libc/sysv/consts/ETIME.S index e338e9f62..38366adf2 100644 --- a/libc/sysv/consts/ETIME.S +++ b/libc/sysv/consts/ETIME.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ETIME,62,101,0,0,92,0 +.syscon errno,ETIME,62,101,60,60,92,0 diff --git a/libc/sysv/consts/ETIMEDOUT.S b/libc/sysv/consts/ETIMEDOUT.S index 5490f78b4..31832d5a3 100644 --- a/libc/sysv/consts/ETIMEDOUT.S +++ b/libc/sysv/consts/ETIMEDOUT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ETIMEDOUT,110,60,60,60,60,0x274c +.syscon errno,ETIMEDOUT,110,60,60,60,60,10060 diff --git a/libc/sysv/consts/ETOOMANYREFS.S b/libc/sysv/consts/ETOOMANYREFS.S index 0b11b544a..3a3ba0c61 100644 --- a/libc/sysv/consts/ETOOMANYREFS.S +++ b/libc/sysv/consts/ETOOMANYREFS.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,ETOOMANYREFS,109,59,59,59,59,0x274b +.syscon errno,ETOOMANYREFS,109,59,59,59,59,10059 diff --git a/libc/sysv/consts/EUCLEAN.S b/libc/sysv/consts/EUCLEAN.S index a827c02e0..a0eecf2db 100644 --- a/libc/sysv/consts/EUCLEAN.S +++ b/libc/sysv/consts/EUCLEAN.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EUCLEAN,117,0,0,0,0,0 +.syscon junkerr,EUCLEAN,117,0,0,0,0,0 diff --git a/libc/sysv/consts/EUNATCH.S b/libc/sysv/consts/EUNATCH.S index 5595e478a..679c2a8fc 100644 --- a/libc/sysv/consts/EUNATCH.S +++ b/libc/sysv/consts/EUNATCH.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EUNATCH,49,0,0,0,0,0 +.syscon junkerr,EUNATCH,49,0,0,0,0,0 diff --git a/libc/sysv/consts/EUSERS.S b/libc/sysv/consts/EUSERS.S index f6efba821..489f96247 100644 --- a/libc/sysv/consts/EUSERS.S +++ b/libc/sysv/consts/EUSERS.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EUSERS,87,68,68,68,68,0x2754 +.syscon errno,EUSERS,87,68,68,68,68,10068 diff --git a/libc/sysv/consts/EWOULDBLOCK.S b/libc/sysv/consts/EWOULDBLOCK.S index 91f2f0ba8..68b511917 100644 --- a/libc/sysv/consts/EWOULDBLOCK.S +++ b/libc/sysv/consts/EWOULDBLOCK.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EWOULDBLOCK,11,35,35,35,35,0x2733 +.syscon compat,EWOULDBLOCK,11,35,35,35,35,10035 diff --git a/libc/sysv/consts/EXFULL.S b/libc/sysv/consts/EXFULL.S index 0c0aad1d2..bd1fd87c3 100644 --- a/libc/sysv/consts/EXFULL.S +++ b/libc/sysv/consts/EXFULL.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EXFULL,54,0,0,0,0,0 +.syscon junkerr,EXFULL,54,0,0,0,0,0 diff --git a/libc/sysv/consts/FPE_FLTDIV.S b/libc/sysv/consts/FPE_FLTDIV.S index 3390eed37..779be8461 100644 --- a/libc/sysv/consts/FPE_FLTDIV.S +++ b/libc/sysv/consts/FPE_FLTDIV.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,FPE_FLTDIV,3,1,3,3,3,0 +.syscon sicode,FPE_FLTDIV,3,1,3,3,3,3 diff --git a/libc/sysv/consts/FPE_FLTINV.S b/libc/sysv/consts/FPE_FLTINV.S index 24a2d9b9d..efd268e49 100644 --- a/libc/sysv/consts/FPE_FLTINV.S +++ b/libc/sysv/consts/FPE_FLTINV.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,FPE_FLTINV,7,5,7,7,7,0 +.syscon sicode,FPE_FLTINV,7,5,7,7,7,7 diff --git a/libc/sysv/consts/FPE_FLTOVF.S b/libc/sysv/consts/FPE_FLTOVF.S index 6ccf5937c..ff290e423 100644 --- a/libc/sysv/consts/FPE_FLTOVF.S +++ b/libc/sysv/consts/FPE_FLTOVF.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,FPE_FLTOVF,4,2,4,4,4,0 +.syscon sicode,FPE_FLTOVF,4,2,4,4,4,4 diff --git a/libc/sysv/consts/FPE_FLTRES.S b/libc/sysv/consts/FPE_FLTRES.S index 7d4881f0b..8dcf2076d 100644 --- a/libc/sysv/consts/FPE_FLTRES.S +++ b/libc/sysv/consts/FPE_FLTRES.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,FPE_FLTRES,6,4,6,6,6,0 +.syscon sicode,FPE_FLTRES,6,4,6,6,6,6 diff --git a/libc/sysv/consts/FPE_FLTSUB.S b/libc/sysv/consts/FPE_FLTSUB.S index f17fa18c1..1c16c937e 100644 --- a/libc/sysv/consts/FPE_FLTSUB.S +++ b/libc/sysv/consts/FPE_FLTSUB.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,FPE_FLTSUB,8,6,8,8,8,0 +.syscon sicode,FPE_FLTSUB,8,6,8,8,8,8 diff --git a/libc/sysv/consts/FPE_FLTUND.S b/libc/sysv/consts/FPE_FLTUND.S index 7556e5724..9a93a8dd8 100644 --- a/libc/sysv/consts/FPE_FLTUND.S +++ b/libc/sysv/consts/FPE_FLTUND.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,FPE_FLTUND,5,3,5,5,5,0 +.syscon sicode,FPE_FLTUND,5,3,5,5,5,5 diff --git a/libc/sysv/consts/FPE_INTDIV.S b/libc/sysv/consts/FPE_INTDIV.S index 87d9e0340..23ea84b2a 100644 --- a/libc/sysv/consts/FPE_INTDIV.S +++ b/libc/sysv/consts/FPE_INTDIV.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,FPE_INTDIV,1,7,2,1,1,0 +.syscon sicode,FPE_INTDIV,1,7,2,1,1,1 diff --git a/libc/sysv/consts/FPE_INTOVF.S b/libc/sysv/consts/FPE_INTOVF.S index dfcfe321c..dd44f7bbc 100644 --- a/libc/sysv/consts/FPE_INTOVF.S +++ b/libc/sysv/consts/FPE_INTOVF.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,FPE_INTOVF,2,8,1,2,2,0 +.syscon sicode,FPE_INTOVF,2,8,1,2,2,2 diff --git a/libc/sysv/consts/ILL_BADSTK.S b/libc/sysv/consts/ILL_BADSTK.S index 0dbf521d0..296262949 100644 --- a/libc/sysv/consts/ILL_BADSTK.S +++ b/libc/sysv/consts/ILL_BADSTK.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,ILL_BADSTK,8,8,8,8,8,0 +.syscon sicode,ILL_BADSTK,8,8,8,8,8,8 diff --git a/libc/sysv/consts/ILL_COPROC.S b/libc/sysv/consts/ILL_COPROC.S index 3c7d9a3a3..220f3d6ba 100644 --- a/libc/sysv/consts/ILL_COPROC.S +++ b/libc/sysv/consts/ILL_COPROC.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,ILL_COPROC,7,7,7,7,7,0 +.syscon sicode,ILL_COPROC,7,7,7,7,7,7 diff --git a/libc/sysv/consts/ILL_ILLADR.S b/libc/sysv/consts/ILL_ILLADR.S index f7bd4dd40..7aff4a492 100644 --- a/libc/sysv/consts/ILL_ILLADR.S +++ b/libc/sysv/consts/ILL_ILLADR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,ILL_ILLADR,3,5,3,3,3,0 +.syscon sicode,ILL_ILLADR,3,5,3,3,3,3 diff --git a/libc/sysv/consts/ILL_ILLOPC.S b/libc/sysv/consts/ILL_ILLOPC.S index f3cc6c998..9343caf39 100644 --- a/libc/sysv/consts/ILL_ILLOPC.S +++ b/libc/sysv/consts/ILL_ILLOPC.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,ILL_ILLOPC,1,1,1,1,1,0 +.syscon sicode,ILL_ILLOPC,1,1,1,1,1,1 diff --git a/libc/sysv/consts/ILL_ILLOPN.S b/libc/sysv/consts/ILL_ILLOPN.S index 802e290fe..ad757bc07 100644 --- a/libc/sysv/consts/ILL_ILLOPN.S +++ b/libc/sysv/consts/ILL_ILLOPN.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,ILL_ILLOPN,2,4,2,2,2,0 +.syscon sicode,ILL_ILLOPN,2,4,2,2,2,2 diff --git a/libc/sysv/consts/ILL_ILLTRP.S b/libc/sysv/consts/ILL_ILLTRP.S index 8dde415d1..722e291f4 100644 --- a/libc/sysv/consts/ILL_ILLTRP.S +++ b/libc/sysv/consts/ILL_ILLTRP.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,ILL_ILLTRP,4,2,4,4,4,0 +.syscon sicode,ILL_ILLTRP,4,2,4,4,4,4 diff --git a/libc/sysv/consts/ILL_PRVOPC.S b/libc/sysv/consts/ILL_PRVOPC.S index a3ea0bcc2..438b12a21 100644 --- a/libc/sysv/consts/ILL_PRVOPC.S +++ b/libc/sysv/consts/ILL_PRVOPC.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,ILL_PRVOPC,5,3,5,5,5,0 +.syscon sicode,ILL_PRVOPC,5,3,5,5,5,5 diff --git a/libc/sysv/consts/ILL_PRVREG.S b/libc/sysv/consts/ILL_PRVREG.S index c80307d9c..bfbb3b56a 100644 --- a/libc/sysv/consts/ILL_PRVREG.S +++ b/libc/sysv/consts/ILL_PRVREG.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,ILL_PRVREG,6,6,6,6,6,0 +.syscon sicode,ILL_PRVREG,6,6,6,6,6,6 diff --git a/libc/sysv/consts/IP_MINTTL.S b/libc/sysv/consts/IP_MINTTL.S index f7023af14..bb794558a 100644 --- a/libc/sysv/consts/IP_MINTTL.S +++ b/libc/sysv/consts/IP_MINTTL.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon ip,IP_MINTTL,21,0,66,0x20,0x20,0 +.syscon ip,IP_MINTTL,21,0,66,32,24,0 diff --git a/libc/sysv/consts/IP_PKTINFO.S b/libc/sysv/consts/IP_PKTINFO.S index bd9c335fa..c98e0be94 100644 --- a/libc/sysv/consts/IP_PKTINFO.S +++ b/libc/sysv/consts/IP_PKTINFO.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon ip,IP_PKTINFO,8,26,0,0,0,19 +.syscon ip,IP_PKTINFO,8,26,0,0,25,19 diff --git a/libc/sysv/consts/IP_RECVTTL.S b/libc/sysv/consts/IP_RECVTTL.S index 5dd534cf7..33267934f 100644 --- a/libc/sysv/consts/IP_RECVTTL.S +++ b/libc/sysv/consts/IP_RECVTTL.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon ip,IP_RECVTTL,12,24,65,31,31,21 +.syscon ip,IP_RECVTTL,12,24,65,31,23,21 diff --git a/libc/sysv/consts/MADV_DONTDUMP.S b/libc/sysv/consts/MADV_DONTDUMP.S index c24e42a02..feba10977 100644 --- a/libc/sysv/consts/MADV_DONTDUMP.S +++ b/libc/sysv/consts/MADV_DONTDUMP.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon madv,MADV_DONTDUMP,0x10,0,0,0,0,0 +.syscon madv,MADV_DONTDUMP,16,0,0,0,0,0 diff --git a/libc/sysv/consts/POLL_ERR.S b/libc/sysv/consts/POLL_ERR.S index 8f6024588..1c0e2ffd5 100644 --- a/libc/sysv/consts/POLL_ERR.S +++ b/libc/sysv/consts/POLL_ERR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigpoll,POLL_ERR,4,4,4,0,0,0 +.syscon sicode,POLL_ERR,4,4,4,4,4,4 diff --git a/libc/sysv/consts/POLL_HUP.S b/libc/sysv/consts/POLL_HUP.S index 5c4abccf5..514a3cef2 100644 --- a/libc/sysv/consts/POLL_HUP.S +++ b/libc/sysv/consts/POLL_HUP.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigpoll,POLL_HUP,6,6,6,0,0,0 +.syscon sicode,POLL_HUP,6,6,6,6,6,6 diff --git a/libc/sysv/consts/POLL_IN.S b/libc/sysv/consts/POLL_IN.S index edb282b17..1c2be195e 100644 --- a/libc/sysv/consts/POLL_IN.S +++ b/libc/sysv/consts/POLL_IN.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigpoll,POLL_IN,1,1,1,0,0,0 +.syscon sicode,POLL_IN,1,1,1,1,1,1 diff --git a/libc/sysv/consts/POLL_MSG.S b/libc/sysv/consts/POLL_MSG.S index 326e10ceb..acd5a6183 100644 --- a/libc/sysv/consts/POLL_MSG.S +++ b/libc/sysv/consts/POLL_MSG.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigpoll,POLL_MSG,3,3,3,0,0,0 +.syscon sicode,POLL_MSG,3,3,3,3,3,3 diff --git a/libc/sysv/consts/POLL_OUT.S b/libc/sysv/consts/POLL_OUT.S index 9aede8bb9..5b9eb0746 100644 --- a/libc/sysv/consts/POLL_OUT.S +++ b/libc/sysv/consts/POLL_OUT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigpoll,POLL_OUT,2,2,2,0,0,0 +.syscon sicode,POLL_OUT,2,2,2,2,2,2 diff --git a/libc/sysv/consts/POLL_PRI.S b/libc/sysv/consts/POLL_PRI.S index 4c8e61db9..13d080839 100644 --- a/libc/sysv/consts/POLL_PRI.S +++ b/libc/sysv/consts/POLL_PRI.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigpoll,POLL_PRI,5,5,5,0,0,0 +.syscon sicode,POLL_PRI,5,5,5,5,5,5 diff --git a/libc/sysv/consts/RLIMIT_AS.S b/libc/sysv/consts/RLIMIT_AS.S index 98cade3b7..00f1f8ea2 100644 --- a/libc/sysv/consts/RLIMIT_AS.S +++ b/libc/sysv/consts/RLIMIT_AS.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_AS,9,5,10,127,127,127 +.syscon rlimit,RLIMIT_AS,9,5,10,127,10,127 diff --git a/libc/sysv/consts/RLIMIT_CORE.S b/libc/sysv/consts/RLIMIT_CORE.S index 5901b08f7..0b70c7a64 100644 --- a/libc/sysv/consts/RLIMIT_CORE.S +++ b/libc/sysv/consts/RLIMIT_CORE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_CORE,4,4,4,4,4,127 +.syscon rlimit,RLIMIT_CORE,4,4,4,4,4,127 diff --git a/libc/sysv/consts/RLIMIT_CPU.S b/libc/sysv/consts/RLIMIT_CPU.S index 5acec12a7..3c722caf1 100644 --- a/libc/sysv/consts/RLIMIT_CPU.S +++ b/libc/sysv/consts/RLIMIT_CPU.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_CPU,0,0,0,0,0,127 +.syscon rlimit,RLIMIT_CPU,0,0,0,0,0,127 diff --git a/libc/sysv/consts/RLIMIT_DATA.S b/libc/sysv/consts/RLIMIT_DATA.S index dded0c054..492ee8dcc 100644 --- a/libc/sysv/consts/RLIMIT_DATA.S +++ b/libc/sysv/consts/RLIMIT_DATA.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_DATA,2,2,2,2,2,127 +.syscon rlimit,RLIMIT_DATA,2,2,2,2,2,127 diff --git a/libc/sysv/consts/RLIMIT_FSIZE.S b/libc/sysv/consts/RLIMIT_FSIZE.S index 8e1daa55b..1ba468e45 100644 --- a/libc/sysv/consts/RLIMIT_FSIZE.S +++ b/libc/sysv/consts/RLIMIT_FSIZE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_FSIZE,1,1,1,1,1,127 +.syscon rlimit,RLIMIT_FSIZE,1,1,1,1,1,127 diff --git a/libc/sysv/consts/RLIMIT_LOCKS.S b/libc/sysv/consts/RLIMIT_LOCKS.S index 3656d1bd6..fc4b768f1 100644 --- a/libc/sysv/consts/RLIMIT_LOCKS.S +++ b/libc/sysv/consts/RLIMIT_LOCKS.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_LOCKS,10,127,127,127,127,127 +.syscon rlimit,RLIMIT_LOCKS,10,127,127,127,127,127 diff --git a/libc/sysv/consts/RLIMIT_MEMLOCK.S b/libc/sysv/consts/RLIMIT_MEMLOCK.S index 9b7e9e9a6..1b6453b6b 100644 --- a/libc/sysv/consts/RLIMIT_MEMLOCK.S +++ b/libc/sysv/consts/RLIMIT_MEMLOCK.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_MEMLOCK,8,6,6,6,6,127 +.syscon rlimit,RLIMIT_MEMLOCK,8,6,6,6,6,127 diff --git a/libc/sysv/consts/RLIMIT_MSGQUEUE.S b/libc/sysv/consts/RLIMIT_MSGQUEUE.S index 6b5265367..5f5b72750 100644 --- a/libc/sysv/consts/RLIMIT_MSGQUEUE.S +++ b/libc/sysv/consts/RLIMIT_MSGQUEUE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_MSGQUEUE,12,127,127,127,127,127 +.syscon rlimit,RLIMIT_MSGQUEUE,12,127,127,127,127,127 diff --git a/libc/sysv/consts/RLIMIT_NICE.S b/libc/sysv/consts/RLIMIT_NICE.S index 0e023da20..96ce1be85 100644 --- a/libc/sysv/consts/RLIMIT_NICE.S +++ b/libc/sysv/consts/RLIMIT_NICE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_NICE,13,127,127,127,127,127 +.syscon rlimit,RLIMIT_NICE,13,127,127,127,127,127 diff --git a/libc/sysv/consts/RLIMIT_NLIMITS.S b/libc/sysv/consts/RLIMIT_NLIMITS.S deleted file mode 100644 index 841045785..000000000 --- a/libc/sysv/consts/RLIMIT_NLIMITS.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_NLIMITS,16,127,127,127,127,127 diff --git a/libc/sysv/consts/RLIMIT_NOFILE.S b/libc/sysv/consts/RLIMIT_NOFILE.S index 2708a6cd5..264b45dce 100644 --- a/libc/sysv/consts/RLIMIT_NOFILE.S +++ b/libc/sysv/consts/RLIMIT_NOFILE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_NOFILE,7,8,8,8,8,127 +.syscon rlimit,RLIMIT_NOFILE,7,8,8,8,8,127 diff --git a/libc/sysv/consts/RLIMIT_NPROC.S b/libc/sysv/consts/RLIMIT_NPROC.S index a4bb784eb..060763a46 100644 --- a/libc/sysv/consts/RLIMIT_NPROC.S +++ b/libc/sysv/consts/RLIMIT_NPROC.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_NPROC,6,7,7,7,7,127 +.syscon rlimit,RLIMIT_NPROC,6,7,7,7,7,127 diff --git a/libc/sysv/consts/RLIMIT_RSS.S b/libc/sysv/consts/RLIMIT_RSS.S index 2ab654e5b..552e12ba5 100644 --- a/libc/sysv/consts/RLIMIT_RSS.S +++ b/libc/sysv/consts/RLIMIT_RSS.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_RSS,5,5,5,5,5,127 +.syscon rlimit,RLIMIT_RSS,5,5,5,5,5,127 diff --git a/libc/sysv/consts/RLIMIT_RTPRIO.S b/libc/sysv/consts/RLIMIT_RTPRIO.S index c6c036385..d1b418404 100644 --- a/libc/sysv/consts/RLIMIT_RTPRIO.S +++ b/libc/sysv/consts/RLIMIT_RTPRIO.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_RTPRIO,14,127,127,127,127,127 +.syscon rlimit,RLIMIT_RTPRIO,14,127,127,127,127,127 diff --git a/libc/sysv/consts/RLIMIT_SIGPENDING.S b/libc/sysv/consts/RLIMIT_SIGPENDING.S index f3c872177..7e8014a74 100644 --- a/libc/sysv/consts/RLIMIT_SIGPENDING.S +++ b/libc/sysv/consts/RLIMIT_SIGPENDING.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_SIGPENDING,11,127,127,127,127,127 +.syscon rlimit,RLIMIT_SIGPENDING,11,127,127,127,127,127 diff --git a/libc/sysv/consts/RLIMIT_STACK.S b/libc/sysv/consts/RLIMIT_STACK.S index e4bde29ac..ca5899cad 100644 --- a/libc/sysv/consts/RLIMIT_STACK.S +++ b/libc/sysv/consts/RLIMIT_STACK.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon rlim,RLIMIT_STACK,3,3,3,3,3,127 +.syscon rlimit,RLIMIT_STACK,3,3,3,3,3,127 diff --git a/libc/sysv/consts/EBFONT.S b/libc/sysv/consts/RLIMIT_VMEM.S similarity index 50% rename from libc/sysv/consts/EBFONT.S rename to libc/sysv/consts/RLIMIT_VMEM.S index 4ddb766ff..30017ab72 100644 --- a/libc/sysv/consts/EBFONT.S +++ b/libc/sysv/consts/RLIMIT_VMEM.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon errno,EBFONT,59,0,0,0,0,0 +.syscon compat,RLIMIT_VMEM,9,5,10,127,10,127 diff --git a/libc/sysv/consts/RLIM_INFINITY.S b/libc/sysv/consts/RLIM_INFINITY.S index 9f0fbfef5..422e8ccc7 100644 --- a/libc/sysv/consts/RLIM_INFINITY.S +++ b/libc/sysv/consts/RLIM_INFINITY.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,RLIM_INFINITY,-1,0,0x7fffffffffffffff,0,0,0 +.syscon rlim,RLIM_INFINITY,0xffffffffffffffff,0x7fffffffffffffff,0x7fffffffffffffff,0x7fffffffffffffff,0x7fffffffffffffff,0 diff --git a/libc/sysv/consts/RLIM_NLIMITS.S b/libc/sysv/consts/RLIM_NLIMITS.S index 6de03aefe..ca3b0635d 100644 --- a/libc/sysv/consts/RLIM_NLIMITS.S +++ b/libc/sysv/consts/RLIM_NLIMITS.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,RLIM_NLIMITS,0x10,9,15,9,9,0 +.syscon rlim,RLIM_NLIMITS,16,9,15,9,12,0 diff --git a/libc/sysv/consts/RLIM_SAVED_CUR.S b/libc/sysv/consts/RLIM_SAVED_CUR.S index be886de01..78d294007 100644 --- a/libc/sysv/consts/RLIM_SAVED_CUR.S +++ b/libc/sysv/consts/RLIM_SAVED_CUR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,RLIM_SAVED_CUR,-1,0,0x7fffffffffffffff,0,0,0 +.syscon rlim,RLIM_SAVED_CUR,0xffffffffffffffff,0x7fffffffffffffff,0x7fffffffffffffff,0x7fffffffffffffff,0x7fffffffffffffff,0 diff --git a/libc/sysv/consts/RLIM_SAVED_MAX.S b/libc/sysv/consts/RLIM_SAVED_MAX.S index 312626bed..67b4fc5d6 100644 --- a/libc/sysv/consts/RLIM_SAVED_MAX.S +++ b/libc/sysv/consts/RLIM_SAVED_MAX.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,RLIM_SAVED_MAX,-1,0,0x7fffffffffffffff,0,0,0 +.syscon rlim,RLIM_SAVED_MAX,0xffffffffffffffff,0x7fffffffffffffff,0x7fffffffffffffff,0x7fffffffffffffff,0x7fffffffffffffff,0 diff --git a/libc/sysv/consts/SA_NOCLDSTOP.S b/libc/sysv/consts/SA_NOCLDSTOP.S index b31167ec4..01f482ea8 100644 --- a/libc/sysv/consts/SA_NOCLDSTOP.S +++ b/libc/sysv/consts/SA_NOCLDSTOP.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigact,SA_NOCLDSTOP,1,8,8,8,8,0 +.syscon sigact,SA_NOCLDSTOP,1,8,8,8,8,1 diff --git a/libc/sysv/consts/SA_NOCLDWAIT.S b/libc/sysv/consts/SA_NOCLDWAIT.S index 71708bee5..921c1c347 100644 --- a/libc/sysv/consts/SA_NOCLDWAIT.S +++ b/libc/sysv/consts/SA_NOCLDWAIT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigact,SA_NOCLDWAIT,2,0x20,0x20,0x20,0x20,0 +.syscon sigact,SA_NOCLDWAIT,2,32,32,32,32,2 diff --git a/libc/sysv/consts/SA_NODEFER.S b/libc/sysv/consts/SA_NODEFER.S index e6da9b8d5..785678705 100644 --- a/libc/sysv/consts/SA_NODEFER.S +++ b/libc/sysv/consts/SA_NODEFER.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigact,SA_NODEFER,0x40000000,0x10,0x10,0x10,0x10,0 +.syscon sigact,SA_NODEFER,0x40000000,16,16,16,16,0x40000000 diff --git a/libc/sysv/consts/SA_NOMASK.S b/libc/sysv/consts/SA_NOMASK.S index f3ebc2b4c..77d364345 100644 --- a/libc/sysv/consts/SA_NOMASK.S +++ b/libc/sysv/consts/SA_NOMASK.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigact,SA_NOMASK,0x40000000,0x10,0x10,0x10,0x10,0 +.syscon compat,SA_NOMASK,0x40000000,16,16,16,16,0x40000000 diff --git a/libc/sysv/consts/SA_ONESHOT.S b/libc/sysv/consts/SA_ONESHOT.S index b408be2c0..f719357fc 100644 --- a/libc/sysv/consts/SA_ONESHOT.S +++ b/libc/sysv/consts/SA_ONESHOT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigact,SA_ONESHOT,0x80000000,0,0,0,0,0 +.syscon compat,SA_ONESHOT,0x80000000,4,4,4,4,0x80000000 diff --git a/libc/sysv/consts/SA_ONSTACK.S b/libc/sysv/consts/SA_ONSTACK.S index 7c461f57b..10237f767 100644 --- a/libc/sysv/consts/SA_ONSTACK.S +++ b/libc/sysv/consts/SA_ONSTACK.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigact,SA_ONSTACK,0x08000000,1,1,1,1,0 +.syscon sigact,SA_ONSTACK,0x08000000,1,1,1,1,0x08000000 diff --git a/libc/sysv/consts/SA_RESETHAND.S b/libc/sysv/consts/SA_RESETHAND.S index 9c697d4a8..57447ed2e 100644 --- a/libc/sysv/consts/SA_RESETHAND.S +++ b/libc/sysv/consts/SA_RESETHAND.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigact,SA_RESETHAND,0x80000000,4,4,4,4,0 +.syscon sigact,SA_RESETHAND,0x80000000,4,4,4,4,0x80000000 diff --git a/libc/sysv/consts/SA_RESTART.S b/libc/sysv/consts/SA_RESTART.S index 0f36b4a49..4d55eea7e 100644 --- a/libc/sysv/consts/SA_RESTART.S +++ b/libc/sysv/consts/SA_RESTART.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigact,SA_RESTART,0x10000000,2,2,2,2,0 +.syscon sigact,SA_RESTART,0x10000000,2,2,2,2,0x10000000 diff --git a/libc/sysv/consts/SA_RESTORER.S b/libc/sysv/consts/SA_RESTORER.S deleted file mode 100644 index 7f9491980..000000000 --- a/libc/sysv/consts/SA_RESTORER.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon sigact,SA_RESTORER,0x04000000,0,0,0,0,0 diff --git a/libc/sysv/consts/SA_SIGINFO.S b/libc/sysv/consts/SA_SIGINFO.S index 4f1b53071..46ca4be61 100644 --- a/libc/sysv/consts/SA_SIGINFO.S +++ b/libc/sysv/consts/SA_SIGINFO.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sigact,SA_SIGINFO,4,0x40,0x40,0x40,0x40,0 +.syscon sigact,SA_SIGINFO,4,64,64,64,64,4 diff --git a/libc/sysv/consts/SEGV_ACCERR.S b/libc/sysv/consts/SEGV_ACCERR.S index cc37aade6..bafc738d8 100644 --- a/libc/sysv/consts/SEGV_ACCERR.S +++ b/libc/sysv/consts/SEGV_ACCERR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,SEGV_ACCERR,2,2,2,2,2,0 +.syscon sicode,SEGV_ACCERR,2,2,2,2,2,2 diff --git a/libc/sysv/consts/SEGV_MAPERR.S b/libc/sysv/consts/SEGV_MAPERR.S index f6025fdd4..3f77bd82c 100644 --- a/libc/sysv/consts/SEGV_MAPERR.S +++ b/libc/sysv/consts/SEGV_MAPERR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,SEGV_MAPERR,1,1,1,1,1,0 +.syscon sicode,SEGV_MAPERR,1,1,1,1,1,1 diff --git a/libc/sysv/consts/SIGIOT.S b/libc/sysv/consts/SIGIOT.S index b8c19047f..0da16e1b9 100644 --- a/libc/sysv/consts/SIGIOT.S +++ b/libc/sysv/consts/SIGIOT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sig,SIGIOT,6,6,6,6,6,6 +.syscon compat,SIGIOT,6,6,6,6,6,6 diff --git a/libc/sysv/consts/SIGPOLL.S b/libc/sysv/consts/SIGPOLL.S index 1bdcef26a..9fc61e573 100644 --- a/libc/sysv/consts/SIGPOLL.S +++ b/libc/sysv/consts/SIGPOLL.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sig,SIGPOLL,29,0,0,0,0,29 +.syscon compat,SIGPOLL,29,23,23,23,23,29 diff --git a/libc/sysv/consts/SIGPWR.S b/libc/sysv/consts/SIGPWR.S index 0adb12f32..5d15017a3 100644 --- a/libc/sysv/consts/SIGPWR.S +++ b/libc/sysv/consts/SIGPWR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sig,SIGPWR,30,0,0,0,32,30 +.syscon compat,SIGPWR,30,30,30,30,32,30 diff --git a/libc/sysv/consts/SIGSTKFLT.S b/libc/sysv/consts/SIGSTKFLT.S deleted file mode 100644 index 7c26a6b74..000000000 --- a/libc/sysv/consts/SIGSTKFLT.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon sig,SIGSTKFLT,0x10,0,0,0,0,0x10 diff --git a/libc/sysv/consts/SIGSTKSZ.S b/libc/sysv/consts/SIGSTKSZ.S index 652bf9c05..1a557a4b5 100644 --- a/libc/sysv/consts/SIGSTKSZ.S +++ b/libc/sysv/consts/SIGSTKSZ.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sig,SIGSTKSZ,0x2000,0x020000,0x8800,0x7000,0x7000,0x2000 +.syscon ss,SIGSTKSZ,0x2000,0x020000,0x8800,0x7000,0x7000,0x2000 diff --git a/libc/sysv/consts/SIGUNUSED.S b/libc/sysv/consts/SIGUNUSED.S deleted file mode 100644 index 9ef68febf..000000000 --- a/libc/sysv/consts/SIGUNUSED.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon sig,SIGUNUSED,31,0,0,0,0,31 diff --git a/libc/sysv/consts/SIGURG.S b/libc/sysv/consts/SIGURG.S index a9c7cc2e1..9dbe9cb7e 100644 --- a/libc/sysv/consts/SIGURG.S +++ b/libc/sysv/consts/SIGURG.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon sig,SIGURG,23,0x10,0x10,0x10,0x10,23 +.syscon sig,SIGURG,23,16,16,16,16,23 diff --git a/libc/sysv/consts/SI_ASYNCIO.S b/libc/sysv/consts/SI_ASYNCIO.S index d2782fb59..bc1cfc07d 100644 --- a/libc/sysv/consts/SI_ASYNCIO.S +++ b/libc/sysv/consts/SI_ASYNCIO.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,SI_ASYNCIO,-4,0x010004,0x010004,0,0,0 +.syscon sicode,SI_ASYNCIO,-4,0x010004,0x010004,0x80000000,-3,-4 diff --git a/libc/sysv/consts/SI_ASYNCNL.S b/libc/sysv/consts/SI_ASYNCNL.S index b6c952205..090ab2518 100644 --- a/libc/sysv/consts/SI_ASYNCNL.S +++ b/libc/sysv/consts/SI_ASYNCNL.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,SI_ASYNCNL,-60,0,0,0,0,0 +.syscon sicode,SI_ASYNCNL,-60,0x80000000,0x80000000,0x80000000,0x80000000,0x80000000 diff --git a/libc/sysv/consts/SI_KERNEL.S b/libc/sysv/consts/SI_KERNEL.S index db6a4ca4c..63c917744 100644 --- a/libc/sysv/consts/SI_KERNEL.S +++ b/libc/sysv/consts/SI_KERNEL.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,SI_KERNEL,0x80,0,0x010006,0,0,0 +.syscon sicode,SI_KERNEL,0x80,0x80000000,0x010006,0x80000000,0x80000000,0x80 diff --git a/libc/sysv/consts/SI_LOAD_SHIFT.S b/libc/sysv/consts/SI_LOAD_SHIFT.S deleted file mode 100644 index 1efc6e161..000000000 --- a/libc/sysv/consts/SI_LOAD_SHIFT.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon misc,SI_LOAD_SHIFT,0x10,0,0,0,0,0 diff --git a/libc/sysv/consts/SI_MESGQ.S b/libc/sysv/consts/SI_MESGQ.S index b6e439c31..7021509b3 100644 --- a/libc/sysv/consts/SI_MESGQ.S +++ b/libc/sysv/consts/SI_MESGQ.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,SI_MESGQ,-3,0x010005,0x010005,0,0,0 +.syscon sicode,SI_MESGQ,-3,0x010005,0x010005,0x80000000,-4,-3 diff --git a/libc/sysv/consts/SI_NOINFO.S b/libc/sysv/consts/SI_NOINFO.S new file mode 100644 index 000000000..be65136ff --- /dev/null +++ b/libc/sysv/consts/SI_NOINFO.S @@ -0,0 +1,2 @@ +#include "libc/sysv/consts/syscon.internal.h" +.syscon sicode,SI_NOINFO,32767,0x80000000,0,32767,32767,32767 diff --git a/libc/sysv/consts/SI_QUEUE.S b/libc/sysv/consts/SI_QUEUE.S index ec9ce4e06..2379cf591 100644 --- a/libc/sysv/consts/SI_QUEUE.S +++ b/libc/sysv/consts/SI_QUEUE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,SI_QUEUE,-1,0x010002,0x010002,-2,-2,0 +.syscon sicode,SI_QUEUE,-1,0x010002,0x010002,-2,-1,-1 diff --git a/libc/sysv/consts/SI_SIGIO.S b/libc/sysv/consts/SI_SIGIO.S deleted file mode 100644 index 6f9717af5..000000000 --- a/libc/sysv/consts/SI_SIGIO.S +++ /dev/null @@ -1,2 +0,0 @@ -#include "libc/sysv/consts/syscon.internal.h" -.syscon misc,SI_SIGIO,-5,0,0,0,0,0 diff --git a/libc/sysv/consts/SI_TIMER.S b/libc/sysv/consts/SI_TIMER.S index 64c46cd1a..bd9120da4 100644 --- a/libc/sysv/consts/SI_TIMER.S +++ b/libc/sysv/consts/SI_TIMER.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,SI_TIMER,-2,0x010003,0x010003,-3,-3,0 +.syscon sicode,SI_TIMER,-2,0x010003,0x010003,-3,-2,-2 diff --git a/libc/sysv/consts/SI_TKILL.S b/libc/sysv/consts/SI_TKILL.S index 6f59973a4..b9802a707 100644 --- a/libc/sysv/consts/SI_TKILL.S +++ b/libc/sysv/consts/SI_TKILL.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,SI_TKILL,-6,0,0,0,0,0 +.syscon sicode,SI_TKILL,-6,0x80000000,0x010007,-1,-5,-6 diff --git a/libc/sysv/consts/SI_USER.S b/libc/sysv/consts/SI_USER.S index d97a740b4..ffc2deea0 100644 --- a/libc/sysv/consts/SI_USER.S +++ b/libc/sysv/consts/SI_USER.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,SI_USER,0,0x010001,0x010001,0,0,0 +.syscon sicode,SI_USER,0,0x010001,0x010001,0,0,0 diff --git a/libc/sysv/consts/S_IEXEC.S b/libc/sysv/consts/S_IEXEC.S index 5e8189256..cec133e38 100644 --- a/libc/sysv/consts/S_IEXEC.S +++ b/libc/sysv/consts/S_IEXEC.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IEXEC,00100,00100,00100,00100,00100,00100 +.syscon stat,S_IEXEC,0000100,0000100,0000100,0000100,0000100,0000100 diff --git a/libc/sysv/consts/S_IREAD.S b/libc/sysv/consts/S_IREAD.S index d42eeedff..5e0bee1c4 100644 --- a/libc/sysv/consts/S_IREAD.S +++ b/libc/sysv/consts/S_IREAD.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IREAD,00400,00400,00400,00400,00400,00400 +.syscon stat,S_IREAD,0000400,0000400,0000400,0000400,0000400,0000400 diff --git a/libc/sysv/consts/S_IRGRP.S b/libc/sysv/consts/S_IRGRP.S index d29b91cae..ad9f3a6f8 100644 --- a/libc/sysv/consts/S_IRGRP.S +++ b/libc/sysv/consts/S_IRGRP.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IRGRP,00040,00040,00040,00040,00040,00040 +.syscon stat,S_IRGRP,0000040,0000040,0000040,0000040,0000040,0000040 diff --git a/libc/sysv/consts/S_IROTH.S b/libc/sysv/consts/S_IROTH.S index 1492a931b..6179fbf38 100644 --- a/libc/sysv/consts/S_IROTH.S +++ b/libc/sysv/consts/S_IROTH.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IROTH,00004,00004,00004,00004,00004,00004 +.syscon stat,S_IROTH,0000004,0000004,0000004,0000004,0000004,0000004 diff --git a/libc/sysv/consts/S_IRUSR.S b/libc/sysv/consts/S_IRUSR.S index 69802c4cf..7720d0f60 100644 --- a/libc/sysv/consts/S_IRUSR.S +++ b/libc/sysv/consts/S_IRUSR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IRUSR,00400,00400,00400,00400,00400,00400 +.syscon stat,S_IRUSR,0000400,0000400,0000400,0000400,0000400,0000400 diff --git a/libc/sysv/consts/S_IRWXG.S b/libc/sysv/consts/S_IRWXG.S index dd2f6f755..e35589566 100644 --- a/libc/sysv/consts/S_IRWXG.S +++ b/libc/sysv/consts/S_IRWXG.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IRWXG,00070,00070,00070,00070,00070,00070 +.syscon stat,S_IRWXG,0000070,0000070,0000070,0000070,0000070,0000070 diff --git a/libc/sysv/consts/S_IRWXO.S b/libc/sysv/consts/S_IRWXO.S index 17fb95261..c9a4db418 100644 --- a/libc/sysv/consts/S_IRWXO.S +++ b/libc/sysv/consts/S_IRWXO.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IRWXO,00007,00007,00007,00007,00007,00007 +.syscon stat,S_IRWXO,0000007,0000007,0000007,0000007,0000007,0000007 diff --git a/libc/sysv/consts/S_IRWXU.S b/libc/sysv/consts/S_IRWXU.S index 3be366d68..3a291a499 100644 --- a/libc/sysv/consts/S_IRWXU.S +++ b/libc/sysv/consts/S_IRWXU.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IRWXU,00700,00700,00700,00700,00700,00700 +.syscon stat,S_IRWXU,0000700,0000700,0000700,0000700,0000700,0000700 diff --git a/libc/sysv/consts/S_ISGID.S b/libc/sysv/consts/S_ISGID.S index 3b5294408..108508726 100644 --- a/libc/sysv/consts/S_ISGID.S +++ b/libc/sysv/consts/S_ISGID.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_ISGID,02000,02000,02000,02000,02000,02000 +.syscon stat,S_ISGID,0002000,0002000,0002000,0002000,0002000,0002000 diff --git a/libc/sysv/consts/S_ISUID.S b/libc/sysv/consts/S_ISUID.S index 796799484..170183946 100644 --- a/libc/sysv/consts/S_ISUID.S +++ b/libc/sysv/consts/S_ISUID.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_ISUID,04000,04000,04000,04000,04000,04000 +.syscon stat,S_ISUID,0004000,0004000,0004000,0004000,0004000,0004000 diff --git a/libc/sysv/consts/S_ISVTX.S b/libc/sysv/consts/S_ISVTX.S index 5f1251d1c..33636aff5 100644 --- a/libc/sysv/consts/S_ISVTX.S +++ b/libc/sysv/consts/S_ISVTX.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_ISVTX,01000,01000,01000,01000,01000,01000 +.syscon stat,S_ISVTX,0001000,0001000,0001000,0001000,0001000,0001000 diff --git a/libc/sysv/consts/S_IWGRP.S b/libc/sysv/consts/S_IWGRP.S index 22defc1eb..27dd51e4c 100644 --- a/libc/sysv/consts/S_IWGRP.S +++ b/libc/sysv/consts/S_IWGRP.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IWGRP,00020,00020,00020,00020,00020,00020 +.syscon stat,S_IWGRP,0000020,0000020,0000020,0000020,0000020,0000020 diff --git a/libc/sysv/consts/S_IWOTH.S b/libc/sysv/consts/S_IWOTH.S index c760e0098..61e7b7ae8 100644 --- a/libc/sysv/consts/S_IWOTH.S +++ b/libc/sysv/consts/S_IWOTH.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IWOTH,00002,00002,00002,00002,00002,00002 +.syscon stat,S_IWOTH,0000002,0000002,0000002,0000002,0000002,0000002 diff --git a/libc/sysv/consts/S_IWRITE.S b/libc/sysv/consts/S_IWRITE.S index 9663e1a6f..df2360188 100644 --- a/libc/sysv/consts/S_IWRITE.S +++ b/libc/sysv/consts/S_IWRITE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IWRITE,00200,00200,00200,00200,00200,00200 +.syscon stat,S_IWRITE,0000200,0000200,0000200,0000200,0000200,0000200 diff --git a/libc/sysv/consts/S_IWUSR.S b/libc/sysv/consts/S_IWUSR.S index e6493ff0b..7df8df706 100644 --- a/libc/sysv/consts/S_IWUSR.S +++ b/libc/sysv/consts/S_IWUSR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IWUSR,00200,00200,00200,00200,00200,00200 +.syscon stat,S_IWUSR,0000200,0000200,0000200,0000200,0000200,0000200 diff --git a/libc/sysv/consts/S_IXGRP.S b/libc/sysv/consts/S_IXGRP.S index 9db4c424b..f23c82907 100644 --- a/libc/sysv/consts/S_IXGRP.S +++ b/libc/sysv/consts/S_IXGRP.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IXGRP,00010,00010,00010,00010,00010,00010 +.syscon stat,S_IXGRP,0000010,0000010,0000010,0000010,0000010,0000010 diff --git a/libc/sysv/consts/S_IXOTH.S b/libc/sysv/consts/S_IXOTH.S index 74329aeef..ff3cc2474 100644 --- a/libc/sysv/consts/S_IXOTH.S +++ b/libc/sysv/consts/S_IXOTH.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IXOTH,00001,00001,00001,00001,00001,00001 +.syscon stat,S_IXOTH,0000001,0000001,0000001,0000001,0000001,0000001 diff --git a/libc/sysv/consts/S_IXUSR.S b/libc/sysv/consts/S_IXUSR.S index d91c11525..fb7f231b5 100644 --- a/libc/sysv/consts/S_IXUSR.S +++ b/libc/sysv/consts/S_IXUSR.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon stat,S_IXUSR,00100,00100,00100,00100,00100,00100 +.syscon stat,S_IXUSR,0000100,0000100,0000100,0000100,0000100,0000100 diff --git a/libc/sysv/consts/TCP_CORK.S b/libc/sysv/consts/TCP_CORK.S index 4417f680c..3e6680f52 100644 --- a/libc/sysv/consts/TCP_CORK.S +++ b/libc/sysv/consts/TCP_CORK.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon tcp,TCP_CORK,3,0,0,0,0,0 +.syscon tcp,TCP_CORK,3,4,4,16,0,0 diff --git a/libc/sysv/consts/TCP_FASTOPEN.S b/libc/sysv/consts/TCP_FASTOPEN.S index 952b696e2..bd09464a0 100644 --- a/libc/sysv/consts/TCP_FASTOPEN.S +++ b/libc/sysv/consts/TCP_FASTOPEN.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon tcp,TCP_FASTOPEN,23,261,0x0401,0,0,15 +.syscon tcp,TCP_FASTOPEN,23,0,0x0401,0,0,15 diff --git a/libc/sysv/consts/TCP_INFO.S b/libc/sysv/consts/TCP_INFO.S index c0b172dfd..ae9301339 100644 --- a/libc/sysv/consts/TCP_INFO.S +++ b/libc/sysv/consts/TCP_INFO.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon tcp,TCP_INFO,11,0,0x20,0,0,0 +.syscon tcp,TCP_INFO,11,0,0x20,0,9,0 diff --git a/libc/sysv/consts/TCP_KEEPCNT.S b/libc/sysv/consts/TCP_KEEPCNT.S index 007b3fbfc..7e5fdfdd2 100644 --- a/libc/sysv/consts/TCP_KEEPCNT.S +++ b/libc/sysv/consts/TCP_KEEPCNT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon tcp,TCP_KEEPCNT,6,0x102,0x400,0,0,0 +.syscon tcp,TCP_KEEPCNT,6,0x102,0x400,0,6,0 diff --git a/libc/sysv/consts/TCP_KEEPIDLE.S b/libc/sysv/consts/TCP_KEEPIDLE.S index 567b07630..caf87a920 100644 --- a/libc/sysv/consts/TCP_KEEPIDLE.S +++ b/libc/sysv/consts/TCP_KEEPIDLE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon tcp,TCP_KEEPIDLE,4,0,0x100,0,0,0 +.syscon tcp,TCP_KEEPIDLE,4,0,0x100,0,3,0 diff --git a/libc/sysv/consts/TCP_KEEPINTVL.S b/libc/sysv/consts/TCP_KEEPINTVL.S index 9896d8a4b..47bff5307 100644 --- a/libc/sysv/consts/TCP_KEEPINTVL.S +++ b/libc/sysv/consts/TCP_KEEPINTVL.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon tcp,TCP_KEEPINTVL,5,0x101,0x200,0,0,0 +.syscon tcp,TCP_KEEPINTVL,5,0x101,0x200,0,5,0 diff --git a/libc/sysv/consts/TCP_MD5SIG.S b/libc/sysv/consts/TCP_MD5SIG.S index ef90a99fb..3adf7712f 100644 --- a/libc/sysv/consts/TCP_MD5SIG.S +++ b/libc/sysv/consts/TCP_MD5SIG.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon tcp,TCP_MD5SIG,14,0,0x10,4,4,0 +.syscon tcp,TCP_MD5SIG,14,0,0x10,4,16,0 diff --git a/libc/sysv/consts/TRAP_BRKPT.S b/libc/sysv/consts/TRAP_BRKPT.S index 3dc73994e..a2a5e7b4d 100644 --- a/libc/sysv/consts/TRAP_BRKPT.S +++ b/libc/sysv/consts/TRAP_BRKPT.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,TRAP_BRKPT,1,1,1,1,1,0 +.syscon sicode,TRAP_BRKPT,1,1,1,1,1,1 diff --git a/libc/sysv/consts/TRAP_TRACE.S b/libc/sysv/consts/TRAP_TRACE.S index a2b0c356c..1daca2f96 100644 --- a/libc/sysv/consts/TRAP_TRACE.S +++ b/libc/sysv/consts/TRAP_TRACE.S @@ -1,2 +1,2 @@ #include "libc/sysv/consts/syscon.internal.h" -.syscon misc,TRAP_TRACE,2,2,2,2,2,0 +.syscon sicode,TRAP_TRACE,2,2,2,2,2,2 diff --git a/libc/sysv/consts/bus.h b/libc/sysv/consts/bus.h deleted file mode 100644 index e6f9dddac..000000000 --- a/libc/sysv/consts/bus.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_BUS_H_ -#define COSMOPOLITAN_LIBC_SYSV_CONSTS_BUS_H_ -#include "libc/runtime/symbolic.h" - -#define BUS_ADRALN SYMBOLIC(BUS_ADRALN) -#define BUS_ADRERR SYMBOLIC(BUS_ADRERR) -#define BUS_DEVICE_RESET SYMBOLIC(BUS_DEVICE_RESET) -#define BUS_MCEERR_AO SYMBOLIC(BUS_MCEERR_AO) -#define BUS_MCEERR_AR SYMBOLIC(BUS_MCEERR_AR) -#define BUS_OBJERR SYMBOLIC(BUS_OBJERR) - -#if !(__ASSEMBLER__ + __LINKER__ + 0) -COSMOPOLITAN_C_START_ - -extern const long BUS_ADRALN; -extern const long BUS_ADRERR; -extern const long BUS_DEVICE_RESET; -extern const long BUS_MCEERR_AO; -extern const long BUS_MCEERR_AR; -extern const long BUS_OBJERR; - -COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ -#endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_BUS_H_ */ diff --git a/libc/sysv/consts/c.h b/libc/sysv/consts/c.h index 8af5c1f3a..3deaf26de 100644 --- a/libc/sysv/consts/c.h +++ b/libc/sysv/consts/c.h @@ -1,52 +1,25 @@ -#ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_C_H_ -#define COSMOPOLITAN_LIBC_SYSV_CONSTS_C_H_ -#include "libc/runtime/symbolic.h" +#ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_CPIO_H_ +#define COSMOPOLITAN_LIBC_SYSV_CONSTS_CPIO_H_ -#define C_IRGRP SYMBOLIC(C_IRGRP) -#define C_IROTH SYMBOLIC(C_IROTH) -#define C_IRUSR SYMBOLIC(C_IRUSR) -#define C_ISBLK SYMBOLIC(C_ISBLK) -#define C_ISCHR SYMBOLIC(C_ISCHR) -#define C_ISCTG SYMBOLIC(C_ISCTG) -#define C_ISDIR SYMBOLIC(C_ISDIR) -#define C_ISFIFO SYMBOLIC(C_ISFIFO) -#define C_ISGID SYMBOLIC(C_ISGID) -#define C_ISLNK SYMBOLIC(C_ISLNK) -#define C_ISREG SYMBOLIC(C_ISREG) -#define C_ISSOCK SYMBOLIC(C_ISSOCK) -#define C_ISUID SYMBOLIC(C_ISUID) -#define C_ISVTX SYMBOLIC(C_ISVTX) -#define C_IWGRP SYMBOLIC(C_IWGRP) -#define C_IWOTH SYMBOLIC(C_IWOTH) -#define C_IWUSR SYMBOLIC(C_IWUSR) -#define C_IXGRP SYMBOLIC(C_IXGRP) -#define C_IXOTH SYMBOLIC(C_IXOTH) -#define C_IXUSR SYMBOLIC(C_IXUSR) +#define C_IXOTH 0000001 +#define C_IWOTH 0000002 +#define C_IROTH 0000004 +#define C_IXGRP 0000010 +#define C_IWGRP 0000020 +#define C_IRGRP 0000040 +#define C_IXUSR 0000100 +#define C_IWUSR 0000200 +#define C_IRUSR 0000400 +#define C_ISVTX 0001000 +#define C_ISGID 0002000 +#define C_ISUID 0004000 +#define C_ISFIFO 0010000 +#define C_ISCHR 0020000 +#define C_ISDIR 0040000 +#define C_ISBLK 0060000 +#define C_ISREG 0100000 +#define C_ISCTG 0110000 +#define C_ISLNK 0120000 +#define C_ISSOCK 0140000 -#if !(__ASSEMBLER__ + __LINKER__ + 0) -COSMOPOLITAN_C_START_ - -extern const long C_IRGRP; -extern const long C_IROTH; -extern const long C_IRUSR; -extern const long C_ISBLK; -extern const long C_ISCHR; -extern const long C_ISCTG; -extern const long C_ISDIR; -extern const long C_ISFIFO; -extern const long C_ISGID; -extern const long C_ISLNK; -extern const long C_ISREG; -extern const long C_ISSOCK; -extern const long C_ISUID; -extern const long C_ISVTX; -extern const long C_IWGRP; -extern const long C_IWOTH; -extern const long C_IWUSR; -extern const long C_IXGRP; -extern const long C_IXOTH; -extern const long C_IXUSR; - -COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ -#endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_C_H_ */ +#endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_CPIO_H_ */ diff --git a/libc/sysv/consts/cld.h b/libc/sysv/consts/cld.h deleted file mode 100644 index 9dd866ea9..000000000 --- a/libc/sysv/consts/cld.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_CLD_H_ -#define COSMOPOLITAN_LIBC_SYSV_CONSTS_CLD_H_ - -#define CLD_CONTINUED 6 -#define CLD_DUMPED 3 -#define CLD_EXITED 1 -#define CLD_KILLED 2 -#define CLD_STOPPED 5 -#define CLD_TRAPPED 4 - -#endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_CLD_H_ */ diff --git a/libc/sysv/consts/ill.h b/libc/sysv/consts/ill.h deleted file mode 100644 index 141f3e391..000000000 --- a/libc/sysv/consts/ill.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_ILL_H_ -#define COSMOPOLITAN_LIBC_SYSV_CONSTS_ILL_H_ -#include "libc/runtime/symbolic.h" - -#define ILL_BADSTK SYMBOLIC(ILL_BADSTK) -#define ILL_COPROC SYMBOLIC(ILL_COPROC) -#define ILL_ILLADR SYMBOLIC(ILL_ILLADR) -#define ILL_ILLOPC SYMBOLIC(ILL_ILLOPC) -#define ILL_ILLOPN SYMBOLIC(ILL_ILLOPN) -#define ILL_ILLTRP SYMBOLIC(ILL_ILLTRP) -#define ILL_PRVOPC SYMBOLIC(ILL_PRVOPC) -#define ILL_PRVREG SYMBOLIC(ILL_PRVREG) - -#if !(__ASSEMBLER__ + __LINKER__ + 0) -COSMOPOLITAN_C_START_ - -extern const long ILL_BADSTK; -extern const long ILL_COPROC; -extern const long ILL_ILLADR; -extern const long ILL_ILLOPC; -extern const long ILL_ILLOPN; -extern const long ILL_ILLTRP; -extern const long ILL_PRVOPC; -extern const long ILL_PRVREG; - -COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ -#endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_ILL_H_ */ diff --git a/libc/sysv/consts/rlimit.h b/libc/sysv/consts/rlimit.h index 1ab7163ac..c847974e4 100644 --- a/libc/sysv/consts/rlimit.h +++ b/libc/sysv/consts/rlimit.h @@ -2,22 +2,22 @@ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_RLIMIT_H_ #include "libc/runtime/symbolic.h" -#define RLIMIT_AS SYMBOLIC(RLIMIT_AS) -#define RLIMIT_CORE SYMBOLIC(RLIMIT_CORE) -#define RLIMIT_CPU SYMBOLIC(RLIMIT_CPU) -#define RLIMIT_DATA SYMBOLIC(RLIMIT_DATA) -#define RLIMIT_FSIZE SYMBOLIC(RLIMIT_FSIZE) -#define RLIMIT_LOCKS SYMBOLIC(RLIMIT_LOCKS) -#define RLIMIT_MEMLOCK SYMBOLIC(RLIMIT_MEMLOCK) -#define RLIMIT_MSGQUEUE SYMBOLIC(RLIMIT_MSGQUEUE) -#define RLIMIT_NICE SYMBOLIC(RLIMIT_NICE) -#define RLIMIT_NLIMITS SYMBOLIC(RLIMIT_NLIMITS) -#define RLIMIT_NOFILE SYMBOLIC(RLIMIT_NOFILE) -#define RLIMIT_NPROC SYMBOLIC(RLIMIT_NPROC) -#define RLIMIT_RSS SYMBOLIC(RLIMIT_RSS) -#define RLIMIT_RTPRIO SYMBOLIC(RLIMIT_RTPRIO) +#define RLIMIT_AS SYMBOLIC(RLIMIT_AS) +#define RLIMIT_CORE SYMBOLIC(RLIMIT_CORE) +#define RLIMIT_CPU SYMBOLIC(RLIMIT_CPU) +#define RLIMIT_DATA SYMBOLIC(RLIMIT_DATA) +#define RLIMIT_FSIZE SYMBOLIC(RLIMIT_FSIZE) +#define RLIMIT_LOCKS SYMBOLIC(RLIMIT_LOCKS) +#define RLIMIT_MEMLOCK SYMBOLIC(RLIMIT_MEMLOCK) +#define RLIMIT_MSGQUEUE SYMBOLIC(RLIMIT_MSGQUEUE) +#define RLIMIT_NICE SYMBOLIC(RLIMIT_NICE) +#define RLIMIT_NOFILE SYMBOLIC(RLIMIT_NOFILE) +#define RLIMIT_NPROC SYMBOLIC(RLIMIT_NPROC) +#define RLIMIT_RSS SYMBOLIC(RLIMIT_RSS) +#define RLIMIT_RTPRIO SYMBOLIC(RLIMIT_RTPRIO) #define RLIMIT_SIGPENDING SYMBOLIC(RLIMIT_SIGPENDING) -#define RLIMIT_STACK SYMBOLIC(RLIMIT_STACK) +#define RLIMIT_STACK SYMBOLIC(RLIMIT_STACK) +#define RLIMIT_VMEM SYMBOLIC(RLIMIT_VMEM) #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ @@ -31,13 +31,13 @@ extern const long RLIMIT_LOCKS; extern const long RLIMIT_MEMLOCK; extern const long RLIMIT_MSGQUEUE; extern const long RLIMIT_NICE; -extern const long RLIMIT_NLIMITS; extern const long RLIMIT_NOFILE; extern const long RLIMIT_NPROC; extern const long RLIMIT_RSS; extern const long RLIMIT_RTPRIO; extern const long RLIMIT_SIGPENDING; extern const long RLIMIT_STACK; +extern const long RLIMIT_VMEM; COSMOPOLITAN_C_END_ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ diff --git a/libc/sysv/consts/s.h b/libc/sysv/consts/s.h index e1ac2f0c2..07b2ae6bc 100644 --- a/libc/sysv/consts/s.h +++ b/libc/sysv/consts/s.h @@ -1,64 +1,32 @@ #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_S_H_ #define COSMOPOLITAN_LIBC_SYSV_CONSTS_S_H_ -#include "libc/runtime/symbolic.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) -COSMOPOLITAN_C_START_ -extern const long S_IEXEC; -extern const long S_IFBLK; -extern const long S_IFCHR; -extern const long S_IFDIR; -extern const long S_IFIFO; -extern const long S_IFLNK; -extern const long S_IFMT; -extern const long S_IFREG; -extern const long S_IFSOCK; -extern const long S_IREAD; -extern const long S_IRGRP; -extern const long S_IROTH; -extern const long S_IRUSR; -extern const long S_IRWXG; -extern const long S_IRWXO; -extern const long S_IRWXU; -extern const long S_ISGID; -extern const long S_ISUID; -extern const long S_ISVTX; -extern const long S_IWGRP; -extern const long S_IWOTH; -extern const long S_IWRITE; -extern const long S_IWUSR; -extern const long S_IXGRP; -extern const long S_IXOTH; -extern const long S_IXUSR; +#define S_ISVTX 01000 /* THE STICKY BIT */ +#define S_ISGID 02000 /* the setgid bit */ +#define S_ISUID 04000 /* the setuid bit */ +#define S_IXUSR 00100 /* user --x; just use octal */ +#define S_IWUSR 00200 /* user -w-; just use octal */ +#define S_IRUSR 00400 /* user r--; just use octal */ +#define S_IRWXU 00700 /* user rwx; just use octal */ +#define S_IXGRP 00010 /* group --x; just use octal */ +#define S_IWGRP 00020 /* group -w-; just use octal */ +#define S_IRGRP 00040 /* group r--; just use octal */ +#define S_IRWXG 00070 /* group rwx; just use octal */ +#define S_IXOTH 00001 /* other --x; just use octal */ +#define S_IWOTH 00002 /* other -w-; just use octal */ +#define S_IROTH 00004 /* other r--; just use octal */ +#define S_IRWXO 00007 /* other rwx; just use octal */ +#define S_IREAD 00400 /* just use octal */ +#define S_IEXEC 00100 /* just use octal */ +#define S_IWRITE 00200 /* just use octal */ -COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ - -#define S_IFREG LITERALLY(0100000) -#define S_IFBLK LITERALLY(0060000) -#define S_IFCHR LITERALLY(0020000) -#define S_IFDIR LITERALLY(0040000) -#define S_IFIFO LITERALLY(0010000) -#define S_IFMT LITERALLY(0170000) -#define S_IFLNK LITERALLY(0120000) -#define S_IFSOCK LITERALLY(0140000) -#define S_ISVTX LITERALLY(01000) -#define S_ISGID LITERALLY(02000) -#define S_ISUID LITERALLY(04000) -#define S_IEXEC LITERALLY(00100) -#define S_IWRITE LITERALLY(00200) -#define S_IREAD LITERALLY(00400) -#define S_IXUSR LITERALLY(00100) -#define S_IWUSR LITERALLY(00200) -#define S_IRUSR LITERALLY(00400) -#define S_IRWXU LITERALLY(00700) -#define S_IXGRP LITERALLY(00010) -#define S_IWGRP LITERALLY(00020) -#define S_IRGRP LITERALLY(00040) -#define S_IRWXG LITERALLY(00070) -#define S_IXOTH LITERALLY(00001) -#define S_IWOTH LITERALLY(00002) -#define S_IROTH LITERALLY(00004) -#define S_IRWXO LITERALLY(00007) +#define S_IFIFO (1 << 12) /* pipe */ +#define S_IFCHR (2 << 12) /* character device */ +#define S_IFDIR (4 << 12) /* directory */ +#define S_IFBLK (6 << 12) /* block device */ +#define S_IFREG (8 << 12) /* regular file */ +#define S_IFLNK (10 << 12) /* symbolic link */ +#define S_IFSOCK (12 << 12) /* socket */ +#define S_IFMT (15 << 12) /* mask of file types above */ #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_S_H_ */ diff --git a/libc/sysv/consts/sa.h b/libc/sysv/consts/sa.h index b175276b4..aa85f7660 100644 --- a/libc/sysv/consts/sa.h +++ b/libc/sysv/consts/sa.h @@ -4,14 +4,13 @@ #define SA_NOCLDSTOP SYMBOLIC(SA_NOCLDSTOP) #define SA_NOCLDWAIT SYMBOLIC(SA_NOCLDWAIT) -#define SA_NODEFER SYMBOLIC(SA_NODEFER) -#define SA_NOMASK SYMBOLIC(SA_NOMASK) -#define SA_ONESHOT SYMBOLIC(SA_ONESHOT) -#define SA_ONSTACK SYMBOLIC(SA_ONSTACK) +#define SA_NODEFER SYMBOLIC(SA_NODEFER) +#define SA_NOMASK SYMBOLIC(SA_NOMASK) +#define SA_ONESHOT SYMBOLIC(SA_ONESHOT) +#define SA_ONSTACK SYMBOLIC(SA_ONSTACK) #define SA_RESETHAND SYMBOLIC(SA_RESETHAND) -#define SA_RESTART SYMBOLIC(SA_RESTART) -#define SA_RESTORER SYMBOLIC(SA_RESTORER) -#define SA_SIGINFO SYMBOLIC(SA_SIGINFO) +#define SA_RESTART SYMBOLIC(SA_RESTART) +#define SA_SIGINFO SYMBOLIC(SA_SIGINFO) #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ @@ -24,7 +23,6 @@ extern const long SA_ONESHOT; extern const long SA_ONSTACK; extern const long SA_RESETHAND; extern const long SA_RESTART; -extern const long SA_RESTORER; extern const long SA_SIGINFO; COSMOPOLITAN_C_END_ diff --git a/libc/sysv/consts/segv.h b/libc/sysv/consts/segv.h deleted file mode 100644 index 711fb69fd..000000000 --- a/libc/sysv/consts/segv.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_SEGV_H_ -#define COSMOPOLITAN_LIBC_SYSV_CONSTS_SEGV_H_ -#include "libc/runtime/symbolic.h" - -#define SEGV_ACCERR SYMBOLIC(SEGV_ACCERR) -#define SEGV_MAPERR SYMBOLIC(SEGV_MAPERR) - -#if !(__ASSEMBLER__ + __LINKER__ + 0) -COSMOPOLITAN_C_START_ - -extern const long SEGV_ACCERR; -extern const long SEGV_MAPERR; - -COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ -#endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_SEGV_H_ */ diff --git a/libc/sysv/consts/sicode.h b/libc/sysv/consts/sicode.h new file mode 100644 index 000000000..11922b88d --- /dev/null +++ b/libc/sysv/consts/sicode.h @@ -0,0 +1,105 @@ +#ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_SICODE_H_ +#define COSMOPOLITAN_LIBC_SYSV_CONSTS_SICODE_H_ +#include "libc/runtime/symbolic.h" +#if !(__ASSEMBLER__ + __LINKER__ + 0) +COSMOPOLITAN_C_START_ + +extern const long SI_USER; +extern const long SI_QUEUE; +extern const long SI_TIMER; +extern const long SI_MESGQ; +extern const long SI_ASYNCIO; +extern const long SI_TKILL; +extern const long SI_ASYNCNL; +extern const long SI_KERNEL; +extern const long SI_NOINFO; +extern const long CLD_EXITED; +extern const long CLD_KILLED; +extern const long CLD_DUMPED; +extern const long CLD_TRAPPED; +extern const long CLD_STOPPED; +extern const long CLD_CONTINUED; +extern const long TRAP_BRKPT; +extern const long TRAP_TRACE; +extern const long SEGV_MAPERR; +extern const long SEGV_ACCERR; +extern const long FPE_INTDIV; +extern const long FPE_INTOVF; +extern const long FPE_FLTDIV; +extern const long FPE_FLTOVF; +extern const long FPE_FLTUND; +extern const long FPE_FLTRES; +extern const long FPE_FLTINV; +extern const long FPE_FLTSUB; +extern const long ILL_ILLOPC; +extern const long ILL_ILLOPN; +extern const long ILL_ILLADR; +extern const long ILL_ILLTRP; +extern const long ILL_PRVOPC; +extern const long ILL_PRVREG; +extern const long ILL_COPROC; +extern const long ILL_BADSTK; +extern const long BUS_ADRALN; +extern const long BUS_ADRERR; +extern const long BUS_OBJERR; +extern const long BUS_MCEERR_AR; +extern const long BUS_MCEERR_AO; +extern const long POLL_IN; +extern const long POLL_OUT; +extern const long POLL_MSG; +extern const long POLL_ERR; +extern const long POLL_PRI; +extern const long POLL_HUP; + +COSMOPOLITAN_C_END_ +#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ + +#define CLD_EXITED LITERALLY(1) +#define CLD_KILLED LITERALLY(2) +#define CLD_DUMPED LITERALLY(3) +#define CLD_TRAPPED LITERALLY(4) +#define CLD_STOPPED LITERALLY(5) +#define CLD_CONTINUED LITERALLY(6) +#define TRAP_BRKPT LITERALLY(1) +#define TRAP_TRACE LITERALLY(2) +#define SEGV_MAPERR LITERALLY(1) +#define SEGV_ACCERR LITERALLY(2) +#define ILL_ILLOPC LITERALLY(1) +#define ILL_PRVREG LITERALLY(6) +#define ILL_COPROC LITERALLY(7) +#define ILL_BADSTK LITERALLY(8) +#define BUS_ADRALN LITERALLY(1) +#define BUS_ADRERR LITERALLY(2) +#define BUS_OBJERR LITERALLY(3) +#define POLL_IN LITERALLY(1) +#define POLL_OUT LITERALLY(2) +#define POLL_MSG LITERALLY(3) +#define POLL_ERR LITERALLY(4) +#define POLL_PRI LITERALLY(5) +#define POLL_HUP LITERALLY(6) + +#define SI_USER SYMBOLIC(SI_USER) +#define SI_QUEUE SYMBOLIC(SI_QUEUE) +#define SI_TIMER SYMBOLIC(SI_TIMER) +#define SI_MESGQ SYMBOLIC(SI_MESGQ) +#define SI_ASYNCIO SYMBOLIC(SI_ASYNCIO) +#define SI_TKILL SYMBOLIC(SI_TKILL) +#define SI_ASYNCNL SYMBOLIC(SI_ASYNCNL) +#define SI_KERNEL SYMBOLIC(SI_KERNEL) +#define SI_NOINFO SYMBOLIC(SI_NOINFO) +#define FPE_INTDIV SYMBOLIC(FPE_INTDIV) +#define FPE_INTOVF SYMBOLIC(FPE_INTOVF) +#define FPE_FLTDIV SYMBOLIC(FPE_FLTDIV) +#define FPE_FLTOVF SYMBOLIC(FPE_FLTOVF) +#define FPE_FLTUND SYMBOLIC(FPE_FLTUND) +#define FPE_FLTRES SYMBOLIC(FPE_FLTRES) +#define FPE_FLTINV SYMBOLIC(FPE_FLTINV) +#define FPE_FLTSUB SYMBOLIC(FPE_FLTSUB) +#define ILL_ILLOPN SYMBOLIC(ILL_ILLOPN) +#define ILL_ILLADR SYMBOLIC(ILL_ILLADR) +#define ILL_ILLTRP SYMBOLIC(ILL_ILLTRP) +#define ILL_PRVOPC SYMBOLIC(ILL_PRVOPC) +#define BUS_MCEERR_AR SYMBOLIC(BUS_MCEERR_AR) +#define BUS_MCEERR_AO SYMBOLIC(BUS_MCEERR_AO) + +#endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_SICODE_H_ */ diff --git a/libc/sysv/consts/sigpoll.h b/libc/sysv/consts/sigpoll.h deleted file mode 100644 index 8c4258648..000000000 --- a/libc/sysv/consts/sigpoll.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_POLL_H_ -#define COSMOPOLITAN_LIBC_SYSV_CONSTS_POLL_H_ -#include "libc/runtime/symbolic.h" - -#define POLL_ERR SYMBOLIC(POLL_ERR) -#define POLL_HUP SYMBOLIC(POLL_HUP) -#define POLL_IN SYMBOLIC(POLL_IN) -#define POLL_MSG SYMBOLIC(POLL_MSG) -#define POLL_OUT SYMBOLIC(POLL_OUT) -#define POLL_PRI SYMBOLIC(POLL_PRI) - -#if !(__ASSEMBLER__ + __LINKER__ + 0) -COSMOPOLITAN_C_START_ - -extern const long POLL_ERR; -extern const long POLL_HUP; -extern const long POLL_IN; -extern const long POLL_MSG; -extern const long POLL_OUT; -extern const long POLL_PRI; - -COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ -#endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_POLL_H_ */ diff --git a/libc/sysv/consts/trap.h b/libc/sysv/consts/trap.h deleted file mode 100644 index b0f6d8fca..000000000 --- a/libc/sysv/consts/trap.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_TRAP_H_ -#define COSMOPOLITAN_LIBC_SYSV_CONSTS_TRAP_H_ -#include "libc/runtime/symbolic.h" - -#define TRAP_BRKPT SYMBOLIC(TRAP_BRKPT) -#define TRAP_TRACE SYMBOLIC(TRAP_TRACE) - -#if !(__ASSEMBLER__ + __LINKER__ + 0) -COSMOPOLITAN_C_START_ - -extern const long TRAP_BRKPT; -extern const long TRAP_TRACE; - -COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ -#endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_TRAP_H_ */ diff --git a/libc/sysv/netbsd.py b/libc/sysv/netbsd.py deleted file mode 100644 index cb97b60a5..000000000 --- a/libc/sysv/netbsd.py +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -import re -import sys -NETBSD = {} -MAXBIT = 0 - -def bsr(x): - r = -1 - while x: - r += 1 - x >>= 1 - return r - -def binify(x): - return "%016x" % (x) - -lines = open('libc/sysv/netbsd.txt').read().split('\n') -for line in lines: - if 'STD' not in line: continue - m = re.search(r'^(\d+).*?([_0-9A-Za-z]+)\(', line) - if not m: continue - NETBSD[m.group(2)] = int(m.group(1)) - -lines = open('libc/sysv/syscalls.sh').read().split('\n') -for line in lines: - if line.startswith('scall'): - fields = line.split() - name = fields[1] - if name.startswith("'"): name = name[1:] - if name.endswith("'"): name = name[:-1] - if name.startswith("__"): name = name[2:] - if name.startswith("sys_"): name = name[4:] - if name.endswith("_bsd"): name = name[:-4] - if name.endswith("_freebsd"): name = name[:-8] - numbas = fields[2][2:] - numbers = int(numbas, 16) - systemd = (numbers >> 000) & 0xffff - xnu = (numbers >> 020) & 0x0fff - xnukind = (numbers >> 034) & 0xf - freebsd = (numbers >> 040) & 0xffff - openbsd = (numbers >> 060) & 0xffff - netbsd = NETBSD.get(name, 0xffff) - com = "" - if netbsd != 0xffff: - if netbsd == systemd: com += " SYSTEMD" - if netbsd == xnu: com += " xnu" - if netbsd == freebsd: com += " freebsd" - if netbsd == openbsd: com += " openbsd" - getbit = lambda x: 0 if x == 0xffff else bsr(x) - maxbit = max([getbit(systemd), getbit(xnu), getbit(freebsd), getbit(openbsd), getbit(netbsd)]) - MAXBIT = max(maxbit, MAXBIT) - # print "%-30s %04x %04x %04x %04x %04x %3d %3d %s" % (name, systemd, xnu, freebsd, openbsd, netbsd, maxbit, MAXBIT, com) - systemd &= 0b111111111111 - xnu &= 0b111111111111 - freebsd &= 0b111111111111 - openbsd &= 0b111111111111 - netbsd &= 0b111111111111 - numba = netbsd << (4*13) | openbsd << (4*10) | freebsd << (4*7) | xnukind << (4*6) | xnu << (4*3) | systemd - assert numbas in line - line = line.replace(numbas, binify(numba)) - print line diff --git a/libc/sysv/newconsts.py b/libc/sysv/newconsts.py deleted file mode 100644 index 7285ef653..000000000 --- a/libc/sysv/newconsts.py +++ /dev/null @@ -1,74 +0,0 @@ -import sys - -H = '/home/jart/vendor/netbsd/sys/sys/spawn.h' -G = 'errno' - -MAGNUMS = {} - -def ParseInt(x): - s = 1 - if x.startswith('-'): - x = x[1:] - s = -1 - if x.startswith('0x'): - x = int(x[2:], 16) - elif x.startswith('0b'): - x = int(x[2:], 2) - elif x.startswith('0'): - x = int(x, 8) - else: - x = int(x, 10) - return x * s - -def FormatInt(x): - if x == -1: - return "-1" - if -128 <= x < 128: - return "%d" % (x) - else: - return "%#x" % (x) - -for line in open(H): - if line.startswith('#define'): - a = line.split() - if len(a) >= 3: - try: - MAGNUMS[a[1]] = ParseInt(a[2]) - except ValueError: - pass - -GROUP_COLUMN = 2 -NAME_COLUMN = 4 -SYSTEMD_COLUMN = 6 -XNU_COLUMN = 8 -FREEBSD_COLUMN = 10 -OPENBSD_COLUMN = 12 -NETBSD_COLUMN = 14 - -print """\ -# The Fifth Bell System, Community Edition -# > catalogue of carnage -# -# group name GNU/Systemd XNU's Not UNIX FreeBSD OpenBSD NetBSD XENIX Commentary""" - -for line in open('libc/sysv/consts.sh'): - if not line.startswith('syscon'): continue - fields = [""] - i = 0 - t = 0 - for i in range(len(line)): - if t == 0: - if line[i] == '\t': - fields.append("") - t = 1 - elif t == 1: - if line[i] != '\t': - fields.append("") - t = 0 - fields[-1] = fields[-1] + line[i] - k = fields[NAME_COLUMN] - v = ParseInt(fields[NETBSD_COLUMN]) - if k in MAGNUMS and MAGNUMS[k] != v: - fields[NETBSD_COLUMN] = FormatInt(MAGNUMS[k]) - # if fields[GROUP_COLUMN] == G: - sys.stdout.write("".join(fields)) diff --git a/libc/sysv/nr.py b/libc/sysv/nr.py deleted file mode 100644 index 138b11798..000000000 --- a/libc/sysv/nr.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -lines = open('libc/sysv/syscalls.sh').read().split('\n') -for line in lines: - if not line.startswith('scall'): - continue - fields = line.split() - name = fields[1] - if name.startswith("'"): name = name[1:] - if name.endswith("'"): name = name[:-1] - if name.startswith("__"): name = name[2:] - if name.startswith("sys_"): name = name[4:] - if name.endswith("_bsd"): name = name[:-4] - if name.endswith("_freebsd"): name = name[:-8] - numbers = int(fields[2][2:], 16) - systemd = (numbers >> 000) & 0xffff - xnu = (numbers >> 020) & 0x0fff | ((numbers >> 28) & 0xf) << 20 - freebsd = (numbers >> 040) & 0xffff - openbsd = (numbers >> 060) & 0xffff - print "syscon\tnr\t__NR_%s\t\t\t\t0x%04x\t\t\t0x%07x\t\t0x%04x\t\t\t0x%04x\t\t\t-1" % (name, systemd, xnu, freebsd, openbsd) diff --git a/libc/sysv/syscalls.sh b/libc/sysv/syscalls.sh index fd9ac3c22..09976ccae 100755 --- a/libc/sysv/syscalls.sh +++ b/libc/sysv/syscalls.sh @@ -61,7 +61,7 @@ scall sys_select 0x1a104705d205d017 globl hidden scall pselect 0x1b406e20a218afff globl scall pselect6 0xfffffffffffff10e globl scall sys_sched_yield 0x15e12a14b103c018 globl hidden # swtch() on xnu -scall sys_mremap 0x19bffffffffff019 globl hidden +scall __sys_mremap 0x19bffffffffff019 globl hidden scall mincore 0x04e04e04e204e01b globl scall sys_madvise 0x04b04b04b204b01c globl hidden scall shmget 0x0e71210e7210901d globl # consider mmap @@ -95,7 +95,7 @@ scall sys_fork 0x0020020022002039 globl hidden # xnu needs eax&=~-edx bc eax al #scall vfork 0x042042042204203a globl # this syscall is from the moon so we implement it by hand in libc/calls/hefty/vfork.S scall sys_posix_spawn 0xfffffffff20f4fff globl hidden # good luck figuring out how xnu defines this scall __sys_execve 0x03b03b03b203b03b globl hidden -scall sys_wait4 0x1c100b007200703d globl hidden +scall __sys_wait4 0x1c100b007200703d globl hidden scall sys_kill 0x02507a025202503e globl hidden # kill(pid, sig, 1) b/c xnu scall sys_killpg 0xffffff092fffffff globl hidden scall clone 0xfffffffffffff038 globl @@ -137,7 +137,7 @@ scall sys_lchown 0x1130fe0fe216c05e globl hidden # impl. w/ fchownat() scall umask 0x03c03c03c203c05f globl scall sys_gettimeofday 0x1a20430742074060 globl hidden # xnu esi/edx=0 scall sys_getrlimit 0x0c20c20c220c2061 globl hidden -scall sys_getrusage 0x1bd0130752075062 globl hidden +scall __sys_getrusage 0x1bd0130752075062 globl hidden scall sys_sysinfo 0xfffffffffffff063 globl hidden scall sys_times 0xfffffffffffff064 globl hidden scall sys_ptrace 0x01a01a01a201a065 globl hidden @@ -190,7 +190,8 @@ scall setfsgid 0xfffffffffffff07b globl scall capget 0xfffffffffffff07d globl scall capset 0xfffffffffffff07e globl scall sigtimedwait 0xffffff159ffff080 globl -scall rt_sigqueueinfo 0xfffffffffffff081 globl +scall sys_sigqueue 0xffffff1c8fffffff globl +scall sys_sigqueueinfo 0x0f5ffffffffff081 globl # rt_sigqueueinfo on linux scall personality 0xfffffffffffff087 globl scall ustat 0xfffffffffffff088 globl scall sysfs 0xfffffffffffff08b globl @@ -254,6 +255,11 @@ scall timer_settime 0x1beffffffffff0df globl scall timer_gettime 0x1bfffffffffff0e0 globl scall timer_getoverrun 0x0efffffffffff0e1 globl scall timer_delete 0x0ecffffffffff0e2 globl +scall ktimer_create 0xffffff0ebfffffff globl +scall ktimer_delete 0xffffff0ecfffffff globl +scall ktimer_getoverrun 0xffffff0effffffff globl +scall ktimer_gettime 0xffffff0eefffffff globl +scall ktimer_settime 0xffffff0edfffffff globl scall clock_settime 0x1ac0580e9ffff0e3 globl scall sys_clock_gettime 0x1ab0570e8ffff0e4 globl hidden # Linux 2.6+ (c. 2003); XNU uses magic address scall clock_getres 0x1ad0590eaffff0e5 globl @@ -690,11 +696,6 @@ scall ksem_timedwait 0xffffff1b9fffffff globl scall ksem_trywait 0xffffff193fffffff globl scall ksem_unlink 0xffffff196fffffff globl scall ksem_wait 0xffffff192fffffff globl -scall ktimer_create 0xffffff0ebfffffff globl -scall ktimer_delete 0xffffff0ecfffffff globl -scall ktimer_getoverrun 0xffffff0effffffff globl -scall ktimer_gettime 0xffffff0eefffffff globl -scall ktimer_settime 0xffffff0edfffffff globl scall lchflags 0x130fff187fffffff globl scall lchmod 0x112fff112fffffff globl scall lgetfh 0xffffff0a0fffffff globl @@ -734,7 +735,6 @@ scall setfib 0xffffff0affffffff globl scall sethostid 0xffffff08ffffffff globl scall setloginclass 0xffffff20cfffffff globl scall sigblock 0xffffff06dfffffff globl -scall sigqueue 0xffffff1c8fffffff globl scall sigsetmask 0xffffff06efffffff globl scall sigstack 0xffffff070fffffff globl scall sigvec 0xffffff06cfffffff globl diff --git a/libc/sysv/systemfive.S b/libc/sysv/systemfive.S index b6b7a20ea..019339aae 100644 --- a/libc/sysv/systemfive.S +++ b/libc/sysv/systemfive.S @@ -374,7 +374,7 @@ _init_systemfive_stack: # determinism ftw! mov %rsp,%rbp // 𝑠𝑙𝑖𝑑𝑒 _init_systemfive_syscall: - mov __NR_msyscall,%eax # syscall origin protect +/* mov __NR_msyscall,%eax # syscall origin protect cmp $0xfff,%ax # openbsd is pretty cool jae _init_systemfive_done push %rdi @@ -385,7 +385,7 @@ _init_systemfive_syscall: mov $__privileged_size,%esi syscall pop %rsi - pop %rdi + pop %rdi*/ // 𝑠𝑙𝑖𝑑𝑒 #endif /* TINY */ _init_systemfive_done: diff --git a/libc/sysv/versions.txt b/libc/sysv/versions.txt deleted file mode 100644 index a99dd23e9..000000000 --- a/libc/sysv/versions.txt +++ /dev/null @@ -1,12 +0,0 @@ -1993 FreeBSD 1.o -1994 FreeBSD 2 -1998 FreeBSD 3 -2000 FreeBSD 4 (EOL 2007) -2003 FreeBSD 5 -2005 FreeBSD 6 -2008 FreeBSD 7 (EOL 2013) -2009 FreeBSD 8 (EOL 2015) -2012 FreeBSD 9 (EOL 2016) -2014 FreeBSD 10 (EOL 2018) -2016 FreeBSD 11 -2018 FreeBSD 12 diff --git a/libc/time/time.h b/libc/time/time.h index f56b98cb4..6d126dd4f 100644 --- a/libc/time/time.h +++ b/libc/time/time.h @@ -61,6 +61,7 @@ long double dtime(int); long double dsleep(long double); extern long double (*nowl)(void); long double ConvertTicksToNanos(uint64_t); +void RefreshTime(void); double difftime(int64_t, int64_t) nothrow pureconst; diff --git a/libc/x/x.h b/libc/x/x.h index a5b6199a9..dd359878f 100644 --- a/libc/x/x.h +++ b/libc/x/x.h @@ -36,7 +36,8 @@ char *xasprintf(const char *, ...) printfesque(1) paramsnonnull((1)) _XMAL; char *xvasprintf(const char *, va_list) _XPNN _XMAL; char *xgetline(struct FILE *) _XPNN mallocesque; void *xmalloc(size_t) attributeallocsize((1)) _XMAL; -void *xrealloc(void *, size_t) attributeallocsize((2)) _XRET; +void *xrealloc(void *, size_t) + attributeallocsize((2)) nothrow nocallback nodiscard; void *xcalloc(size_t, size_t) attributeallocsize((1, 2)) _XMAL; void *xvalloc(size_t) attributeallocsize((1)) _XMALPG; void *xmemalign(size_t, size_t) attributeallocalign((1)) diff --git a/libc/x/xrealloc.c b/libc/x/xrealloc.c index 4318b43bc..f61cace06 100644 --- a/libc/x/xrealloc.c +++ b/libc/x/xrealloc.c @@ -21,13 +21,23 @@ #include "libc/x/x.h" /** - * Relocates, extends, and/or shrinks memory──or die. + * Allocates/expands/shrinks/frees memory, or die. * - * This API is fabulous since it categorically eliminates an extremely - * common type of memory bug, by simply redefining it as a crash. + * This API enables you to do the following: + * + * p = xrealloc(p, n) + * + * The standard behaviors for realloc() still apply: + * + * - `!p` means xmalloc (returns non-NULL) + * - `p && n` means resize (returns non-NULL) + * - `p && !n` means free (returns NULL) + * + * The complexity of resizing is guaranteed to be amortized. */ -void *xrealloc(void *p1, size_t newsize) { - void *p2 = realloc(p1, newsize); - if (!p2) xdie(); - return p2; +void *xrealloc(void *p, size_t n) { + void *q; + q = realloc(p, n); + if (!q && !(p && !n)) xdie(); + return q; } diff --git a/libc/zip.h b/libc/zip.h index 619dfcf3b..cf5c0c7e0 100644 --- a/libc/zip.h +++ b/libc/zip.h @@ -10,7 +10,7 @@ #define kZipAlign 2 -#define kZipCosmopolitanVersion 20 +#define kZipCosmopolitanVersion kZipEra2001 #define kZipOsDos 0 #define kZipOsAmiga 1 @@ -37,8 +37,8 @@ #define kZipEra1993 20 /* PKZIP 2.0: deflate/subdir/etc. support */ #define kZipEra2001 45 /* PKZIP 4.5: kZipExtraZip64 support */ -#define kZipIattrBinary 0 -#define kZipIattrAscii 1 +#define kZipIattrBinary 0 /* first bit not set */ +#define kZipIattrText 1 /* first bit set */ #define kZipCompressionNone 0 #define kZipCompressionDeflate 8 @@ -49,6 +49,9 @@ #define kZipCdirHdrLinkableSize \ ROUNDUP(kZipCfileHdrMinSize + PATH_MAX, kZipCdirAlign) +#define kZipCdir64HdrMagic 0x06064b50 /* PK♣♠ "PK\6\6" */ +#define kZipCdir64HdrMinSize 56 + #define kZipCfileHdrMagic 0x02014b50 /* PK☺☻ "PK\1\2" */ #define kZipCfileHdrMinSize 46 #define kZipCfileOffsetGeneralflag 8 @@ -73,10 +76,12 @@ #define kZipGflagUtf8 0x800 -#define kZipExtraHdrSize 4 -#define kZipExtraZip64 0x0001 -#define kZipExtraNtfs 0x000a -#define kZipExtraExtendedTimestamp 0x5455 +#define kZipExtraHdrSize 4 +#define kZipExtraZip64 0x0001 +#define kZipExtraNtfs 0x000a +#define kZipExtraUnix 0x000d +#define kZipExtraExtendedTimestamp 0x5455 +#define kZipExtraInfoZipNewUnixExtra 0x7875 #define kZipCfileMagic "PK\001\002" @@ -91,15 +96,30 @@ #define ZIP_CDIR_SIZE(P) READ32LE((P) + 12) #define ZIP_CDIR_OFFSET(P) READ32LE((P) + 16) #define ZIP_CDIR_COMMENTSIZE(P) READ16LE((P) + 20) -#define ZIP_CDIR_COMMENT(P) (&(P)[22]) +#define ZIP_CDIR_COMMENT(P) ((P) + 22) /* recommend stopping at nul */ #define ZIP_CDIR_HDRSIZE(P) (ZIP_CDIR_COMMENTSIZE(P) + kZipCdirHdrMinSize) +/* zip64 end of central directory record */ +#define ZIP_CDIR64_MAGIC(P) READ32LE(P) +#define ZIP_CDIR64_HDRSIZE(P) (READ64LE((P) + 4) + 12) +#define ZIP_CDIR64_VERSIONMADE(P) READ16LE((P) + 12) +#define ZIP_CDIR64_VERSIONNEED(P) READ16LE((P) + 14) +#define ZIP_CDIR64_DISK(P) READ32LE((P) + 16) +#define ZIP_CDIR64_STARTINGDISK(P) READ32LE((P) + 20) +#define ZIP_CDIR64_RECORDSONDISK(P) READ64LE((P) + 24) +#define ZIP_CDIR64_RECORDS(P) READ64LE((P) + 32) +#define ZIP_CDIR64_SIZE(P) READ64LE((P) + 40) +#define ZIP_CDIR64_OFFSET(P) READ64LE((P) + 48) +#define ZIP_CDIR64_COMMENTSIZE(P) \ + (ZIP_CDIR64_HDRSIZE(P) >= 56 ? ZIP_CDIR64_HDRSIZE(P) - 56 : 0) +#define ZIP_CDIR64_COMMENT(P) ((P) + 56) /* recommend stopping at nul */ + /* central directory file header */ #define ZIP_CFILE_MAGIC(P) READ32LE(P) -#define ZIP_CFILE_VERSIONMADE(P) ((P)[4]) -#define ZIP_CFILE_FILEATTRCOMPAT(P) ((P)[5]) -#define ZIP_CFILE_VERSIONNEED(P) ((P)[6]) -#define ZIP_CFILE_OSNEED(P) ((P)[7]) +#define ZIP_CFILE_VERSIONMADE(P) (255 & (P)[4]) +#define ZIP_CFILE_FILEATTRCOMPAT(P) (255 & (P)[5]) +#define ZIP_CFILE_VERSIONNEED(P) (255 & (P)[6]) +#define ZIP_CFILE_OSNEED(P) (255 & (P)[7]) #define ZIP_CFILE_GENERALFLAG(P) READ16LE((P) + kZipCfileOffsetGeneralflag) #define ZIP_CFILE_COMPRESSIONMETHOD(P) \ READ16LE((P) + kZipCfileOffsetCompressionmethod) @@ -119,18 +139,19 @@ #define ZIP_CFILE_EXTERNALATTRIBUTES(P) \ READ32LE((P) + kZipCfileOffsetExternalattributes) #define ZIP_CFILE_OFFSET(P) READ32LE((P) + kZipCfileOffsetOffset) -#define ZIP_CFILE_NAME(P) ((const char *)(&(P)[46])) /* not nul-terminated */ -#define ZIP_CFILE_EXTRA(P) (&(P)[46 + ZIP_CFILE_NAMESIZE(P)]) -#define ZIP_CFILE_COMMENT(P) \ - (&(P)[46 + ZIP_CFILE_NAMESIZE(P) + ZIP_CFILE_EXTRASIZE(P)]) +#define ZIP_CFILE_NAME(P) ((const char *)((P) + 46)) /* not nul-terminated */ +#define ZIP_CFILE_EXTRA(P) ((P) + 46 + ZIP_CFILE_NAMESIZE(P)) +#define ZIP_CFILE_COMMENT(P) \ + ((const char *)((P) + 46 + ZIP_CFILE_NAMESIZE(P) + \ + ZIP_CFILE_EXTRASIZE(P))) /* recommend stopping at nul */ #define ZIP_CFILE_HDRSIZE(P) \ (ZIP_CFILE_NAMESIZE(P) + ZIP_CFILE_EXTRASIZE(P) + ZIP_CFILE_COMMENTSIZE(P) + \ kZipCfileHdrMinSize) /* local file header */ #define ZIP_LFILE_MAGIC(P) READ32LE(P) -#define ZIP_LFILE_VERSIONNEED(P) ((P)[4]) -#define ZIP_LFILE_OSNEED(P) ((P)[5]) +#define ZIP_LFILE_VERSIONNEED(P) (255 & (P)[4]) +#define ZIP_LFILE_OSNEED(P) (255 & (P)[5]) #define ZIP_LFILE_GENERALFLAG(P) READ16LE((P) + kZipLfileOffsetGeneralflag) #define ZIP_LFILE_COMPRESSIONMETHOD(P) \ READ16LE((P) + kZipLfileOffsetCompressionmethod) @@ -145,8 +166,8 @@ READ32LE((P) + kZipLfileOffsetUncompressedsize) #define ZIP_LFILE_NAMESIZE(P) READ16LE((P) + 26) #define ZIP_LFILE_EXTRASIZE(P) READ16LE((P) + 28) -#define ZIP_LFILE_NAME(P) ((const char *)(&(P)[30])) -#define ZIP_LFILE_EXTRA(P) (&(P)[30 + ZIP_LFILE_NAMESIZE(P)]) +#define ZIP_LFILE_NAME(P) ((const char *)((P) + 30)) +#define ZIP_LFILE_EXTRA(P) ((P) + 30 + ZIP_LFILE_NAMESIZE(P)) #define ZIP_LFILE_HDRSIZE(P) \ (ZIP_LFILE_NAMESIZE(P) + ZIP_LFILE_EXTRASIZE(P) + kZipLfileHdrMinSize) #define ZIP_LFILE_CONTENT(P) ((P) + ZIP_LFILE_HDRSIZE(P)) @@ -154,9 +175,22 @@ #define ZIP_EXTRA_HEADERID(P) READ16LE(P) #define ZIP_EXTRA_CONTENTSIZE(P) READ16LE((P) + 2) -#define ZIP_EXTRA_CONTENT(P) (&(P)[4]) +#define ZIP_EXTRA_CONTENT(P) ((P) + 4) #define ZIP_EXTRA_SIZE(P) (ZIP_EXTRA_CONTENTSIZE(P) + kZipExtraHdrSize) +uint8_t *GetZipCdir(const uint8_t *, size_t); +bool IsZipCdir32(const uint8_t *, size_t, size_t); +bool IsZipCdir64(const uint8_t *, size_t, size_t); +int GetZipCfileMode(const uint8_t *); +uint64_t GetZipCdirOffset(const uint8_t *); +uint64_t GetZipCdirRecords(const uint8_t *); +void *GetZipCdirComment(const uint8_t *); +uint64_t GetZipCdirCommentSize(const uint8_t *); +uint64_t GetZipCfileUncompressedSize(const uint8_t *); +uint64_t GetZipCfileCompressedSize(const uint8_t *); +uint64_t GetZipCfileOffset(const uint8_t *); +uint64_t GetZipLfileUncompressedSize(const uint8_t *); +uint64_t GetZipLfileCompressedSize(const uint8_t *); uint8_t *zipfindcentraldir(const uint8_t *, size_t); #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ diff --git a/libc/zipos/find.c b/libc/zipos/find.c index e38571305..9263bbd00 100644 --- a/libc/zipos/find.c +++ b/libc/zipos/find.c @@ -24,15 +24,14 @@ #include "libc/zipos/zipos.internal.h" ssize_t __zipos_find(struct Zipos *zipos, const struct ZiposUri *name) { - size_t i, cf; - assert(ZIP_CDIR_MAGIC(zipos->cdir) == kZipCdirHdrMagic); - for (i = 0, cf = ZIP_CDIR_OFFSET(zipos->cdir); - i < ZIP_CDIR_RECORDS(zipos->cdir); - ++i, cf += ZIP_CFILE_HDRSIZE(zipos->map + cf)) { - assert(ZIP_CFILE_MAGIC(zipos->map + cf) == kZipCfileHdrMagic); - if (name->len == ZIP_CFILE_NAMESIZE(zipos->map + cf) && - memcmp(name->path, ZIP_CFILE_NAME(zipos->map + cf), name->len) == 0) { - return cf; + size_t i, n, c; + c = GetZipCdirOffset(zipos->cdir); + n = GetZipCdirRecords(zipos->cdir); + for (i = 0; i < n; ++i, c += ZIP_CFILE_HDRSIZE(zipos->map + c)) { + assert(ZIP_CFILE_MAGIC(zipos->map + c) == kZipCfileHdrMagic); + if (name->len == ZIP_CFILE_NAMESIZE(zipos->map + c) && + memcmp(name->path, ZIP_CFILE_NAME(zipos->map + c), name->len) == 0) { + return c; } } return -1; diff --git a/libc/zipos/get.c b/libc/zipos/get.c index 985ef310b..af443f8ab 100644 --- a/libc/zipos/get.c +++ b/libc/zipos/get.c @@ -59,7 +59,7 @@ struct Zipos *__zipos_get(void) { } else { base = map; } - if ((cdir = zipfindcentraldir(base, size))) { + if ((cdir = GetZipCdir(base, size))) { zipos.map = base; zipos.cdir = cdir; } else { diff --git a/libc/zipos/open.c b/libc/zipos/open.c index 3847a5c9b..e4e4705b9 100644 --- a/libc/zipos/open.c +++ b/libc/zipos/open.c @@ -87,20 +87,20 @@ static int __zipos_load(struct Zipos *zipos, size_t cf, unsigned flags, int fd; size_t lf; struct ZiposHandle *h; - lf = ZIP_CFILE_OFFSET(zipos->map + cf); + lf = GetZipCfileOffset(zipos->map + cf); assert(ZIP_LFILE_MAGIC(zipos->map + lf) == kZipLfileHdrMagic); assert(ZIP_LFILE_COMPRESSIONMETHOD(zipos->map + lf) == kZipCompressionNone || ZIP_LFILE_COMPRESSIONMETHOD(zipos->map + lf) == kZipCompressionDeflate); if (!(h = calloc(1, sizeof(*h)))) return -1; h->cfile = cf; - if ((h->size = ZIP_LFILE_UNCOMPRESSEDSIZE(zipos->map + lf))) { + if ((h->size = GetZipLfileUncompressedSize(zipos->map + lf))) { if (ZIP_LFILE_COMPRESSIONMETHOD(zipos->map + lf)) { - assert(ZIP_LFILE_COMPRESSEDSIZE(zipos->map + lf)); + assert(GetZipLfileCompressedSize(zipos->map + lf)); if ((h->freeme = malloc(h->size)) && (IsTiny() ? __zipos_inflate_tiny : __zipos_inflate_fast)( h, ZIP_LFILE_CONTENT(zipos->map + lf), - ZIP_LFILE_COMPRESSEDSIZE(zipos->map + lf)) != -1) { + GetZipLfileCompressedSize(zipos->map + lf)) != -1) { h->mem = h->freeme; } } else { diff --git a/libc/zipos/stat-impl.c b/libc/zipos/stat-impl.c index 170eb1b52..8bb989b6d 100644 --- a/libc/zipos/stat-impl.c +++ b/libc/zipos/stat-impl.c @@ -25,6 +25,7 @@ #include "libc/zipos/zipos.internal.h" int __zipos_stat_impl(struct Zipos *zipos, size_t cf, struct stat *st) { + size_t lf; if (zipos && st) { memset(st, 0, sizeof(*st)); if (ZIP_CFILE_FILEATTRCOMPAT(zipos->map + cf) == kZipOsUnix) { @@ -32,9 +33,10 @@ int __zipos_stat_impl(struct Zipos *zipos, size_t cf, struct stat *st) { } else { st->st_mode = 0100644; } - st->st_size = ZIP_CFILE_UNCOMPRESSEDSIZE(zipos->map + cf); + lf = GetZipCfileOffset(zipos->map + cf); + st->st_size = GetZipLfileUncompressedSize(zipos->map + lf); st->st_blocks = - roundup(ZIP_CFILE_COMPRESSEDSIZE(zipos->map + cf), 512) / 512; + roundup(GetZipLfileCompressedSize(zipos->map + lf), 512) / 512; return 0; } else { return einval(); diff --git a/net/http/base64.h b/net/http/base64.h deleted file mode 100644 index 57752859f..000000000 --- a/net/http/base64.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef COSMOPOLITAN_NET_HTTP_BASE64_H_ -#define COSMOPOLITAN_NET_HTTP_BASE64_H_ -#if !(__ASSEMBLER__ + __LINKER__ + 0) -COSMOPOLITAN_C_START_ - -char *EncodeBase64(const void *, size_t, size_t *); -void *DecodeBase64(const char *, size_t, size_t *); - -COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ -#endif /* COSMOPOLITAN_NET_HTTP_BASE64_H_ */ diff --git a/net/http/categorizeip.c b/net/http/categorizeip.c new file mode 100644 index 000000000..71321b410 --- /dev/null +++ b/net/http/categorizeip.c @@ -0,0 +1,50 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/ip.h" + +/** + * Classifies IP address. + * + * @return integer e.g. kIpLoopback, kIpPrivate, etc. + * @see GetIpCategoryName() + */ +int CategorizeIp(uint32_t x) { + int a; + if (IsLoopbackIp(x)) return kIpLoopback; + if (IsPrivateIp(x)) return kIpPrivate; + if (IsMulticastIp(x)) return kIpMulticast; + if (IsAnonymousIp(x)) return kIpAnonymous; /* order matters */ + if (IsTestnetIp(x)) return kIpTestnet; /* order matters */ + if (IsAfrinicIp(x)) return kIpAfrinic; + if (IsLacnicIp(x)) return kIpLacnic; + if (IsApnicIp(x)) return kIpApnic; + if (IsArinIp(x)) return kIpArin; + if (IsRipeIp(x)) return kIpRipe; + if (IsDodIp(x)) return kIpDod; + a = (x & 0xff000000) >> 24; + if (a == 12) return kIpAtt; + if (a == 17) return kIpApple; + if (a == 19) return kIpFord; + if (a == 38) return kIpCogent; + if (a == 48) return kIpPrudential; + if (a == 56) return kIpUsps; + if (a == 73) return kIpComcast; + if (a >= 240) return kIpFuture; + return kIpUnknown; +} diff --git a/net/http/decodebase64.c b/net/http/decodebase64.c index 7a8a1a72d..4a8cc9ec1 100644 --- a/net/http/decodebase64.c +++ b/net/http/decodebase64.c @@ -18,7 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/mem/mem.h" #include "libc/str/str.h" -#include "net/http/base64.h" +#include "net/http/escape.h" static const signed char kBase64[256] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x00 @@ -41,13 +41,18 @@ static const signed char kBase64[256] = { /** * Decodes base64 ascii representation to binary. + * + * @param data is input value + * @param size if -1 implies strlen + * @param out_size if non-NULL receives output length + * @return allocated NUL-terminated buffer, or NULL w/ errno */ -void *DecodeBase64(const char *data, size_t size, size_t *out_size) { - unsigned w; +char *DecodeBase64(const char *data, size_t size, size_t *out_size) { + size_t n; char *r, *q; - int a, b, c, d; + int a, b, c, d, w; const char *p, *pe; - if (size == -1) size = strlen(data); + if (size == -1) size = data ? strlen(data) : 0; if ((r = malloc(size / 4 * 3 + 1))) { q = r; p = data; @@ -77,9 +82,14 @@ void *DecodeBase64(const char *data, size_t size, size_t *out_size) { if (d != -2) *q++ = (w & 0x0000FF) >> 000; } Done: - if (out_size) *out_size = q - r; + n = q - r; *q++ = '\0'; if ((q = realloc(r, q - r))) r = q; + } else { + n = 0; + } + if (out_size) { + *out_size = n; } return r; } diff --git a/net/http/decodelatin1.c b/net/http/decodelatin1.c index aef372ccd..a52ce8b95 100644 --- a/net/http/decodelatin1.c +++ b/net/http/decodelatin1.c @@ -16,29 +16,39 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/intrin/pcmpgtb.h" +#include "libc/intrin/pmovmskb.h" #include "libc/mem/mem.h" #include "libc/str/str.h" -#include "net/http/http.h" +#include "net/http/escape.h" /** * Decodes ISO-8859-1 to UTF-8. * - * @param data is input value - * @param size if -1 implies strlen - * @param out_size if non-NULL receives output length on success + * @param p is input value + * @param n if -1 implies strlen + * @param z if non-NULL receives output length * @return allocated NUL-terminated buffer, or NULL w/ errno */ -char *DecodeLatin1(const char *data, size_t size, size_t *out_size) { +char *DecodeLatin1(const char *p, size_t n, size_t *z) { int c; + size_t i; char *r, *q; - const char *p, *e; - if (size == -1) size = strlen(data); - if ((r = malloc(size * 2 + 1))) { - q = r; - p = data; - e = p + size; - while (p < e) { - c = *p++ & 0xff; + int8_t v1[16], v2[16], vz[16]; + if (z) *z = 0; + if (n == -1) n = p ? strlen(p) : 0; + if ((q = r = malloc(n * 2 + 1))) { + for (i = 0; i < n;) { + memset(vz, 0, 16); /* 3x speedup for ASCII */ + while (i + 16 < n) { + memcpy(v1, p + i, 16); + pcmpgtb(v2, v1, vz); + if (pmovmskb((void *)v2) != 0xFFFF) break; + memcpy(q, v1, 16); + q += 16; + i += 16; + } + c = p[i++] & 0xff; if (c < 0200) { *q++ = c; } else { @@ -46,7 +56,7 @@ char *DecodeLatin1(const char *data, size_t size, size_t *out_size) { *q++ = 0200 | c & 077; } } - if (out_size) *out_size = q - r; + if (z) *z = q - r; *q++ = '\0'; if ((q = realloc(r, q - r))) r = q; } diff --git a/net/http/encodebase64.c b/net/http/encodebase64.c index 1515bdfd0..d8ee0a3c0 100644 --- a/net/http/encodebase64.c +++ b/net/http/encodebase64.c @@ -17,23 +17,29 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/mem/mem.h" -#include "net/http/base64.h" +#include "libc/str/str.h" +#include "net/http/escape.h" #define CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" /** * Encodes binary to base64 ascii representation. + * + * @param data is input value + * @param size if -1 implies strlen + * @param out_size if non-NULL receives output length + * @return allocated NUL-terminated buffer, or NULL w/ errno */ -char *EncodeBase64(const void *data, size_t size, size_t *out_size) { +char *EncodeBase64(const char *data, size_t size, size_t *out_size) { size_t n; unsigned w; char *r, *q; const unsigned char *p, *pe; + if (size == -1) size = data ? strlen(data) : 0; if ((n = size) % 3) n += 3 - size % 3; n /= 3, n *= 4; if ((r = malloc(n + 1))) { - if (out_size) *out_size = n; - for (q = r, p = data, pe = p + size; p < pe; p += 3) { + for (q = r, p = (void *)data, pe = p + size; p < pe; p += 3) { w = p[0] << 020; if (p + 1 < pe) w |= p[1] << 010; if (p + 2 < pe) w |= p[2] << 000; @@ -43,6 +49,11 @@ char *EncodeBase64(const void *data, size_t size, size_t *out_size) { *q++ = p + 2 < pe ? CHARS[w & 077] : '='; } *q++ = '\0'; + } else { + n = 0; + } + if (out_size) { + *out_size = n; } return r; } diff --git a/net/http/encodehttpheadervalue.c b/net/http/encodehttpheadervalue.c index ee5829e10..6515c58c1 100644 --- a/net/http/encodehttpheadervalue.c +++ b/net/http/encodehttpheadervalue.c @@ -20,7 +20,7 @@ #include "libc/mem/mem.h" #include "libc/str/str.h" #include "libc/str/thompike.h" -#include "net/http/http.h" +#include "net/http/escape.h" /** * Encodes HTTP header value. @@ -42,9 +42,10 @@ char *EncodeHttpHeaderValue(const char *data, size_t size, size_t *out_size) { bool t; wint_t x; + size_t n; char *r, *q; const char *p, *e; - if (size == -1) size = strlen(data); + if (size == -1) size = data ? strlen(data) : 0; if ((r = malloc(size + 1))) { t = 0; q = r; @@ -77,9 +78,14 @@ char *EncodeHttpHeaderValue(const char *data, size_t size, size_t *out_size) { } } while (q > r && (q[-1] == ' ' || q[-1] == '\t')) --q; - if (out_size) *out_size = q - r; + n = q - r; *q++ = '\0'; if ((q = realloc(r, q - r))) r = q; + } else { + n = 0; + } + if (out_size) { + *out_size = n; } return r; } diff --git a/net/http/encodelatin1.c b/net/http/encodelatin1.c new file mode 100644 index 000000000..17d7f35ac --- /dev/null +++ b/net/http/encodelatin1.c @@ -0,0 +1,72 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/errno.h" +#include "libc/intrin/pcmpgtb.h" +#include "libc/intrin/pmovmskb.h" +#include "libc/mem/mem.h" +#include "libc/stdio/stdio.h" +#include "libc/str/str.h" +#include "net/http/escape.h" + +/** + * Encodes UTF-8 to ISO-8859-1. + * + * @param p is input value + * @param n if -1 implies strlen + * @param z if non-NULL receives output length + * @param f can kControlC0, kControlC1 to forbid + * @return allocated NUL-terminated buffer, or NULL w/ errno + * @error EILSEQ means UTF-8 found we can't or won't re-encode + * @error ENOMEM means malloc() failed + */ +char *EncodeLatin1(const char *p, size_t n, size_t *z, int f) { + int c; + size_t i; + char *r, *q; + if (z) *z = 0; + if (n == -1) n = p ? strlen(p) : 0; + if ((q = r = malloc(n + 1))) { + for (i = 0; i < n;) { + c = p[i++] & 0xff; + if (c >= 0300) { + if ((c <= 0303) && i < n && (p[i] & 0300) == 0200) { + c = (c & 037) << 6 | p[i++] & 077; + } else { + goto Invalid; + } + } + if (((f & kControlC1) && 0x80 <= c && c < 0xA0) || + ((f & kControlC0) && (c < 32 || c == 0x7F) && + !(c == '\t' || c == '\r' || c == '\n' || c == '\v')) || + ((f & kControlWs) && + (c == '\t' || c == '\r' || c == '\n' || c == '\v'))) { + goto Invalid; + } + *q++ = c; + } + if (z) *z = q - r; + *q++ = '\0'; + if ((q = realloc(r, q - r))) r = q; + } + return r; +Invalid: + free(r); + errno = EILSEQ; + return NULL; +} diff --git a/net/http/encodeurl.c b/net/http/encodeurl.c new file mode 100644 index 000000000..b486a706f --- /dev/null +++ b/net/http/encodeurl.c @@ -0,0 +1,144 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/mem/mem.h" +#include "libc/str/str.h" +#include "net/http/escape.h" +#include "net/http/url.h" + +static size_t DimensionUrl(struct Url *h) { + size_t i, n; + n = 0; + n += h->scheme.n; + n += 1; + n += 2; + n += h->user.n * 3; + n += 1; + n += h->pass.n * 3; + n += 1; + n += 1; + n += h->host.n * 3; + n += 1; + n += 1; + n += h->port.n * 3; + n += 1; + n += h->path.n * 3; + n += 1; + n += h->params.n; + for (i = 0; i < h->params.n; ++i) { + n += h->params.p[i].key.n * 3; + n += 1; + n += h->params.p[i].val.n * 3; + } + n += 1; + n += h->fragment.n * 3; + n += 1; + return n; +} + +static bool NeedsSquareBrackets(struct Url *h) { + int c; + size_t i; + if (!memchr(h->host.p, ':', h->host.n)) return false; + if (h->pass.p) return true; + if (h->host.n >= 4 && h->host.p[0] == 'v' && h->host.p[2] == '.' && + kHexToInt[h->host.p[1] & 0xFF] != -1) { + for (i = 3; i < h->host.n; ++i) { + if (kEscapeIp[h->host.p[i] & 0xFF]) { + return false; + } + } + } else { + for (i = 0; i < h->host.n; ++i) { + c = h->host.p[i] & 0xFF; + if (!(kHexToInt[c] || c == '.' || c == ':')) { + return false; + } + } + } + return true; +} + +/** + * Encodes URL. + * + * @param z if not null receives string length of result + * @return nul-terminated url string needing free + * @see ParseUrl() + */ +char *EncodeUrl(struct Url *h, size_t *z) { + size_t i, n; + char *m, *p; + if ((p = m = malloc(DimensionUrl(h)))) { + if (h->scheme.n) { + p = mempcpy(p, h->scheme.p, h->scheme.n); + *p++ = ':'; + } + if (h->host.p) { + *p++ = '/'; + *p++ = '/'; + if (h->user.p) { + p = EscapeUrlView(p, &h->user, kEscapeAuthority); + if (h->pass.p) { + *p++ = ':'; + p = EscapeUrlView(p, &h->pass, kEscapeAuthority); + } + *p++ = '@'; + } + if (h->host.p) { + if (NeedsSquareBrackets(h)) { + *p++ = '['; + p = EscapeUrlView(p, &h->host, kEscapeIp); + *p++ = ']'; + } else { + p = EscapeUrlView(p, &h->host, kEscapeAuthority); + } + if (h->port.p) { + *p++ = ':'; + p = EscapeUrlView(p, &h->port, kEscapeAuthority); + } + } + if (h->path.n && h->path.p[0] != '/') { + *p++ = '/'; + } + } + p = EscapeUrlView(p, &h->path, kEscapePath); + if (h->params.p) { + *p++ = '?'; + for (i = 0; i < h->params.n; ++i) { + if (i) *p++ = '&'; + p = EscapeUrlView(p, &h->params.p[i].key, kEscapeParam); + if (h->params.p[i].val.p) { + *p++ = '='; + p = EscapeUrlView(p, &h->params.p[i].val, kEscapeParam); + } + } + } + if (h->fragment.p) { + *p++ = '#'; + p = EscapeUrlView(p, &h->fragment, kEscapeFragment); + } + n = p - m; + *p++ = '\0'; + if ((p = realloc(m, p - m))) m = p; + } else { + n = 0; + } + if (z) *z = n; + return m; +} diff --git a/net/http/escape.h b/net/http/escape.h index c8549cea3..734082ad6 100644 --- a/net/http/escape.h +++ b/net/http/escape.h @@ -1,20 +1,42 @@ #ifndef COSMOPOLITAN_NET_HTTP_ESCAPE_H_ #define COSMOPOLITAN_NET_HTTP_ESCAPE_H_ + +#define kControlWs 1 +#define kControlC0 2 +#define kControlC1 4 + #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ -struct EscapeResult { - char *data; - size_t size; -}; +extern const signed char kHexToInt[256]; +extern const char kEscapeAuthority[256]; +extern const char kEscapeIp[256]; +extern const char kEscapePath[256]; +extern const char kEscapeSegment[256]; +extern const char kEscapeParam[256]; +extern const char kEscapeFragment[256]; -struct EscapeResult EscapeHtml(const char *, size_t); -struct EscapeResult EscapeUrl(const char *, size_t, const char[hasatleast 256]); -struct EscapeResult EscapeUrlPath(const char *, size_t); -struct EscapeResult EscapeUrlParam(const char *, size_t); -struct EscapeResult EscapeUrlFragment(const char *, size_t); -struct EscapeResult EscapeUrlPathSegment(const char *, size_t); -struct EscapeResult EscapeJsStringLiteral(const char *, size_t); +char *EscapeHtml(const char *, size_t, size_t *); +char *EscapeUrl(const char *, size_t, size_t *, const char[256]); +char *EscapeUser(const char *, size_t, size_t *); +char *EscapePass(const char *, size_t, size_t *); +char *EscapeIp(const char *, size_t, size_t *); +char *EscapeHost(const char *, size_t, size_t *); +char *EscapePath(const char *, size_t, size_t *); +char *EscapeParam(const char *, size_t, size_t *); +char *EscapeFragment(const char *, size_t, size_t *); +char *EscapeSegment(const char *, size_t, size_t *); +char *EscapeJsStringLiteral(const char *, size_t, size_t *); + +bool HasControlCodes(const char *, size_t, int); +char *Underlong(const char *, size_t, size_t *); +char *DecodeLatin1(const char *, size_t, size_t *); +char *EncodeLatin1(const char *, size_t, size_t *, int); +char *EncodeHttpHeaderValue(const char *, size_t, size_t *); +char *VisualizeControlCodes(const char *, size_t, size_t *); +char *IndentLines(const char *, size_t, size_t *, size_t); +char *EncodeBase64(const char *, size_t, size_t *); +char *DecodeBase64(const char *, size_t, size_t *); COSMOPOLITAN_C_END_ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ diff --git a/net/http/escapefragment.c b/net/http/escapefragment.c new file mode 100644 index 000000000..a71d7cb08 --- /dev/null +++ b/net/http/escapefragment.c @@ -0,0 +1,31 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/escape.h" + +/** + * Escapes URL fragment. + * + * @param p is input value + * @param n if -1 implies strlen + * @param z if non-NULL receives output length + * @return allocated NUL-terminated buffer, or NULL w/ errno + */ +char *EscapeFragment(const char *p, size_t n, size_t *z) { + return EscapeUrl(p, n, z, kEscapeFragment); +} diff --git a/net/http/escapehost.c b/net/http/escapehost.c new file mode 100644 index 000000000..607ebb99b --- /dev/null +++ b/net/http/escapehost.c @@ -0,0 +1,31 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/escape.h" + +/** + * Escapes URL host or registry name. + * + * @param p is input value + * @param n if -1 implies strlen + * @param z if non-NULL receives output length + * @return allocated NUL-terminated buffer, or NULL w/ errno + */ +char *EscapeHost(const char *p, size_t n, size_t *z) { + return EscapeUrl(p, n, z, kEscapeAuthority); +} diff --git a/net/http/escapehtml.c b/net/http/escapehtml.c index 4e7f90f35..dcbf4921f 100644 --- a/net/http/escapehtml.c +++ b/net/http/escapehtml.c @@ -16,66 +16,74 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/str/str.h" #include "libc/x/x.h" #include "net/http/escape.h" /** * Escapes HTML entities. + * + * @param p is input value + * @param n if -1 implies strlen + * @param z if non-NULL receives output length + * @return allocated NUL-terminated buffer, or NULL w/ errno */ -struct EscapeResult EscapeHtml(const char *data, size_t size) { +char *EscapeHtml(const char *p, size_t n, size_t *z) { int c; - char *p; size_t i; - struct EscapeResult r; - p = r.data = xmalloc(size * 6 + 1); - for (i = 0; i < size; ++i) { - switch ((c = data[i])) { - case '&': - p[0] = '&'; - p[1] = 'a'; - p[2] = 'm'; - p[3] = 'p'; - p[4] = ';'; - p += 5; - break; - case '<': - p[0] = '&'; - p[1] = 'l'; - p[2] = 't'; - p[3] = ';'; - p += 4; - break; - case '>': - p[0] = '&'; - p[1] = 'g'; - p[2] = 't'; - p[3] = ';'; - p += 4; - break; - case '"': - p[0] = '&'; - p[1] = 'q'; - p[2] = 'u'; - p[3] = 'o'; - p[4] = 't'; - p[5] = ';'; - p += 6; - break; - case '\'': - p[0] = '&'; - p[1] = '#'; - p[2] = '3'; - p[3] = '9'; - p[4] = ';'; - p += 5; - break; - default: - *p++ = c; - break; + char *q, *r; + if (z) *z = 0; + if (n == -1) n = p ? strlen(p) : 0; + if ((q = r = malloc(n * 6 + 1))) { + for (i = 0; i < n; ++i) { + switch ((c = p[i])) { + case '&': + q[0] = '&'; + q[1] = 'a'; + q[2] = 'm'; + q[3] = 'p'; + q[4] = ';'; + q += 5; + break; + case '<': + q[0] = '&'; + q[1] = 'l'; + q[2] = 't'; + q[3] = ';'; + q += 4; + break; + case '>': + q[0] = '&'; + q[1] = 'g'; + q[2] = 't'; + q[3] = ';'; + q += 4; + break; + case '"': + q[0] = '&'; + q[1] = 'q'; + q[2] = 'u'; + q[3] = 'o'; + q[4] = 't'; + q[5] = ';'; + q += 6; + break; + case '\'': + q[0] = '&'; + q[1] = '#'; + q[2] = '3'; + q[3] = '9'; + q[4] = ';'; + q += 5; + break; + default: + *q++ = c; + break; + } } + if (z) *z = q - r; + *q++ = '\0'; + if ((q = realloc(r, q - r))) r = q; } - r.size = p - r.data; - r.data = xrealloc(r.data, r.size + 1); - r.data[r.size] = '\0'; return r; } diff --git a/net/http/escapeip.c b/net/http/escapeip.c new file mode 100644 index 000000000..f635121f6 --- /dev/null +++ b/net/http/escapeip.c @@ -0,0 +1,33 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/escape.h" + +/** + * Escapes URL IP-literal. + * + * This is the same as EscapeHost except colon is permitted. + * + * @param p is input value + * @param n if -1 implies strlen + * @param z if non-NULL receives output length + * @return allocated NUL-terminated buffer, or NULL w/ errno + */ +char *EscapeIp(const char *p, size_t n, size_t *z) { + return EscapeUrl(p, n, z, kEscapeAuthority); +} diff --git a/net/http/escapejsstringliteral.c b/net/http/escapejsstringliteral.c index 5e3e7cdae..ca8cf274f 100644 --- a/net/http/escapejsstringliteral.c +++ b/net/http/escapejsstringliteral.c @@ -31,186 +31,192 @@ * can't be encoded will use invalid codepoint markers. This function is * agnostic to numbers that have been used with malicious intent in the * past under buggy software. Noncanonical encodings such as overlong - * NUL are canonicalized as NUL. + * NUL are canonicalized as NUL. Therefore it isn't necessary to say + * EscapeJsStringLiteral(Underlong(𝑥)) since EscapeJsStringLiteral(𝑥) + * will do the same thing. + * + * @param p is input value + * @param n if -1 implies strlen + * @param out_size if non-NULL receives output length + * @return allocated NUL-terminated buffer, or NULL w/ errno */ -struct EscapeResult EscapeJsStringLiteral(const char *data, size_t size) { - char *p; +char *EscapeJsStringLiteral(const char *p, size_t n, size_t *z) { uint64_t w; - unsigned i, n; + char *q, *r; + size_t i, j, m; wint_t x, a, b; - const char *d, *e; - struct EscapeResult r; - d = data; - e = data + size; - p = r.data = xmalloc(size * 6 + 6 + 1); - while (d < e) { - x = *d++ & 0xff; - if (x >= 0300) { - a = ThomPikeByte(x); - n = ThomPikeLen(x) - 1; - if (d + n <= e) { - for (i = 0;;) { - b = d[i] & 0xff; - if (!ThomPikeCont(b)) break; - a = ThomPikeMerge(a, b); - if (++i == n) { - x = a; - d += i; - break; + if (z) *z = 0; + if (n == -1) n = p ? strlen(p) : 0; + if ((q = r = malloc(n * 6 + 6 + 1))) { + for (i = 0; i < n;) { + x = p[i++] & 0xff; + if (x >= 0300) { + a = ThomPikeByte(x); + m = ThomPikeLen(x) - 1; + if (i + m <= n) { + for (j = 0;;) { + b = p[i + j] & 0xff; + if (!ThomPikeCont(b)) break; + a = ThomPikeMerge(a, b); + if (++j == m) { + x = a; + i += j; + break; + } } } } + switch (x) { + case ' ': + case '!': + case '#': + case '$': + case '%': + case '(': + case ')': + case '*': + case '+': + case ',': + case '-': + case '.': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case ':': + case ';': + case '?': + case '@': + case 'A': + case 'B': + case 'C': + case 'D': + case 'E': + case 'F': + case 'G': + case 'H': + case 'I': + case 'J': + case 'K': + case 'L': + case 'M': + case 'N': + case 'O': + case 'P': + case 'Q': + case 'R': + case 'S': + case 'T': + case 'U': + case 'V': + case 'W': + case 'X': + case 'Y': + case 'Z': + case '[': + case ']': + case '^': + case '_': + case '`': + case 'a': + case 'b': + case 'c': + case 'd': + case 'e': + case 'f': + case 'g': + case 'h': + case 'i': + case 'j': + case 'k': + case 'l': + case 'm': + case 'n': + case 'o': + case 'p': + case 'q': + case 'r': + case 's': + case 't': + case 'u': + case 'v': + case 'w': + case 'x': + case 'y': + case 'z': + case '{': + case '|': + case '}': + case '~': + *q++ = x; + break; + case '\t': + q[0] = '\\'; + q[1] = 't'; + q += 2; + break; + case '\n': + q[0] = '\\'; + q[1] = 'n'; + q += 2; + break; + case '\r': + q[0] = '\\'; + q[1] = 'r'; + q += 2; + break; + case '\f': + q[0] = '\\'; + q[1] = 'f'; + q += 2; + break; + case '\\': + q[0] = '\\'; + q[1] = '\\'; + q += 2; + break; + case '/': + q[0] = '\\'; + q[1] = '/'; + q += 2; + break; + case '"': + q[0] = '\\'; + q[1] = '"'; + q += 2; + break; + case '\'': + q[0] = '\\'; + q[1] = '\''; + q += 2; + break; + case '<': + case '>': + case '&': + case '=': + default: + w = EncodeUtf16(x); + do { + q[0] = '\\'; + q[1] = 'u'; + q[2] = "0123456789abcdef"[(w & 0xF000) >> 014]; + q[3] = "0123456789abcdef"[(w & 0x0F00) >> 010]; + q[4] = "0123456789abcdef"[(w & 0x00F0) >> 004]; + q[5] = "0123456789abcdef"[(w & 0x000F) >> 000]; + q += 6; + } while ((w >>= 16)); + break; + } } - switch (x) { - case ' ': - case '!': - case '#': - case '$': - case '%': - case '(': - case ')': - case '*': - case '+': - case ',': - case '-': - case '.': - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - case ':': - case ';': - case '?': - case '@': - case 'A': - case 'B': - case 'C': - case 'D': - case 'E': - case 'F': - case 'G': - case 'H': - case 'I': - case 'J': - case 'K': - case 'L': - case 'M': - case 'N': - case 'O': - case 'P': - case 'Q': - case 'R': - case 'S': - case 'T': - case 'U': - case 'V': - case 'W': - case 'X': - case 'Y': - case 'Z': - case '[': - case ']': - case '^': - case '_': - case '`': - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - case 'g': - case 'h': - case 'i': - case 'j': - case 'k': - case 'l': - case 'm': - case 'n': - case 'o': - case 'p': - case 'q': - case 'r': - case 's': - case 't': - case 'u': - case 'v': - case 'w': - case 'x': - case 'y': - case 'z': - case '{': - case '|': - case '}': - case '~': - *p++ = x; - break; - case '\t': - p[0] = '\\'; - p[1] = 't'; - p += 2; - break; - case '\n': - p[0] = '\\'; - p[1] = 'n'; - p += 2; - break; - case '\r': - p[0] = '\\'; - p[1] = 'r'; - p += 2; - break; - case '\f': - p[0] = '\\'; - p[1] = 'f'; - p += 2; - break; - case '\\': - p[0] = '\\'; - p[1] = '\\'; - p += 2; - break; - case '/': - p[0] = '\\'; - p[1] = '/'; - p += 2; - break; - case '"': - p[0] = '\\'; - p[1] = '"'; - p += 2; - break; - case '\'': - p[0] = '\\'; - p[1] = '\''; - p += 2; - break; - case '<': - case '>': - case '&': - case '=': - default: - w = EncodeUtf16(x); - do { - p[0] = '\\'; - p[1] = 'u'; - p[2] = "0123456789abcdef"[(w & 0xF000) >> 014]; - p[3] = "0123456789abcdef"[(w & 0x0F00) >> 010]; - p[4] = "0123456789abcdef"[(w & 0x00F0) >> 004]; - p[5] = "0123456789abcdef"[(w & 0x000F) >> 000]; - p += 6; - } while ((w >>= 16)); - break; - } + if (z) *z = q - r; + *q++ = '\0'; + if ((q = realloc(r, q - r))) r = q; } - r.size = p - r.data; - r.data = xrealloc(r.data, r.size + 1); - r.data[r.size] = '\0'; return r; } diff --git a/net/http/escapeparam.c b/net/http/escapeparam.c new file mode 100644 index 000000000..e79a755e7 --- /dev/null +++ b/net/http/escapeparam.c @@ -0,0 +1,31 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/escape.h" + +/** + * Escapes query/form name/parameter. + * + * @param p is input value + * @param n if -1 implies strlen + * @param z if non-NULL receives output length + * @return allocated NUL-terminated buffer, or NULL w/ errno + */ +char *EscapeParam(const char *p, size_t n, size_t *z) { + return EscapeUrl(p, n, z, kEscapeParam); +} diff --git a/net/http/escapepass.c b/net/http/escapepass.c new file mode 100644 index 000000000..90b83c1a2 --- /dev/null +++ b/net/http/escapepass.c @@ -0,0 +1,31 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/escape.h" + +/** + * Escapes URL password. + * + * @param p is input value + * @param n if -1 implies strlen + * @param z if non-NULL receives output length + * @return allocated NUL-terminated buffer, or NULL w/ errno + */ +char *EscapePass(const char *p, size_t n, size_t *z) { + return EscapeUrl(p, n, z, kEscapeAuthority); +} diff --git a/net/http/escapepath.c b/net/http/escapepath.c new file mode 100644 index 000000000..610f19414 --- /dev/null +++ b/net/http/escapepath.c @@ -0,0 +1,33 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/escape.h" + +/** + * Escapes URL path. + * + * This is the same as EscapePathSegment() except slash is allowed. + * + * @param p is input value + * @param n if -1 implies strlen + * @param z if non-NULL receives output length + * @return allocated NUL-terminated buffer, or NULL w/ errno + */ +char *EscapePath(const char *p, size_t n, size_t *z) { + return EscapeUrl(p, n, z, kEscapePath); +} diff --git a/net/http/escapesegment.c b/net/http/escapesegment.c new file mode 100644 index 000000000..d0bae36ef --- /dev/null +++ b/net/http/escapesegment.c @@ -0,0 +1,34 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/escape.h" + +/** + * Escapes URL path segment. + * + * Please note this will URI encode the slash character. That's because + * segments are the labels between the slashes in a path. + * + * @param p is input value + * @param n if -1 implies strlen + * @param z if non-NULL receives output length + * @return allocated NUL-terminated buffer, or NULL w/ errno + */ +char *EscapeSegment(const char *p, size_t n, size_t *z) { + return EscapeUrl(p, n, z, kEscapeSegment); +} diff --git a/net/http/escapeurl.c b/net/http/escapeurl.c index 09dfddb1e..83657904e 100644 --- a/net/http/escapeurl.c +++ b/net/http/escapeurl.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/x/x.h" #include "net/http/escape.h" +#include "net/http/url.h" /** * Escapes URL component using generic table. @@ -25,29 +26,28 @@ * This function is agnostic to the underlying charset. * Always using UTF-8 is a good idea. * - * @see EscapeUrlParam - * @see EscapeUrlFragment - * @see EscapeUrlPathSegment + * @param p is input value + * @param n if -1 implies strlen + * @param z if non-NULL receives output length + * @return allocated NUL-terminated buffer, or NULL w/ errno + * @see kEscapeAuthority + * @see kEscapeIpLiteral + * @see kEscapePath + * @see kEscapePathSegment + * @see kEscapeParam + * @see kEscapeFragment */ -struct EscapeResult EscapeUrl(const char *data, size_t size, - const char xlat[hasatleast 256]) { - int c; - char *p; - size_t i; - struct EscapeResult r; - p = r.data = xmalloc(size * 6 + 1); - for (i = 0; i < size; ++i) { - if (!xlat[(c = data[i] & 0xff)]) { - *p++ = c; - } else { - p[0] = '%'; - p[1] = "0123456789ABCDEF"[(c & 0xF0) >> 4]; - p[2] = "0123456789ABCDEF"[(c & 0x0F) >> 0]; - p += 3; - } +char *EscapeUrl(const char *p, size_t n, size_t *z, const char T[256]) { + char *r, *q; + struct UrlView v; + if (n == -1) n = p ? strlen(p) : 0; + if (z) *z = 0; + if ((q = r = malloc(n * 6 + 1))) { + v.p = p, v.n = n; + q = EscapeUrlView(r, &v, T); + if (z) *z = q - r; + *q++ = '\0'; + if ((q = realloc(r, q - r))) r = q; } - r.size = p - r.data; - r.data = xrealloc(r.data, r.size + 1); - r.data[r.size] = '\0'; return r; } diff --git a/net/http/escapeurlview.c b/net/http/escapeurlview.c new file mode 100644 index 000000000..6132410ce --- /dev/null +++ b/net/http/escapeurlview.c @@ -0,0 +1,38 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/url.h" + +/** + * Escapes URL component using generic table w/ stpcpy() api. + */ +char *EscapeUrlView(char *p, struct UrlView *v, const char T[256]) { + int c; + size_t i; + for (i = 0; i < v->n; ++i) { + if (!T[(c = v->p[i] & 0xFF)]) { + *p++ = c; + } else { + p[0] = '%'; + p[1] = "0123456789ABCDEF"[(c & 0xF0) >> 4]; + p[2] = "0123456789ABCDEF"[(c & 0x0F) >> 0]; + p += 3; + } + } + return p; +} diff --git a/net/http/escapeuser.c b/net/http/escapeuser.c new file mode 100644 index 000000000..fc4cc5a57 --- /dev/null +++ b/net/http/escapeuser.c @@ -0,0 +1,31 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/escape.h" + +/** + * Escapes URL user name. + * + * @param p is input value + * @param n if -1 implies strlen + * @param z if non-NULL receives output length + * @return allocated NUL-terminated buffer, or NULL w/ errno + */ +char *EscapeUser(const char *p, size_t n, size_t *z) { + return EscapeUrl(p, n, z, kEscapeAuthority); +} diff --git a/net/http/gethttpheader.gperf b/net/http/gethttpheader.gperf index c092bb4ed..5b5dd0d12 100644 --- a/net/http/gethttpheader.gperf +++ b/net/http/gethttpheader.gperf @@ -9,63 +9,70 @@ %readonly-tables %struct-type %define lookup-function-name LookupHttpHeader -struct HttpHeaderSlot { char *name; char code; }; +struct thatispacked HttpHeaderSlot { char *name; char code; }; %% -Accept, kHttpAccept -Accept-Charset, kHttpAcceptCharset -Accept-Encoding, kHttpAcceptEncoding -Accept-Language, kHttpAcceptLanguage -Age, kHttpAge -Allow, kHttpAllow -Authorization, kHttpAuthorization -Cache-Control, kHttpCacheControl -Chunked, kHttpChunked -Close, kHttpClose -Connection, kHttpConnection -Content-Base, kHttpContentBase -Content-Encoding, kHttpContentEncoding -Content-Language, kHttpContentLanguage -Content-Length, kHttpContentLength -Content-Location, kHttpContentLocation -Content-Md5, kHttpContentMd5 -Content-Range, kHttpContentRange -Content-Type, kHttpContentType -Date, kHttpDate -ETag, kHttpEtag -Expires, kHttpExpires -From, kHttpFrom -Host, kHttpHost -If-Match, kHttpIfMatch -If-Modified-Since, kHttpIfModifiedSince -If-None-Match, kHttpIfNoneMatch -If-Range, kHttpIfRange -If-Unmodified-Since, kHttpIfUnmodifiedSince -Keep-Alive, kHttpKeepAlive -Max-Forwards, kHttpMaxForwards -Pragma, kHttpPragma -Proxy-Authenticate, kHttpProxyAuthenticate -Proxy-Authorization, kHttpProxyAuthorization -Proxy-Connection, kHttpProxyConnection -Range, kHttpRange -Referer, kHttpReferer -Transfer-Encoding, kHttpTransferEncoding -Upgrade, kHttpUpgrade -User-Agent, kHttpUserAgent -Via, kHttpVia -Location, kHttpLocation -Public, kHttpPublic -Retry-After, kHttpRetryAfter -Server, kHttpServer -Vary, kHttpVary -Warning, kHttpWarning -WWW-Authenticate, kHttpWwwAuthenticate -Last-Modified, kHttpLastModified -Cookie, kHttpCookie -Trailer, kHttpTrailer -TE, kHttpTe -DNT, kHttpDnt -Expect, kHttpExpect -Content-Disposition, kHttpContentDisposition -Content-Description, kHttpContentDescription -Origin, kHttpOrigin -Upgrade-Insecure-Requests, kHttpUpgradeInsecureRequests +Accept, kHttpAccept +Accept-Charset, kHttpAcceptCharset +Accept-Encoding, kHttpAcceptEncoding +Accept-Language, kHttpAcceptLanguage +Age, kHttpAge +Allow, kHttpAllow +Authorization, kHttpAuthorization +Cache-Control, kHttpCacheControl +Chunked, kHttpChunked +Link, kHttpLink +Connection, kHttpConnection +Content-Base, kHttpContentBase +Content-Encoding, kHttpContentEncoding +Content-Language, kHttpContentLanguage +Content-Length, kHttpContentLength +Content-Location, kHttpContentLocation +Content-MD5, kHttpContentMd5 +Content-Range, kHttpContentRange +Content-Type, kHttpContentType +Date, kHttpDate +ETag, kHttpEtag +Expires, kHttpExpires +From, kHttpFrom +Host, kHttpHost +If-Match, kHttpIfMatch +If-Modified-Since, kHttpIfModifiedSince +If-None-Match, kHttpIfNoneMatch +If-Range, kHttpIfRange +If-Unmodified-Since, kHttpIfUnmodifiedSince +Keep-Alive, kHttpKeepAlive +Max-Forwards, kHttpMaxForwards +Pragma, kHttpPragma +Proxy-Authenticate, kHttpProxyAuthenticate +Proxy-Authorization, kHttpProxyAuthorization +Proxy-Connection, kHttpProxyConnection +Range, kHttpRange +Referer, kHttpReferer +Transfer-Encoding, kHttpTransferEncoding +Upgrade, kHttpUpgrade +User-Agent, kHttpUserAgent +Via, kHttpVia +Location, kHttpLocation +Public, kHttpPublic +Retry-After, kHttpRetryAfter +Server, kHttpServer +Vary, kHttpVary +Warning, kHttpWarning +WWW-Authenticate, kHttpWwwAuthenticate +Last-Modified, kHttpLastModified +Trailer, kHttpTrailer +TE, kHttpTe +DNT, kHttpDnt +Expect, kHttpExpect +Content-Disposition, kHttpContentDisposition +Content-Description, kHttpContentDescription +Origin, kHttpOrigin +Upgrade-Insecure-Requests, kHttpUpgradeInsecureRequests +URI, kHttpUri +X-Csrf-Token, kHttpXCsrfToken +X-Forwarded-For, kHttpXForwardedFor +X-Forwarded-Host, kHttpXForwardedHost +X-Forwarded-Proto, kHttpXForwardedProto +X-Requested-With, kHttpXRequestedWith +Access-Control-Request-Method, kHttpAccessControlRequestMethod +Access-Control-Request-Headers, kHttpAccessControlRequestHeaders diff --git a/net/http/gethttpheader.inc b/net/http/gethttpheader.inc index 0c4affada..df72e6e38 100644 --- a/net/http/gethttpheader.inc +++ b/net/http/gethttpheader.inc @@ -36,14 +36,14 @@ #include "net/http/http.h" #define GPERF_DOWNCASE #line 12 "gethttpheader.gperf" -struct HttpHeaderSlot { char *name; char code; }; +struct thatispacked HttpHeaderSlot { char *name; char code; }; -#define TOTAL_KEYWORDS 58 +#define TOTAL_KEYWORDS 65 #define MIN_WORD_LENGTH 2 -#define MAX_WORD_LENGTH 25 +#define MAX_WORD_LENGTH 30 #define MIN_HASH_VALUE 2 -#define MAX_HASH_VALUE 97 -/* maximum key range = 96, duplicates = 0 */ +#define MAX_HASH_VALUE 102 +/* maximum key range = 101, duplicates = 0 */ #ifndef GPERF_DOWNCASE #define GPERF_DOWNCASE 1 @@ -72,7 +72,7 @@ static unsigned char gperf_downcase[256] = #ifndef GPERF_CASE_STRNCMP #define GPERF_CASE_STRNCMP 1 -static int +static inline int gperf_case_strncmp (register const char *s1, register const char *s2, register size_t n) { for (; n > 0;) @@ -102,32 +102,32 @@ hash (register const char *str, register size_t len) { static const unsigned char asso_values[] = { - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 30, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 5, 5, 30, 55, 0, - 35, 30, 0, 35, 98, 40, 0, 30, 0, 20, - 55, 98, 0, 5, 10, 5, 0, 5, 20, 30, - 98, 98, 98, 98, 98, 98, 98, 5, 5, 30, - 55, 0, 35, 30, 0, 35, 98, 40, 0, 30, - 0, 20, 55, 98, 0, 5, 10, 5, 0, 5, - 20, 30, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, - 98, 98, 98, 98, 98, 98 + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 30, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 10, 0, 10, 0, 5, + 0, 15, 25, 30, 103, 0, 0, 5, 0, 45, + 65, 103, 20, 55, 0, 30, 15, 10, 10, 40, + 103, 103, 103, 103, 103, 103, 103, 10, 0, 10, + 0, 5, 0, 15, 25, 30, 103, 0, 0, 5, + 0, 45, 65, 103, 20, 55, 0, 30, 15, 10, + 10, 40, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 103, 103, 103 }; register unsigned int hval = len; @@ -153,144 +153,157 @@ hash (register const char *str, register size_t len) return hval; } -static const struct HttpHeaderSlot * +static inline const struct thatispacked HttpHeaderSlot * LookupHttpHeader (register const char *str, register size_t len) { - static const struct HttpHeaderSlot wordlist[] = + static const struct thatispacked HttpHeaderSlot wordlist[] = { {""}, {""}, -#line 65 "gethttpheader.gperf" - {"TE", kHttpTe}, -#line 18 "gethttpheader.gperf" - {"Age", kHttpAge}, - {""}, {""}, -#line 58 "gethttpheader.gperf" - {"Server", kHttpServer}, -#line 60 "gethttpheader.gperf" - {"Warning", kHttpWarning}, -#line 54 "gethttpheader.gperf" - {"Via", kHttpVia}, - {""}, -#line 24 "gethttpheader.gperf" - {"Connection", kHttpConnection}, -#line 56 "gethttpheader.gperf" - {"Public", kHttpPublic}, -#line 22 "gethttpheader.gperf" - {"Chunked", kHttpChunked}, -#line 66 "gethttpheader.gperf" - {"DNT", kHttpDnt}, -#line 33 "gethttpheader.gperf" - {"Date", kHttpDate}, - {""}, {""}, {""}, {""}, -#line 37 "gethttpheader.gperf" - {"Host", kHttpHost}, -#line 53 "gethttpheader.gperf" - {"User-Agent", kHttpUserAgent}, -#line 57 "gethttpheader.gperf" - {"Retry-After", kHttpRetryAfter}, -#line 51 "gethttpheader.gperf" - {"Transfer-Encoding", kHttpTransferEncoding}, - {""}, -#line 28 "gethttpheader.gperf" - {"Content-Length", kHttpContentLength}, -#line 19 "gethttpheader.gperf" - {"Allow", kHttpAllow}, -#line 26 "gethttpheader.gperf" - {"Content-Encoding", kHttpContentEncoding}, -#line 25 "gethttpheader.gperf" - {"Content-Base", kHttpContentBase}, -#line 31 "gethttpheader.gperf" - {"Content-Range", kHttpContentRange}, -#line 69 "gethttpheader.gperf" - {"Content-Description", kHttpContentDescription}, -#line 23 "gethttpheader.gperf" - {"Close", kHttpClose}, -#line 27 "gethttpheader.gperf" - {"Content-Language", kHttpContentLanguage}, - {""}, -#line 20 "gethttpheader.gperf" - {"Authorization", kHttpAuthorization}, -#line 59 "gethttpheader.gperf" - {"Vary", kHttpVary}, -#line 49 "gethttpheader.gperf" - {"Range", kHttpRange}, -#line 14 "gethttpheader.gperf" - {"Accept", kHttpAccept}, -#line 52 "gethttpheader.gperf" - {"Upgrade", kHttpUpgrade}, -#line 41 "gethttpheader.gperf" - {"If-Range", kHttpIfRange}, -#line 34 "gethttpheader.gperf" - {"ETag", kHttpEtag}, - {""}, -#line 45 "gethttpheader.gperf" - {"Pragma", kHttpPragma}, -#line 50 "gethttpheader.gperf" - {"Referer", kHttpReferer}, -#line 55 "gethttpheader.gperf" - {"Location", kHttpLocation}, - {""}, -#line 17 "gethttpheader.gperf" - {"Accept-Language", kHttpAcceptLanguage}, -#line 29 "gethttpheader.gperf" - {"Content-Location", kHttpContentLocation}, #line 64 "gethttpheader.gperf" - {"Trailer", kHttpTrailer}, -#line 40 "gethttpheader.gperf" - {"If-None-Match", kHttpIfNoneMatch}, + {"TE", kHttpTe}, +#line 65 "gethttpheader.gperf" + {"DNT", kHttpDnt}, +#line 23 "gethttpheader.gperf" + {"Link", kHttpLink}, + {""}, +#line 56 "gethttpheader.gperf" + {"Public", kHttpPublic}, + {""}, +#line 18 "gethttpheader.gperf" + {"Age", kHttpAge}, +#line 33 "gethttpheader.gperf" + {"Date", kHttpDate}, +#line 24 "gethttpheader.gperf" + {"Connection", kHttpConnection}, +#line 30 "gethttpheader.gperf" + {"Content-MD5", kHttpContentMd5}, +#line 50 "gethttpheader.gperf" + {"Referer", kHttpReferer}, +#line 54 "gethttpheader.gperf" + {"Via", kHttpVia}, + {""}, {""}, +#line 26 "gethttpheader.gperf" + {"Content-Encoding", kHttpContentEncoding}, + {""}, {""}, +#line 28 "gethttpheader.gperf" + {"Content-Length", kHttpContentLength}, +#line 49 "gethttpheader.gperf" + {"Range", kHttpRange}, +#line 14 "gethttpheader.gperf" + {"Accept", kHttpAccept}, +#line 25 "gethttpheader.gperf" + {"Content-Base", kHttpContentBase}, +#line 31 "gethttpheader.gperf" + {"Content-Range", kHttpContentRange}, +#line 68 "gethttpheader.gperf" + {"Content-Description", kHttpContentDescription}, + {""}, +#line 27 "gethttpheader.gperf" + {"Content-Language", kHttpContentLanguage}, +#line 60 "gethttpheader.gperf" + {"Warning", kHttpWarning}, +#line 55 "gethttpheader.gperf" + {"Location", kHttpLocation}, +#line 34 "gethttpheader.gperf" + {"ETag", kHttpEtag}, +#line 17 "gethttpheader.gperf" + {"Accept-Language", kHttpAcceptLanguage}, +#line 45 "gethttpheader.gperf" + {"Pragma", kHttpPragma}, +#line 51 "gethttpheader.gperf" + {"Transfer-Encoding", kHttpTransferEncoding}, +#line 71 "gethttpheader.gperf" + {"URI", kHttpUri}, + {""}, +#line 53 "gethttpheader.gperf" + {"User-Agent", kHttpUserAgent}, +#line 57 "gethttpheader.gperf" + {"Retry-After", kHttpRetryAfter}, +#line 22 "gethttpheader.gperf" + {"Chunked", kHttpChunked}, +#line 20 "gethttpheader.gperf" + {"Authorization", kHttpAuthorization}, #line 15 "gethttpheader.gperf" - {"Accept-Charset", kHttpAcceptCharset}, + {"Accept-Charset", kHttpAcceptCharset}, +#line 16 "gethttpheader.gperf" + {"Accept-Encoding", kHttpAcceptEncoding}, +#line 58 "gethttpheader.gperf" + {"Server", kHttpServer}, +#line 52 "gethttpheader.gperf" + {"Upgrade", kHttpUpgrade}, +#line 38 "gethttpheader.gperf" + {"If-Match", kHttpIfMatch}, +#line 77 "gethttpheader.gperf" + {"Access-Control-Request-Method", kHttpAccessControlRequestMethod}, +#line 78 "gethttpheader.gperf" + {"Access-Control-Request-Headers", kHttpAccessControlRequestHeaders}, +#line 76 "gethttpheader.gperf" + {"X-Requested-With", kHttpXRequestedWith}, +#line 63 "gethttpheader.gperf" + {"Trailer", kHttpTrailer}, +#line 21 "gethttpheader.gperf" + {"Cache-Control", kHttpCacheControl}, +#line 67 "gethttpheader.gperf" + {"Content-Disposition", kHttpContentDisposition}, +#line 19 "gethttpheader.gperf" + {"Allow", kHttpAllow}, +#line 69 "gethttpheader.gperf" + {"Origin", kHttpOrigin}, +#line 32 "gethttpheader.gperf" + {"Content-Type", kHttpContentType}, +#line 40 "gethttpheader.gperf" + {"If-None-Match", kHttpIfNoneMatch}, +#line 36 "gethttpheader.gperf" + {"From", kHttpFrom}, {""}, #line 61 "gethttpheader.gperf" - {"WWW-Authenticate", kHttpWwwAuthenticate}, -#line 32 "gethttpheader.gperf" - {"Content-Type", kHttpContentType}, -#line 21 "gethttpheader.gperf" - {"Cache-Control", kHttpCacheControl}, -#line 36 "gethttpheader.gperf" - {"From", kHttpFrom}, -#line 71 "gethttpheader.gperf" - {"Upgrade-Insecure-Requests", kHttpUpgradeInsecureRequests}, -#line 48 "gethttpheader.gperf" - {"Proxy-Connection", kHttpProxyConnection}, - {""}, -#line 46 "gethttpheader.gperf" - {"Proxy-Authenticate", kHttpProxyAuthenticate}, -#line 47 "gethttpheader.gperf" - {"Proxy-Authorization", kHttpProxyAuthorization}, - {""}, -#line 67 "gethttpheader.gperf" - {"Expect", kHttpExpect}, -#line 44 "gethttpheader.gperf" - {"Max-Forwards", kHttpMaxForwards}, -#line 62 "gethttpheader.gperf" - {"Last-Modified", kHttpLastModified}, -#line 68 "gethttpheader.gperf" - {"Content-Disposition", kHttpContentDisposition}, -#line 43 "gethttpheader.gperf" - {"Keep-Alive", kHttpKeepAlive}, -#line 63 "gethttpheader.gperf" - {"Cookie", kHttpCookie}, - {""}, -#line 38 "gethttpheader.gperf" - {"If-Match", kHttpIfMatch}, - {""}, {""}, -#line 70 "gethttpheader.gperf" - {"Origin", kHttpOrigin}, - {""}, {""}, {""}, -#line 16 "gethttpheader.gperf" - {"Accept-Encoding", kHttpAcceptEncoding}, -#line 30 "gethttpheader.gperf" - {"Content-Md5", kHttpContentMd5}, + {"WWW-Authenticate", kHttpWwwAuthenticate}, #line 39 "gethttpheader.gperf" - {"If-Modified-Since", kHttpIfModifiedSince}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {"If-Modified-Since", kHttpIfModifiedSince}, +#line 41 "gethttpheader.gperf" + {"If-Range", kHttpIfRange}, +#line 37 "gethttpheader.gperf" + {"Host", kHttpHost}, +#line 70 "gethttpheader.gperf" + {"Upgrade-Insecure-Requests", kHttpUpgradeInsecureRequests}, +#line 29 "gethttpheader.gperf" + {"Content-Location", kHttpContentLocation}, {""}, {""}, +#line 59 "gethttpheader.gperf" + {"Vary", kHttpVary}, +#line 73 "gethttpheader.gperf" + {"X-Forwarded-For", kHttpXForwardedFor}, +#line 74 "gethttpheader.gperf" + {"X-Forwarded-Host", kHttpXForwardedHost}, +#line 75 "gethttpheader.gperf" + {"X-Forwarded-Proto", kHttpXForwardedProto}, +#line 62 "gethttpheader.gperf" + {"Last-Modified", kHttpLastModified}, + {""}, {""}, +#line 48 "gethttpheader.gperf" + {"Proxy-Connection", kHttpProxyConnection}, +#line 44 "gethttpheader.gperf" + {"Max-Forwards", kHttpMaxForwards}, + {""}, {""}, {""}, +#line 66 "gethttpheader.gperf" + {"Expect", kHttpExpect}, +#line 72 "gethttpheader.gperf" + {"X-Csrf-Token", kHttpXCsrfToken}, + {""}, #line 42 "gethttpheader.gperf" - {"If-Unmodified-Since", kHttpIfUnmodifiedSince}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {"If-Unmodified-Since", kHttpIfUnmodifiedSince}, + {""}, {""}, {""}, {""}, {""}, +#line 43 "gethttpheader.gperf" + {"Keep-Alive", kHttpKeepAlive}, + {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, + {""}, {""}, {""}, +#line 46 "gethttpheader.gperf" + {"Proxy-Authenticate", kHttpProxyAuthenticate}, +#line 47 "gethttpheader.gperf" + {"Proxy-Authorization", kHttpProxyAuthorization}, + {""}, {""}, #line 35 "gethttpheader.gperf" - {"Expires", kHttpExpires} + {"Expires", kHttpExpires} }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) diff --git a/net/http/gethttpheadername.c b/net/http/gethttpheadername.c index 8f7212f7e..5c212ce60 100644 --- a/net/http/gethttpheadername.c +++ b/net/http/gethttpheadername.c @@ -38,8 +38,8 @@ const char *GetHttpHeaderName(int h) { return "Cache-Control"; case kHttpChunked: return "Chunked"; - case kHttpClose: - return "Close"; + case kHttpLink: + return "Link"; case kHttpConnection: return "Connection"; case kHttpContentBase: @@ -53,7 +53,7 @@ const char *GetHttpHeaderName(int h) { case kHttpContentLocation: return "Content-Location"; case kHttpContentMd5: - return "Content-Md5"; + return "Content-MD5"; case kHttpContentRange: return "Content-Range"; case kHttpContentType: @@ -118,8 +118,6 @@ const char *GetHttpHeaderName(int h) { return "WWW-Authenticate"; case kHttpLastModified: return "Last-Modified"; - case kHttpCookie: - return "Cookie"; case kHttpTrailer: return "Trailer"; case kHttpTe: @@ -136,6 +134,22 @@ const char *GetHttpHeaderName(int h) { return "Origin"; case kHttpUpgradeInsecureRequests: return "Upgrade-Insecure-Requests"; + case kHttpUri: + return "URI"; + case kHttpXCsrfToken: + return "X-Csrf-Token"; + case kHttpXForwardedFor: + return "X-Forwarded-For"; + case kHttpXForwardedHost: + return "X-Forwarded-Host"; + case kHttpXForwardedProto: + return "X-Forwarded-Proto"; + case kHttpXRequestedWith: + return "X-Requested-With"; + case kHttpAccessControlRequestMethod: + return "Access-Control-Request-Method"; + case kHttpAccessControlRequestHeaders: + return "Access-Control-Request-Headers"; default: return NULL; } diff --git a/net/http/gethttpmethod.c b/net/http/gethttpmethod.c index b53e084e0..a21d7c134 100644 --- a/net/http/gethttpmethod.c +++ b/net/http/gethttpmethod.c @@ -20,13 +20,13 @@ #include "net/http/http.h" /** - * Returns small number for HTTP method, or -1 if not found. + * Returns small number for HTTP method, or 0 if not found. */ int GetHttpMethod(const char *str, size_t len) { const struct HttpMethodSlot *slot; if ((slot = LookupHttpMethod(str, len))) { return slot->code; } else { - return -1; + return 0; } } diff --git a/net/http/gethttpmethod.inc b/net/http/gethttpmethod.inc index 38d487254..8d45d2fd9 100644 --- a/net/http/gethttpmethod.inc +++ b/net/http/gethttpmethod.inc @@ -1,6 +1,7 @@ /* ANSI-C code produced by gperf version 3.1 */ /* Command-line: gperf gethttpmethod.gperf */ /* Computed positions: -k'1-2' */ +/* clang-format off */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ @@ -71,7 +72,7 @@ static unsigned char gperf_downcase[256] = #ifndef GPERF_CASE_STRNCMP #define GPERF_CASE_STRNCMP 1 -static int +static inline int gperf_case_strncmp (register const char *s1, register const char *s2, register size_t n) { for (; n > 0;) @@ -131,7 +132,7 @@ hash (register const char *str, register size_t len) return len + asso_values[(unsigned char)str[1]] + asso_values[(unsigned char)str[0]]; } -const struct HttpMethodSlot * +static inline const struct HttpMethodSlot * LookupHttpMethod (register const char *str, register size_t len) { static const struct HttpMethodSlot wordlist[] = @@ -153,7 +154,7 @@ LookupHttpMethod (register const char *str, register size_t len) {""}, #line 27 "gethttpmethod.gperf" {"NOTIFY", kHttpNotify}, -#line 20 "gethttpmethod.gperf" +#line 19 "gethttpmethod.gperf" {"OPTIONS", kHttpOptions}, {""}, #line 22 "gethttpmethod.gperf" @@ -162,7 +163,7 @@ LookupHttpMethod (register const char *str, register size_t len) {"MERGE", kHttpMerge}, #line 29 "gethttpmethod.gperf" {"REPORT", kHttpReport}, -#line 19 "gethttpmethod.gperf" +#line 20 "gethttpmethod.gperf" {"CONNECT", kHttpConnect}, {""}, #line 26 "gethttpmethod.gperf" diff --git a/net/http/getipcategoryname.c b/net/http/getipcategoryname.c new file mode 100644 index 000000000..db2a7dd90 --- /dev/null +++ b/net/http/getipcategoryname.c @@ -0,0 +1,68 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/ip.h" + +/** + * Describes IP address. + * @see CategorizeIp() + */ +const char *GetIpCategoryName(int c) { + switch (c) { + case kIpMulticast: + return "MULTICAST"; + case kIpLoopback: + return "LOOPBACK"; + case kIpPrivate: + return "PRIVATE"; + case kIpTestnet: + return "TESTNET"; + case kIpAfrinic: + return "AFRINIC"; + case kIpLacnic: + return "LACNIC"; + case kIpApnic: + return "APNIC"; + case kIpArin: + return "ARIN"; + case kIpRipe: + return "RIPE"; + case kIpDod: + return "DOD"; + case kIpAtt: + return "AT&T"; + case kIpApple: + return "APPLE"; + case kIpFord: + return "FORD"; + case kIpCogent: + return "COGENT"; + case kIpPrudential: + return "PRUDENTIAL"; + case kIpUsps: + return "USPS"; + case kIpComcast: + return "COMCAST"; + case kIpFuture: + return "FUTURE"; + case kIpAnonymous: + return "ANONYMOUS"; + default: + return NULL; + } +} diff --git a/net/http/hascontrolcodes.c b/net/http/hascontrolcodes.c new file mode 100644 index 000000000..7748bb48e --- /dev/null +++ b/net/http/hascontrolcodes.c @@ -0,0 +1,69 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/errno.h" +#include "libc/intrin/pcmpgtb.h" +#include "libc/intrin/pmovmskb.h" +#include "libc/mem/mem.h" +#include "libc/stdio/stdio.h" +#include "libc/str/str.h" +#include "libc/str/thompike.h" +#include "net/http/escape.h" + +/** + * Returns true if C0 or C1 control codes are present + * + * @param p is input value + * @param n if -1 implies strlen + * @param f can have kControlWs, kControlC0, kControlC1 to forbid + * @return true if forbidden characters were found + * @see VisualizeControlCodes() + */ +bool HasControlCodes(const char *p, size_t n, int f) { + int c; + wint_t x, a, b; + size_t i, j, m; + if (n == -1) n = p ? strlen(p) : 0; + for (i = 0; i < n;) { + x = p[i++] & 0xff; + if (x >= 0300) { + a = ThomPikeByte(x); + m = ThomPikeLen(x) - 1; + if (i + m <= n) { + for (j = 0;;) { + b = p[i + j] & 0xff; + if (!ThomPikeCont(b)) break; + a = ThomPikeMerge(a, b); + if (++j == m) { + x = a; + i += j; + break; + } + } + } + } + if (((f & kControlC1) && 0x80 <= x && x < 0xA0) || + ((f & kControlC0) && (x < 32 || x == 0x7F) && + !(x == '\t' || x == '\r' || x == '\n' || x == '\v')) || + ((f & kControlWs) && + (x == '\t' || x == '\r' || x == '\n' || x == '\v'))) { + return true; + } + } + return false; +} diff --git a/net/http/headerhassubstring.c b/net/http/headerhassubstring.c new file mode 100644 index 000000000..75ccca9ee --- /dev/null +++ b/net/http/headerhassubstring.c @@ -0,0 +1,54 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/assert.h" +#include "libc/str/str.h" +#include "net/http/http.h" + +/** + * Returns true if standard header has substring. + * + * @param m is message parsed by ParseHttpRequest + * @param b is buffer that ParseHttpRequest parsed + * @param h is known header, e.g. kHttpAcceptEncoding + * @param s should not contain comma + * @param n is byte length of s where -1 implies strlen + * @return true if substring present + */ +bool HeaderHas(struct HttpRequest *m, const char *b, int h, const char *s, + size_t n) { + size_t i; + assert(0 <= h && h < kHttpHeadersMax); + if (n == -1) n = s ? strlen(s) : 0; + if (m->headers[h].a) { + if (memmem(b + m->headers[h].a, m->headers[h].b - m->headers[h].a, s, n)) { + return true; + } + if (kHttpRepeatable[h]) { + for (i = 0; i < m->xheaders.n; ++i) { + if (GetHttpHeader(b + m->xheaders.p[i].k.a, + m->xheaders.p[i].k.b - m->xheaders.p[i].k.a) == h && + memmem(b + m->xheaders.p[i].v.a, + m->xheaders.p[i].v.b - m->xheaders.p[i].v.a, s, n)) { + return true; + } + } + } + } + return false; +} diff --git a/net/http/http.h b/net/http/http.h index 79766d17a..83e619947 100644 --- a/net/http/http.h +++ b/net/http/http.h @@ -1,85 +1,91 @@ #ifndef COSMOPOLITAN_LIBC_HTTP_HTTP_H_ #define COSMOPOLITAN_LIBC_HTTP_HTTP_H_ -#include "libc/alg/alg.h" #include "libc/time/struct/tm.h" -#define kHttpGet 0 -#define kHttpHead 1 -#define kHttpPost 2 -#define kHttpPut 3 -#define kHttpDelete 4 -#define kHttpOptions 5 -#define kHttpConnect 6 -#define kHttpTrace 7 -#define kHttpCopy 8 -#define kHttpLock 9 -#define kHttpMerge 10 -#define kHttpMkcol 11 -#define kHttpMove 12 -#define kHttpNotify 13 -#define kHttpPatch 14 -#define kHttpReport 15 -#define kHttpUnlock 16 +#define kHttpGet 1 +#define kHttpHead 2 +#define kHttpPost 3 +#define kHttpPut 4 +#define kHttpDelete 5 +#define kHttpOptions 6 +#define kHttpConnect 7 +#define kHttpTrace 8 +#define kHttpCopy 9 +#define kHttpLock 10 +#define kHttpMerge 11 +#define kHttpMkcol 12 +#define kHttpMove 13 +#define kHttpNotify 14 +#define kHttpPatch 15 +#define kHttpReport 16 +#define kHttpUnlock 17 -#define kHttpAccept 0 -#define kHttpAcceptCharset 1 -#define kHttpAcceptEncoding 2 -#define kHttpAcceptLanguage 3 -#define kHttpAge 4 -#define kHttpAllow 5 -#define kHttpAuthorization 6 -#define kHttpCacheControl 7 -#define kHttpChunked 8 -#define kHttpClose 9 -#define kHttpConnection 10 -#define kHttpContentBase 11 -#define kHttpContentEncoding 12 -#define kHttpContentLanguage 13 -#define kHttpContentLength 14 -#define kHttpContentLocation 15 -#define kHttpContentMd5 16 -#define kHttpContentRange 17 -#define kHttpContentType 18 -#define kHttpDate 19 -#define kHttpEtag 20 -#define kHttpExpires 21 -#define kHttpFrom 22 -#define kHttpHost 23 -#define kHttpIfMatch 24 -#define kHttpIfModifiedSince 25 -#define kHttpIfNoneMatch 26 -#define kHttpIfRange 27 -#define kHttpIfUnmodifiedSince 28 -#define kHttpKeepAlive 29 -#define kHttpMaxForwards 30 -#define kHttpPragma 31 -#define kHttpProxyAuthenticate 32 -#define kHttpProxyAuthorization 33 -#define kHttpProxyConnection 34 -#define kHttpRange 35 -#define kHttpReferer 36 -#define kHttpTransferEncoding 37 -#define kHttpUpgrade 38 -#define kHttpUserAgent 39 -#define kHttpVia 40 -#define kHttpLocation 41 -#define kHttpPublic 42 -#define kHttpRetryAfter 43 -#define kHttpServer 44 -#define kHttpVary 45 -#define kHttpWarning 46 -#define kHttpWwwAuthenticate 47 -#define kHttpLastModified 48 -#define kHttpCookie 49 -#define kHttpTrailer 50 -#define kHttpTe 51 -#define kHttpDnt 52 -#define kHttpExpect 53 -#define kHttpContentDisposition 54 -#define kHttpContentDescription 55 -#define kHttpOrigin 56 -#define kHttpUpgradeInsecureRequests 57 -#define kHttpHeadersMax 58 +#define kHttpAccept 0 +#define kHttpAcceptCharset 1 +#define kHttpAcceptEncoding 2 +#define kHttpAcceptLanguage 3 +#define kHttpAge 4 +#define kHttpAllow 5 +#define kHttpAuthorization 6 +#define kHttpCacheControl 7 +#define kHttpChunked 8 +#define kHttpLink 9 +#define kHttpConnection 10 +#define kHttpContentBase 11 +#define kHttpContentEncoding 12 +#define kHttpContentLanguage 13 +#define kHttpContentLength 14 +#define kHttpContentLocation 15 +#define kHttpContentMd5 16 +#define kHttpContentRange 17 +#define kHttpContentType 18 +#define kHttpDate 19 +#define kHttpEtag 20 +#define kHttpExpires 21 +#define kHttpFrom 22 +#define kHttpHost 23 +#define kHttpIfMatch 24 +#define kHttpIfModifiedSince 25 +#define kHttpIfNoneMatch 26 +#define kHttpIfRange 27 +#define kHttpIfUnmodifiedSince 28 +#define kHttpKeepAlive 29 +#define kHttpMaxForwards 30 +#define kHttpPragma 31 +#define kHttpProxyAuthenticate 32 +#define kHttpProxyAuthorization 33 +#define kHttpProxyConnection 34 +#define kHttpRange 35 +#define kHttpReferer 36 +#define kHttpTransferEncoding 37 +#define kHttpUpgrade 38 +#define kHttpUserAgent 39 +#define kHttpVia 40 +#define kHttpLocation 41 +#define kHttpPublic 42 +#define kHttpRetryAfter 43 +#define kHttpServer 44 +#define kHttpVary 45 +#define kHttpWarning 46 +#define kHttpWwwAuthenticate 47 +#define kHttpLastModified 48 +#define kHttpTrailer 49 +#define kHttpTe 50 +#define kHttpDnt 51 +#define kHttpExpect 52 +#define kHttpContentDisposition 53 +#define kHttpContentDescription 54 +#define kHttpOrigin 55 +#define kHttpUpgradeInsecureRequests 56 +#define kHttpUri 57 +#define kHttpXCsrfToken 58 +#define kHttpXForwardedFor 59 +#define kHttpXForwardedHost 60 +#define kHttpXForwardedProto 61 +#define kHttpXRequestedWith 62 +#define kHttpAccessControlRequestMethod 63 +#define kHttpAccessControlRequestHeaders 64 +#define kHttpHeadersMax 65 #if !(__ASSEMBLER__ + __LINKER__ + 0) COSMOPOLITAN_C_START_ @@ -89,14 +95,17 @@ struct HttpRequestSlice { }; struct HttpRequest { - int i, t, a, method; + int i, a; + unsigned char t; + unsigned char method; + unsigned char version; struct HttpRequestSlice k; struct HttpRequestSlice uri; - struct HttpRequestSlice version; struct HttpRequestSlice scratch; struct HttpRequestSlice headers[kHttpHeadersMax]; + struct HttpRequestSlice xmethod; struct HttpRequestHeaders { - size_t n; + unsigned n; struct HttpRequestHeader { struct HttpRequestSlice k; struct HttpRequestSlice v; @@ -104,28 +113,30 @@ struct HttpRequest { } xheaders; }; -extern const char kHttpMethod[17][8]; +extern const char kHttpToken[256]; +extern const char kHttpMethod[18][8]; +extern const bool kHttpRepeatable[kHttpHeadersMax]; +const char *GetHttpReason(int); +const char *GetHttpHeaderName(int); int GetHttpHeader(const char *, size_t); int GetHttpMethod(const char *, size_t); void InitHttpRequest(struct HttpRequest *); void DestroyHttpRequest(struct HttpRequest *); int ParseHttpRequest(struct HttpRequest *, const char *, size_t); -int NegotiateHttpRequest(int, const char *, uint32_t *, char *, uint32_t *, - uint32_t *, bool, long double); -ssize_t ParseContentLength(const char *, size_t); +bool HeaderHas(struct HttpRequest *, const char *, int, const char *, size_t); +int64_t ParseContentLength(const char *, size_t); char *FormatHttpDateTime(char[hasatleast 30], struct tm *); bool ParseHttpRange(const char *, size_t, long, long *, long *); -unsigned ParseHttpVersion(const char *, size_t); int64_t ParseHttpDateTime(const char *, size_t); -const char *GetHttpReason(int); -const char *GetHttpHeaderName(int); -char *DecodeLatin1(const char *, size_t, size_t *); bool IsValidHttpToken(const char *, size_t); -char *EncodeHttpHeaderValue(const char *, size_t, size_t *); -char *VisualizeControlCodes(const char *, size_t, size_t *); -char *IndentLines(const char *, size_t, size_t *, size_t); -bool IsAcceptableHttpRequestPath(const char *, size_t); +bool IsAcceptablePath(const char *, size_t); +bool IsAcceptableHost(const char *, size_t); +bool IsAcceptablePort(const char *, size_t); +bool IsReasonablePath(const char *, size_t); +int64_t ParseIp(const char *, size_t); +int ParseForwarded(const char *, size_t, uint32_t *, uint16_t *); +bool IsMimeType(const char *, size_t, const char *); COSMOPOLITAN_C_END_ #endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ diff --git a/net/http/http.mk b/net/http/http.mk index 3fda57113..ab54e525f 100644 --- a/net/http/http.mk +++ b/net/http/http.mk @@ -53,6 +53,21 @@ $(NET_HTTP_A).pkg: \ $(NET_HTTP_A_OBJS) \ $(foreach x,$(NET_HTTP_A_DIRECTDEPS),$($(x)_A).pkg) +o/$(MODE)/net/http/categorizeip.o \ +o/$(MODE)/net/http/getipcategoryname.o \ +o/$(MODE)/net/http/isafrinicip.o \ +o/$(MODE)/net/http/isanonymousip.o \ +o/$(MODE)/net/http/isapnicip.o \ +o/$(MODE)/net/http/isarinip.o \ +o/$(MODE)/net/http/isdodip.o \ +o/$(MODE)/net/http/islacnicip.o \ +o/$(MODE)/net/http/isloopbackip.o \ +o/$(MODE)/net/http/ismulticastip.o \ +o/$(MODE)/net/http/isripeip.o \ +o/$(MODE)/net/http/istestnetip.o: \ + OVERRIDE_CFLAGS += \ + -Os + o/$(MODE)/net/http/formathttpdatetime.o: \ OVERRIDE_CFLAGS += \ -O3 diff --git a/net/http/indentlines.c b/net/http/indentlines.c index 2bd9aa1fa..7f94a9ae4 100644 --- a/net/http/indentlines.c +++ b/net/http/indentlines.c @@ -18,40 +18,46 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" #include "libc/x/x.h" -#include "net/http/http.h" +#include "net/http/escape.h" /** * Inserts spaces before lines. * - * @param data is input value - * @param size if -1 implies strlen - * @param out_size if non-NULL receives output length on success - * @param amt is number of spaces to use + * @param p is input value + * @param n if -1 implies strlen + * @param z if non-NULL receives output length + * @param j is number of spaces to use * @return allocated NUL-terminated buffer, or NULL w/ errno */ -char *IndentLines(const char *data, size_t size, size_t *out_size, size_t amt) { - char *r; - const char *p; - size_t i, n, m, a; - if (size == -1) size = strlen(data); +char *IndentLines(const char *p, size_t n, size_t *z, size_t j) { + char *r, *q; + const char *l; + size_t i, t, m, a; + if (n == -1) n = p ? strlen(p) : 0; r = 0; - n = 0; + t = 0; do { - if ((p = memchr(data, '\n', size))) { - m = p + 1 - data; - a = *data != '\r' && *data != '\n' ? amt : 0; + if ((l = memchr(p, '\n', n))) { + m = l + 1 - p; + a = *p != '\r' && *p != '\n' ? j : 0; } else { - m = size; - a = size ? amt : 0; + m = n; + a = n ? j : 0; } - r = xrealloc(r, n + a + m + 1); - memset(r + n, ' ', a); - memcpy(r + n + a, data, m); - n += a + m; - data += m; - size -= m; - } while (p); - if (out_size) *out_size = n; - r[n] = '\0'; + if ((q = realloc(r, t + a + m + 1))) { + r = q; + } else { + free(r); + if (z) *z = 0; + return 0; + } + memset(r + t, ' ', a); + memcpy(r + t + a, p, m); + t += a + m; + p += m; + n -= m; + } while (l); + if (z) *z = t; + r[t] = '\0'; return r; } diff --git a/net/http/ip.h b/net/http/ip.h new file mode 100644 index 000000000..048862759 --- /dev/null +++ b/net/http/ip.h @@ -0,0 +1,45 @@ +#ifndef COSMOPOLITAN_NET_HTTP_IP_H_ +#define COSMOPOLITAN_NET_HTTP_IP_H_ + +#define kIpUnknown 0 +#define kIpMulticast 1 +#define kIpLoopback 2 +#define kIpPrivate 3 +#define kIpTestnet 4 +#define kIpAfrinic 5 +#define kIpLacnic 6 +#define kIpApnic 7 +#define kIpArin 8 +#define kIpRipe 9 +#define kIpDod 10 +#define kIpAtt 11 +#define kIpApple 12 +#define kIpFord 13 +#define kIpCogent 14 +#define kIpPrudential 15 +#define kIpUsps 16 +#define kIpComcast 17 +#define kIpFuture 18 +#define kIpAnonymous 19 + +#if !(__ASSEMBLER__ + __LINKER__ + 0) +COSMOPOLITAN_C_START_ + +bool IsDodIp(uint32_t); +bool IsArinIp(uint32_t); +bool IsRipeIp(uint32_t); +bool IsApnicIp(uint32_t); +bool IsLacnicIp(uint32_t); +bool IsPublicIp(uint32_t); +bool IsPrivateIp(uint32_t); +bool IsAfrinicIp(uint32_t); +bool IsTestnetIp(uint32_t); +bool IsLoopbackIp(uint32_t); +bool IsMulticastIp(uint32_t); +bool IsAnonymousIp(uint32_t); +int CategorizeIp(uint32_t); +const char *GetIpCategoryName(int); + +COSMOPOLITAN_C_END_ +#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ +#endif /* COSMOPOLITAN_NET_HTTP_IP_H_ */ diff --git a/net/http/isacceptablehost.c b/net/http/isacceptablehost.c new file mode 100644 index 000000000..f9e2faa9a --- /dev/null +++ b/net/http/isacceptablehost.c @@ -0,0 +1,103 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/str/str.h" +#include "net/http/http.h" + +// -_0-9A-Za-z +static const char kHostChars[256] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x00 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x10 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, // 0x20 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, // 0x30 + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x40 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, // 0x50 + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x60 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, // 0x70 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x80 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x90 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xa0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xb0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xc0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xd0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xe0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xf0 +}; + +/** + * Returns true if host seems legit. + * + * This function may be called after ParseUrl() or ParseHost() has + * already handled things like percent encoding. There's currently + * no support for IPv6 and IPv7. + * + * Here's examples of permitted inputs: + * + * - "" + * - 1.2.3.4 + * - 1.2.3.4.arpa + * - localservice + * - hello.example + * - _hello.example + * - -hello.example + * - hi-there.example + * + * Here's some examples of forbidden inputs: + * + * - ::1 + * - 1.2.3 + * - 1.2.3.4.5 + * - .hi.example + * - hi..example + * + * @param n if -1 implies strlen + */ +bool IsAcceptableHost(const char *s, size_t n) { + size_t i; + int c, b, j; + if (n == -1) n = s ? strlen(s) : 0; + if (!n) return true; + for (b = j = i = 0; i < n; ++i) { + c = s[i] & 255; + if (isdigit(c)) { + b *= 10; + b += c - '0'; + if (b > 255) { + return false; + } + } else if (c == '.') { + if (!i || s[i - 1] == '.') return false; + b = 0; + ++j; + } else { + for (;;) { + if (!kHostChars[c] && (c != '.' || (!i || s[i - 1] == '.'))) { + return false; + } + if (++i < n) { + c = s[i] & 255; + } else { + return true; + } + } + } + } + if (j != 3) return false; + if (i && s[i - 1] == '.') return false; + return true; +} diff --git a/net/http/isacceptablehttprequestpath.c b/net/http/isacceptablepath.c similarity index 79% rename from net/http/isacceptablehttprequestpath.c rename to net/http/isacceptablepath.c index c093a7b89..274074e0a 100644 --- a/net/http/isacceptablehttprequestpath.c +++ b/net/http/isacceptablepath.c @@ -16,29 +16,31 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/str/str.h" #include "libc/str/thompike.h" #include "net/http/http.h" /** - * Returns true if request path seems legit. + * Returns true if path seems legit. * - * 1. Request path must start with '/'. - * 2. The substring "//" is disallowed. - * 3. We won't serve hidden files (segment starts with '.'). - * 4. We won't serve paths with segments equal to "." or "..". + * 1. The substring "//" is disallowed. + * 2. We won't serve hidden files (segment starts with '.'). + * 3. We won't serve paths with segments equal to "." or "..". * * It is assumed that the URI parser already took care of percent * escape decoding as well as ISO-8859-1 decoding. The input needs - * to be a UTF-8 string. + * to be a UTF-8 string. This function takes overlong encodings into + * consideration, so you don't need to call Underlong() beforehand. + * + * @param size if -1 implies strlen + * @see IsReasonablePath() */ -bool IsAcceptableHttpRequestPath(const char *data, size_t size) { - bool t; - size_t i; - unsigned n; - wint_t x, y, a, b; +bool IsAcceptablePath(const char *data, size_t size) { const char *p, *e; - if (!size || *data != '/') return false; + int x, y, a, b, t, i, n; + if (size == -1) size = data ? strlen(data) : 0; t = 0; + y = '/'; p = data; e = p + size; while (p < e) { @@ -62,14 +64,12 @@ bool IsAcceptableHttpRequestPath(const char *data, size_t size) { if (x == '\\') { x = '/'; } - if (!t) { - t = true; - } else { - if ((x == '/' || x == '.') && y == '/') { - return false; - } + if (y == '/') { + if (x == '.') return false; + if (x == '/' && t) return false; } y = x; + t = 1; } return true; } diff --git a/net/http/isacceptableport.c b/net/http/isacceptableport.c new file mode 100644 index 000000000..94bdbe9d4 --- /dev/null +++ b/net/http/isacceptableport.c @@ -0,0 +1,56 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/str/str.h" +#include "net/http/http.h" + +/** + * Returns true if port seems legit. + * + * Here's examples of permitted inputs: + * + * - "" + * - 0 + * - 65535 + * + * Here's some examples of forbidden inputs: + * + * - -1 + * - 65536 + * - https + * + * @param n if -1 implies strlen + */ +bool IsAcceptablePort(const char *s, size_t n) { + int p, c; + size_t i; + if (n == -1) n = s ? strlen(s) : 0; + for (p = i = 0; i < n; ++i) { + c = s[i] & 255; + if ('0' <= c && c <= '9') { + p *= 10; + p += c - '0'; + if (p > 65535) { + return false; + } + } else { + return false; + } + } + return true; +} diff --git a/net/http/isafrinicip.c b/net/http/isafrinicip.c new file mode 100644 index 000000000..f7ba11b45 --- /dev/null +++ b/net/http/isafrinicip.c @@ -0,0 +1,28 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/ip.h" + +/** + * Returns true if IPv4 address is managed by AFRINIC. + */ +bool IsAfrinicIp(uint32_t x) { + int a = (x & 0xff000000) >> 24; + return a == 41 || a == 102 || a == 105 || a == 154 || a == 196 || a == 197 || + (x & 0xffffe000) == 0xca7b0000 /* 202.123.0.0/19 */; +} diff --git a/net/http/isanonymousip.c b/net/http/isanonymousip.c new file mode 100644 index 000000000..c25332112 --- /dev/null +++ b/net/http/isanonymousip.c @@ -0,0 +1,41 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/ip.h" + +/** + * Returns true if IPv4 address is anonymous proxy provider. + */ +bool IsAnonymousIp(uint32_t x) { + return (x & 0xffffffff) == 0x1f0e8527 || (x & 0xffffff00) == 0x2e138900 || + (x & 0xffffff00) == 0x2e138f00 || (x & 0xfffffffe) == 0x32074e58 || + (x & 0xfffffe00) == 0x3e490800 || (x & 0xffffffff) == 0x3feb9bd2 || + (x & 0xffffffff) == 0x400c7617 || (x & 0xffffffff) == 0x400c7658 || + (x & 0xffffff00) == 0x432b9c00 || (x & 0xffffff00) == 0x450a8b00 || + (x & 0xffffff00) == 0x46e8f500 || (x & 0xffffffff) == 0x4a5209e0 || + (x & 0xfffffe00) == 0x50fe4a00 || (x & 0xfffffe00) == 0x5d735200 || + (x & 0xfffffe00) == 0x5d735400 || (x & 0xffffffff) == 0x602fe214 || + (x & 0xffffff00) == 0x93cb7800 || (x & 0xffffffff) == 0xb0094b2b || + (x & 0xffffffff) == 0xb9246491 || (x & 0xffffff00) == 0xc0ee1500 || + (x & 0xffffffff) == 0xc16b1147 || (x & 0xffffffff) == 0xc6906958 || + (x & 0xffffff00) == 0xc772df00 || (x & 0xffffff00) == 0xc7bcec00 || + (x & 0xffffffff) == 0xc8c8c8c8 || (x & 0xffffff00) == 0xce47a200 || + (x & 0xffffff00) == 0xcec46700 || (x & 0xffffffff) == 0xd02be134 || + (x & 0xffffff00) == 0xd1d8c600 || (x & 0xfffffffc) == 0xd43fa9e8 || + (x & 0xffffffff) == 0xd5eaf973 || (x & 0xffffff00) == 0xd897b400; +} diff --git a/net/http/isapnicip.c b/net/http/isapnicip.c new file mode 100644 index 000000000..133e6433c --- /dev/null +++ b/net/http/isapnicip.c @@ -0,0 +1,35 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/ip.h" + +/** + * Returns true if IPv4 address is managed by APNIC. + */ +bool IsApnicIp(uint32_t x) { + int a = (x & 0xff000000) >> 24; + return a == 1 || a == 14 || a == 27 || a == 36 || a == 39 || a == 42 || + a == 43 || a == 49 || a == 58 || a == 59 || a == 60 || a == 61 || + a == 101 || a == 103 || a == 106 || a == 110 || a == 111 || a == 112 || + a == 113 || a == 114 || a == 115 || a == 116 || a == 117 || a == 118 || + a == 119 || a == 120 || a == 121 || a == 122 || a == 123 || a == 124 || + a == 125 || a == 126 || a == 133 || a == 150 || a == 153 || a == 163 || + a == 171 || a == 175 || a == 180 || a == 182 || a == 183 || a == 202 || + a == 203 || a == 210 || a == 211 || a == 218 || a == 219 || a == 220 || + a == 221 || a == 222 || a == 223; +} diff --git a/net/http/isarinip.c b/net/http/isarinip.c new file mode 100644 index 000000000..aa8bf1afa --- /dev/null +++ b/net/http/isarinip.c @@ -0,0 +1,42 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/ip.h" + +/** + * Returns true if IPv4 address is managed by ARIN. + */ +bool IsArinIp(uint32_t x) { + int a = (x & 0xff000000) >> 24; + return a == 3 || a == 4 || a == 8 || a == 9 || a == 13 || a == 15 || + a == 16 || a == 18 || a == 20 || a == 23 || a == 24 || a == 32 || + a == 34 || a == 35 || a == 40 || a == 44 || a == 45 || a == 47 || + a == 50 || a == 52 || a == 54 || a == 63 || a == 64 || a == 65 || + a == 66 || a == 67 || a == 68 || a == 69 || a == 70 || a == 71 || + a == 72 || a == 74 || a == 75 || a == 76 || a == 96 || a == 97 || + a == 98 || a == 99 || a == 100 || a == 104 || a == 107 || a == 108 || + a == 128 || a == 129 || a == 130 || a == 131 || a == 132 || a == 134 || + a == 135 || a == 136 || a == 137 || a == 138 || a == 139 || a == 140 || + a == 142 || a == 143 || a == 144 || a == 146 || a == 147 || a == 148 || + a == 149 || a == 152 || a == 155 || a == 156 || a == 157 || a == 158 || + a == 159 || a == 160 || a == 161 || a == 162 || a == 164 || a == 165 || + a == 166 || a == 167 || a == 168 || a == 169 || a == 170 || a == 172 || + a == 173 || a == 174 || a == 184 || a == 192 || a == 198 || a == 199 || + a == 204 || a == 205 || a == 206 || a == 207 || a == 208 || a == 209 || + a == 216; +} diff --git a/net/http/isdodip.c b/net/http/isdodip.c new file mode 100644 index 000000000..e6c7c5348 --- /dev/null +++ b/net/http/isdodip.c @@ -0,0 +1,29 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/ip.h" + +/** + * Returns true if IP is owned by the U.S. Department of Defense. + */ +bool IsDodIp(uint32_t x) { + int a = (x & 0xff000000) >> 24; + return a == 6 || a == 7 || a == 11 || a == 21 || a == 22 || a == 26 || + a == 28 || a == 29 || a == 30 || a == 33 || a == 55 || a == 214 || + a == 215; +} diff --git a/net/http/islacnicip.c b/net/http/islacnicip.c new file mode 100644 index 000000000..564e17c05 --- /dev/null +++ b/net/http/islacnicip.c @@ -0,0 +1,28 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/ip.h" + +/** + * Returns true if IPv4 address is managed by LACNIC. + */ +bool IsLacnicIp(uint32_t x) { + int a = (x & 0xff000000) >> 24; + return a == 177 || a == 179 || a == 181 || a == 186 || a == 187 || a == 189 || + a == 190 || a == 191 || a == 200 || a == 201; +} diff --git a/net/http/isloopbackip.c b/net/http/isloopbackip.c new file mode 100644 index 000000000..c2aaa62de --- /dev/null +++ b/net/http/isloopbackip.c @@ -0,0 +1,26 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/ip.h" + +/** + * Returns true if IPv4 address is used for localhost. + */ +bool IsLoopbackIp(uint32_t x) { + return (x >> 24) == 127; /* 127.0.0.0/8 */ +} diff --git a/net/http/ismimetype.c b/net/http/ismimetype.c new file mode 100644 index 000000000..45a35b107 --- /dev/null +++ b/net/http/ismimetype.c @@ -0,0 +1,33 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/str/str.h" +#include "net/http/http.h" + +/** + * Returns true if content-type 𝑡 has mime-type 𝑠. + */ +bool IsMimeType(const char *t, size_t n, const char *s) { + size_t i; + if (n == -1) n = t ? strlen(t) : 0; + for (i = 0; i < n; ++i) { + if (!s[i]) return !kHttpToken[t[i] & 0xFF]; + if (kToLower[s[i] & 0xFF] != kToLower[t[i] & 0xFF]) return false; + } + return !s[i]; +} diff --git a/net/http/ismulticastip.c b/net/http/ismulticastip.c new file mode 100644 index 000000000..fb5ae0e48 --- /dev/null +++ b/net/http/ismulticastip.c @@ -0,0 +1,26 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/ip.h" + +/** + * Returns true if IPv4 address is used for multicast. + */ +bool IsMulticastIp(uint32_t x) { + return (x >> 28) == 0xE; /* 224.0.0.0/4 */ +} diff --git a/net/http/isprivateip.c b/net/http/isprivateip.c new file mode 100644 index 000000000..018ec07aa --- /dev/null +++ b/net/http/isprivateip.c @@ -0,0 +1,28 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/ip.h" + +/** + * Returns true if IPv4 address is intended for private networks. + */ +bool IsPrivateIp(uint32_t x) { + return (x >> 24) == 10 /* 10.0.0.0/8 */ + || (x & 0xfff00000) == 0xac100000 /* 172.16.0.0/12 */ + || (x & 0xffff0000) == 0xc0a80000 /* 192.168.0.0/16 */; +} diff --git a/net/http/ispublicip.c b/net/http/ispublicip.c new file mode 100644 index 000000000..fa65167af --- /dev/null +++ b/net/http/ispublicip.c @@ -0,0 +1,29 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/ip.h" + +/** + * Returns true if IPv4 address can come from the Internet. + * + * We intentionally omit TEST-NET here which can be used to simulate + * public Internet traffic using non-Internet IPs. + */ +bool IsPublicIp(uint32_t x) { + return !IsLoopbackIp(x) && !IsPrivateIp(x); +} diff --git a/net/http/isreasonablepath.c b/net/http/isreasonablepath.c new file mode 100644 index 000000000..27e1d5b86 --- /dev/null +++ b/net/http/isreasonablepath.c @@ -0,0 +1,67 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/str/str.h" +#include "libc/str/thompike.h" +#include "net/http/http.h" + +/** + * Returns true if path doesn't contain "." or ".." segments. + * + * @param size if -1 implies strlen + * @see IsAcceptablePath() + */ +bool IsReasonablePath(const char *data, size_t size) { + const char *p, *e; + int x, y, z, a, b, i, n; + if (size == -1) size = data ? strlen(data) : 0; + z = '/'; + y = '/'; + x = '/'; + p = data; + e = p + size; + while (p < e) { + x = *p++ & 0xff; + if (x >= 0300) { + a = ThomPikeByte(x); + n = ThomPikeLen(x) - 1; + if (p + n <= e) { + for (i = 0;;) { + b = p[i] & 0xff; + if (!ThomPikeCont(b)) break; + a = ThomPikeMerge(a, b); + if (++i == n) { + x = a; + p += i; + break; + } + } + } + } + if (x == '\\') { + x = '/'; + } + if (z == '/' && y == '.' && x == '/') return false; + if (z == '/' && y == '.' && x == '.') return false; + z = y; + y = x; + } + if (y == '/' && x == '.') return false; + if (z == '/' && y == '.' && x == '.') return false; + return true; +} diff --git a/net/http/isripeip.c b/net/http/isripeip.c new file mode 100644 index 000000000..9c679a238 --- /dev/null +++ b/net/http/isripeip.c @@ -0,0 +1,34 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/ip.h" + +/** + * Returns true if IPv4 address is managed by RIPE NCC. + */ +bool IsRipeIp(uint32_t x) { + int a = (x & 0xff000000) >> 24; + return a == 2 || a == 5 || a == 25 || a == 31 || a == 37 || a == 46 || + a == 51 || a == 53 || a == 57 || a == 62 || a == 77 || a == 78 || + a == 79 || a == 80 || a == 81 || a == 82 || a == 83 || a == 84 || + a == 85 || a == 86 || a == 87 || a == 88 || a == 89 || a == 90 || + a == 91 || a == 92 || a == 93 || a == 94 || a == 95 || a == 109 || + a == 141 || a == 145 || a == 151 || a == 176 || a == 178 || a == 185 || + a == 188 || a == 193 || a == 194 || a == 195 || a == 212 || a == 213 || + a == 217; +} diff --git a/net/http/istestnetip.c b/net/http/istestnetip.c new file mode 100644 index 000000000..be57a1d18 --- /dev/null +++ b/net/http/istestnetip.c @@ -0,0 +1,29 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/ip.h" + +/** + * Returns true if IPv4 address is intended for documentation. + * @see RFC5737 + */ +bool IsTestnetIp(uint32_t x) { + return (((x & 0xFFFFFF00u) == 0xC0000200u) /* 192.0.2.0/24 */ || + ((x & 0xFFFFFF00u) == 0xC0000200u) /* 198.51.100.0/24 */ || + ((x & 0xFFFFFF00u) == 0xCB007100u) /* 203.0.113.0/24 */); +} diff --git a/net/http/isvalidhttptoken.c b/net/http/isvalidhttptoken.c index b3e61791b..c140902ee 100644 --- a/net/http/isvalidhttptoken.c +++ b/net/http/isvalidhttptoken.c @@ -19,32 +19,15 @@ #include "libc/str/str.h" #include "net/http/http.h" -// http/1.1 token dispatch -// 0 is CTLs, SP, ()<>@,;:\"/[]?={} -// 1 is legal ascii -static const char kHttpToken[256] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x00 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x10 - 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, // 0x20 - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, // 0x30 - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x40 - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, // 0x50 - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x60 - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, // 0x70 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x80 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x90 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xa0 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xb0 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xc0 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xd0 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xe0 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xf0 -}; - +/** + * Returns true if string is ASCII without delimiters. + * + * @param n if -1 implies strlen + */ bool IsValidHttpToken(const char *s, size_t n) { size_t i; if (!n) return false; - if (n == -1) n = strlen(s); + if (n == -1) n = s ? strlen(s) : 0; for (i = 0; i < n; ++i) { if (!kHttpToken[s[i] & 0xff]) { return false; diff --git a/net/http/kescapeauthority.c b/net/http/kescapeauthority.c new file mode 100644 index 000000000..6e55a1342 --- /dev/null +++ b/net/http/kescapeauthority.c @@ -0,0 +1,46 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/escape.h" + +// [user[:pass]@]host[:port]|reg_name dispatch +// - 0 is -_.!~*'();&=+$,0-9A-Za-z +// - 1 is everything else which needs uppercase hex %XX +// note that '& can break html +// note that '() can break css urls +// note that unicode can still be wild +// note that IPv6+ can't be encoded this way +// note that user can look deceptively like host +const char kEscapeAuthority[256] = { + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x00 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x10 + 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, // 0x20 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, // 0x30 + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x40 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, // 0x50 + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x60 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, // 0x70 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x80 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x90 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xa0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xb0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xc0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xd0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xe0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xf0 +}; diff --git a/net/http/escapeurlfragment.c b/net/http/kescapefragment.c similarity index 93% rename from net/http/escapeurlfragment.c rename to net/http/kescapefragment.c index a03406b82..7cd29ada9 100644 --- a/net/http/escapeurlfragment.c +++ b/net/http/kescapefragment.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/x/x.h" #include "net/http/escape.h" // url fragment dispatch @@ -25,7 +24,7 @@ // note that '& can break html // note that '() can break css urls // note that unicode can still be wild -static const char kEscapeUrlFragment[256] = { +const char kEscapeFragment[256] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x00 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x10 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x20 @@ -43,10 +42,3 @@ static const char kEscapeUrlFragment[256] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xe0 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xf0 }; - -/** - * Escapes URL fragment. - */ -struct EscapeResult EscapeUrlFragment(const char *data, size_t size) { - return EscapeUrl(data, size, kEscapeUrlFragment); -} diff --git a/net/http/kescapeip.c b/net/http/kescapeip.c new file mode 100644 index 000000000..934f7f75c --- /dev/null +++ b/net/http/kescapeip.c @@ -0,0 +1,44 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/escape.h" + +// Square Bracket IP-literal dispatch +// - 0 is -_.!~*'();&=+$,0-9A-Za-z: +// - 1 shouldn't be there; exceptions exist; escape it +// same as kEscapeAuthority but with colon +// note that '& can break html +// note that '() can break css urls +const char kEscapeIp[256] = { + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x00 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x10 + 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, // 0x20 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, // 0x30 + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x40 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, // 0x50 + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x60 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, // 0x70 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x80 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x90 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xa0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xb0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xc0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xd0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xe0 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xf0 +}; diff --git a/net/http/escapeurlparam.c b/net/http/kescapeparam.c similarity index 92% rename from net/http/escapeurlparam.c rename to net/http/kescapeparam.c index 88b2ab672..e73f0c7d5 100644 --- a/net/http/escapeurlparam.c +++ b/net/http/kescapeparam.c @@ -16,14 +16,13 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/x/x.h" #include "net/http/escape.h" // url query/form name/parameter dispatch // - 0 is -.*_0-9A-Za-z // - 1 is everything else which needs uppercase hex %XX // note that unicode can still be wild -static const char kEscapeUrlParam[256] = { +const char kEscapeParam[256] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x00 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x10 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, // 0x20 @@ -41,10 +40,3 @@ static const char kEscapeUrlParam[256] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xe0 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xf0 }; - -/** - * Escapes query/form name/parameter. - */ -struct EscapeResult EscapeUrlParam(const char *data, size_t size) { - return EscapeUrl(data, size, kEscapeUrlParam); -} diff --git a/net/http/escapeurlpath.c b/net/http/kescapepath.c similarity index 91% rename from net/http/escapeurlpath.c rename to net/http/kescapepath.c index 55789eb47..1364d5871 100644 --- a/net/http/escapeurlpath.c +++ b/net/http/kescapepath.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/x/x.h" #include "net/http/escape.h" // url path dispatch @@ -25,7 +24,7 @@ // note that '& can break html // note that '() can break css urls // note that unicode can still be wild -static const char kEscapeUrlPath[256] = { +const char kEscapePath[256] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x00 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x10 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x20 @@ -43,12 +42,3 @@ static const char kEscapeUrlPath[256] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xe0 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xf0 }; - -/** - * Escapes URL path. - * - * This is the same as EscapeUrlPathSegment() except slash is allowed. - */ -struct EscapeResult EscapeUrlPath(const char *data, size_t size) { - return EscapeUrl(data, size, kEscapeUrlPath); -} diff --git a/net/http/escapeurlpathsegment.c b/net/http/kescapesegment.c similarity index 89% rename from net/http/escapeurlpathsegment.c rename to net/http/kescapesegment.c index 47667ec0a..cec8dd04f 100644 --- a/net/http/escapeurlpathsegment.c +++ b/net/http/kescapesegment.c @@ -16,7 +16,6 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/x/x.h" #include "net/http/escape.h" // url path segment dispatch @@ -25,7 +24,7 @@ // note that '& can break html // note that '() can break css urls // note that unicode can still be wild -static const char kEscapeUrlPathSegment[256] = { +const char kEscapeSegment[256] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x00 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x10 1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, // 0x20 @@ -43,13 +42,3 @@ static const char kEscapeUrlPathSegment[256] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xe0 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0xf0 }; - -/** - * Escapes URL path segment. - * - * Please note this will URI encode the slash character. That's because - * segments are the labels between the slashes in a path. - */ -struct EscapeResult EscapeUrlPathSegment(const char *data, size_t size) { - return EscapeUrl(data, size, kEscapeUrlPathSegment); -} diff --git a/net/http/khextoint.c b/net/http/khextoint.c new file mode 100644 index 000000000..4c2339028 --- /dev/null +++ b/net/http/khextoint.c @@ -0,0 +1,38 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/escape.h" + +const signed char kHexToInt[256] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x00 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x10 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x20 + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, // 0x30 + -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x40 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x50 + -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x60 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x70 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x80 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x90 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xa0 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xb0 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xc0 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xd0 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xe0 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xf0 +}; diff --git a/net/http/khttpmethod.c b/net/http/khttpmethod.c index 09eb42d74..c37f36142 100644 --- a/net/http/khttpmethod.c +++ b/net/http/khttpmethod.c @@ -18,7 +18,8 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "net/http/http.h" -const char kHttpMethod[17][8] = { +const char kHttpMethod[18][8] = { + "WUT", // "GET", // "HEAD", // "POST", // diff --git a/net/http/khttprepeatable.c b/net/http/khttprepeatable.c new file mode 100644 index 000000000..7aff40a4c --- /dev/null +++ b/net/http/khttprepeatable.c @@ -0,0 +1,81 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/http.h" + +/** + * Set of standard comma-separate HTTP headers that may span lines. + * + * These headers may specified on multiple lines, e.g. + * + * Allow: GET + * Allow: POST + * + * Is the same as: + * + * Allow: GET, POST + * + * Standard headers that aren't part of this set will be overwritten in + * the event that they're specified multiple times. For example, + * + * Content-Type: application/octet-stream + * Content-Type: text/plain; charset=utf-8 + * + * Is the same as: + * + * Content-Type: text/plain; charset=utf-8 + * + * This set exists to optimize header lookups and parsing. The existence + * of standard headers that aren't in this set is an O(1) operation. The + * repeatable headers in this list require an O(1) operation if they are + * not present, otherwise the extended headers list needs to be crawled. + * + * Please note non-standard headers exist, e.g. Cookie, that may span + * multiple lines, even though they're not comma-delimited. For those + * headers we simply don't add them to the perfect hash table. + * + * @note we choose to not recognize this grammar for kHttpConnection + * @note `grep '[A-Z][a-z]*".*":"' rfc2616` + * @note `grep ':.*#' rfc2616` + * @see RFC7230 § 4.2 + */ +const bool kHttpRepeatable[kHttpHeadersMax] = { + [kHttpAcceptCharset] = true, + [kHttpAcceptEncoding] = true, + [kHttpAcceptLanguage] = true, + [kHttpAccept] = true, + [kHttpAllow] = true, + [kHttpCacheControl] = true, + [kHttpContentEncoding] = true, + [kHttpContentLanguage] = true, + [kHttpExpect] = true, + [kHttpIfMatch] = true, + [kHttpIfNoneMatch] = true, + [kHttpPragma] = true, + [kHttpProxyAuthenticate] = true, + [kHttpPublic] = true, + [kHttpTe] = true, + [kHttpTrailer] = true, + [kHttpTransferEncoding] = true, + [kHttpUpgrade] = true, + [kHttpUri] = true, + [kHttpVary] = true, + [kHttpVia] = true, + [kHttpWarning] = true, + [kHttpWwwAuthenticate] = true, +}; diff --git a/net/http/khttptoken.c b/net/http/khttptoken.c new file mode 100644 index 000000000..7a6134116 --- /dev/null +++ b/net/http/khttptoken.c @@ -0,0 +1,42 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "net/http/http.h" + +// http/1.1 token dispatch +// 0 is CTLs, SP, ()<>@,;:\"/[]?={} which are illegal +// 1 is everything else in ASCII which is legal +// note that &" can break html +const char kHttpToken[256] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x00 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x10 + 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, // 0x20 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, // 0x30 + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x40 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, // 0x50 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x60 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, // 0x70 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x80 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x90 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xa0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xb0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xc0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xd0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xe0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xf0 +}; diff --git a/net/http/negotiatehttprequest.c b/net/http/negotiatehttprequest.c deleted file mode 100644 index ea26e0cea..000000000 --- a/net/http/negotiatehttprequest.c +++ /dev/null @@ -1,106 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/calls/calls.h" -#include "libc/macros.internal.h" -#include "libc/math.h" -#include "libc/sock/sock.h" -#include "libc/str/str.h" -#include "libc/sysv/consts/poll.h" -#include "libc/sysv/consts/shut.h" -#include "libc/sysv/errfuns.h" -#include "libc/time/time.h" -#include "net/http/http.h" - -static pureconst long AsMilliseconds(long double ts) { - return ts * 1e3 + .5; -} - -/** - * Negotiates HTTP request. - * - * This function blocks until a response header is consumed. We assume - * the response header is smaller than *inout_respsize. We're agnostic - * to the various different i/o paradigms. Goal is really good latency. - * - * @param singleshot should be true w/ connection: close - * @return 0 on success, or -1 w/ errno - */ -int NegotiateHttpRequest(int sock, const char *req, uint32_t *inout_reqsize, - char *resp, uint32_t *inout_respsize, - uint32_t *out_resphdrsize, bool singleshot, - long double timeout) { - ssize_t rc; - struct pollfd fd; - const char *body; - long double start, now, deadline; - uint32_t transmitted, received, exchanged, remaining; - fd.fd = sock; - received = 0; - transmitted = 0; - fd.events = POLLOUT | POLLIN; - deadline = (start = now = nowl()) + timeout; - do { - if ((rc = poll(&fd, 1, MAX(0, AsMilliseconds(deadline - now)))) == 1) { - if (fd.revents & POLLHUP) { - econnreset(); - break; - } - if (fd.revents & (POLLIN | POLLERR)) { - remaining = *inout_respsize - received - 1; - if ((rc = recv(fd.fd, resp + received, remaining, 0)) != -1) { - exchanged = rc; - body = memmem(resp + (received >= 4 ? received - 4 : 0), exchanged, - "\r\n\r\n", 4); - received += exchanged; - if (body) { - resp[received] = '\0'; - *inout_respsize = received; - *inout_reqsize = transmitted; - *out_resphdrsize = body - resp; - return 0; - } - if (exchanged == remaining) { - emsgsize(); - break; - } - } else { - break; - } - } - if (fd.revents & POLLOUT) { - remaining = *inout_reqsize - transmitted; - if ((rc = send(fd.fd, req + transmitted, remaining, 0)) != -1) { - exchanged = rc; - transmitted += exchanged; - if (exchanged == remaining) { - if (singleshot) shutdown(fd.fd, SHUT_WR); - fd.events &= ~POLLOUT; - } - } else { - break; - } - } - } else { - if (!rc) etimedout(); - break; - } - } while ((now = nowl()) < deadline); - close(fd.fd); - return -1; -} diff --git a/net/http/parsecontentlength.c b/net/http/parsecontentlength.c index ddbae77d5..d21ccd613 100644 --- a/net/http/parsecontentlength.c +++ b/net/http/parsecontentlength.c @@ -19,18 +19,25 @@ #include "libc/str/str.h" #include "net/http/http.h" +#define MAXIMUM (1024L * 1024L * 1024L * 1024L) + /** * Parses Content-Length header. * + * @param size is byte length and -1 implies strlen * @return -1 on invalid or overflow, otherwise >=0 value */ -ssize_t ParseContentLength(const char *s, size_t n) { - int i, r = 0; - if (!n) return 0; - for (i = 0; i < n; ++i) { +int64_t ParseContentLength(const char *s, size_t n) { + size_t i; + int64_t r; + if (n == -1) n = s ? strlen(s) : 0; + if (!n) return -1; + for (r = i = 0; i < n; ++i) { + if (s[i] == ',' && i > 0) break; if (!isdigit(s[i])) return -1; - if (__builtin_mul_overflow(r, 10, &r)) return -1; - if (__builtin_add_overflow(r, s[i] - '0', &r)) return -1; + r *= 10; + r += s[i] - '0'; + if (r >= MAXIMUM) return -1; } return r; } diff --git a/net/http/parseforwarded.c b/net/http/parseforwarded.c new file mode 100644 index 000000000..b5b5cbe35 --- /dev/null +++ b/net/http/parseforwarded.c @@ -0,0 +1,76 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/str/str.h" +#include "net/http/http.h" + +/** + * Parses X-Forwarded-For. + * + * This header is used by reverse proxies. For example: + * + * X-Forwarded-For: 203.0.113.42:31337 + * + * @param s is input data + * @param n if -1 implies strlen + * @param ip receives ip on success if not NULL + * @param port receives port on success if not NULL + * @return 0 on success or -1 on failure + * @see RFC7239's poorly designed Forwarded header + */ +int ParseForwarded(const char *s, size_t n, uint32_t *ip, uint16_t *port) { + size_t i; + uint32_t x; + int c, j, t; + if (n == -1) n = s ? strlen(s) : 0; + for (t = x = j = i = 0; i < n;) { + c = s[i++] & 255; + if (isdigit(c)) { + t *= 10; + t += c - '0'; + if (t > 255) return -1; + } else if (c == '.') { + x <<= 8; + x |= t; + t = 0; + ++j; + } else if (c == ':') { + x <<= 8; + x |= t; + t = 0; + if (j != 3) return -1; + while (i < n) { + c = s[i++] & 255; + if (isdigit(c)) { + t *= 10; + t += c - '0'; + if (t > 65535) return -1; + } else { + return -1; + } + } + if (!x || !t) return -1; + if (ip) *ip = x; + if (port) *port = t; + return 0; + } else { + return -1; + } + } + return -1; +} diff --git a/net/http/parsehttprange.c b/net/http/parsehttprange.c index 78e9458ac..869e909fd 100644 --- a/net/http/parsehttprange.c +++ b/net/http/parsehttprange.c @@ -22,6 +22,15 @@ /** * Parses HTTP Range request header. + * + * Here are some example values: + * + * Range: bytes=0- (everything) + * Range: bytes=0-499 (first 500 bytes) + * Range: bytes=500-999 (second 500 bytes) + * Range: bytes=-500 (final 500 bytes) + * Range: bytes=0-0,-1 (first and last and always) + * Range: bytes=500-600,601-999 (overlong but legal) */ bool ParseHttpRange(const char *p, size_t n, long resourcelength, long *out_start, long *out_length) { @@ -67,10 +76,10 @@ bool ParseHttpRange(const char *p, size_t n, long resourcelength, } if (n) return false; if (start < 0) return false; - if (length < 0) return false; - *out_start = start; - *out_length = length; + if (length < 1) return false; if (__builtin_add_overflow(start, length, &ending)) return false; if (ending > resourcelength) return false; + *out_start = start; + *out_length = length; return true; } diff --git a/net/http/parsehttprequest.c b/net/http/parsehttprequest.c index 27c380e50..6fea1c1fb 100644 --- a/net/http/parsehttprequest.c +++ b/net/http/parsehttprequest.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/alg/alg.h" #include "libc/alg/arraylist.internal.h" +#include "libc/bits/bits.h" #include "libc/limits.h" #include "libc/macros.internal.h" #include "libc/mem/mem.h" @@ -58,11 +59,29 @@ void DestroyHttpRequest(struct HttpRequest *r) { * messages. Line folding is forbidden. State persists across calls so * that fragmented messages can be handled efficiently. A limitation on * message size is imposed to make the header data structures smaller. - * All other things are permissive to the greatest extent possible. - * Further functions are provided for the interpretation, validation, - * and sanitization of various fields. + * + * This parser assumes ISO-8859-1 and guarantees no C0 or C1 control + * codes are present in message fields, with the exception of tab. + * Please note that fields like URI may use UTF-8 percent encoding. This + * parser doesn't care if you choose ASA X3.4-1963 or MULTICS newlines. + * + * kHttpRepeatable defines which standard header fields are O(1) and + * which ones may have comma entries spilled over into xheaders. For + * most headers it's sufficient to simply check the static slice. If + * r->headers[kHttpFoo].a is zero then the header is totally absent. + * + * This parser has linear complexity. Each character only needs to be + * considered a single time. That's the case even if messages are + * fragmented. If a message is valid but incomplete, this function will + * return zero so that it can be resumed as soon as more data arrives. + * + * This parser takes about 400 nanoseconds to parse a 403 byte Chrome + * HTTP request under MODE=rel on a Core i9 which is about three cycles + * per byte or a gigabyte per second of throughput per core. * * @note we assume p points to a buffer that has >=SHRT_MAX bytes + * @see HTTP/1.1 RFC2616 RFC2068 + * @see HTTP/1.0 RFC1945 */ int ParseHttpRequest(struct HttpRequest *r, const char *p, size_t n) { int c, h, i; @@ -71,23 +90,21 @@ int ParseHttpRequest(struct HttpRequest *r, const char *p, size_t n) { c = p[r->i] & 0xff; switch (r->t) { case START: - if (c == '\r' || c == '\n') { - ++r->a; /* RFC7230 § 3.5 */ - break; - } + if (c == '\r' || c == '\n') break; /* RFC7230 § 3.5 */ + if (!kHttpToken[c]) return ebadmsg(); r->t = METHOD; - /* fallthrough */ + r->a = r->i; + break; case METHOD: for (;;) { if (c == ' ') { - if ((r->method = GetHttpMethod(p + r->a, r->i - r->a)) != -1) { - r->uri.a = r->i + 1; - r->t = URI; - } else { - return ebadmsg(); - } + r->method = GetHttpMethod(p + r->a, r->i - r->a); + r->xmethod.a = r->a; + r->xmethod.b = r->i; + r->a = r->i + 1; + r->t = URI; break; - } else if (!('A' <= c && c <= 'Z')) { + } else if (!kHttpToken[c]) { return ebadmsg(); } if (++r->i == n) break; @@ -97,17 +114,19 @@ int ParseHttpRequest(struct HttpRequest *r, const char *p, size_t n) { case URI: for (;;) { if (c == ' ' || c == '\r' || c == '\n') { - if (r->i == r->uri.a) return ebadmsg(); + if (r->i == r->a) return ebadmsg(); + r->uri.a = r->a; r->uri.b = r->i; if (c == ' ') { - r->version.a = r->i + 1; + r->a = r->i + 1; r->t = VERSION; - } else if (c == '\r') { - r->t = CR1; } else { - r->t = LF1; + r->version = 9; + r->t = c == '\r' ? CR1 : LF1; } break; + } else if (c < 0x20 || (0x7F <= c && c < 0xA0)) { + return ebadmsg(); } if (++r->i == n) break; c = p[r->i] & 0xff; @@ -115,8 +134,14 @@ int ParseHttpRequest(struct HttpRequest *r, const char *p, size_t n) { break; case VERSION: if (c == '\r' || c == '\n') { - r->version.b = r->i; - r->t = c == '\r' ? CR1 : LF1; + if (r->i - r->a == 8 && + (READ64BE(p + r->a) & 0xFFFFFFFFFF00FF00) == 0x485454502F002E00 && + isdigit(p[r->a + 5]) && isdigit(p[r->a + 7])) { + r->version = (p[r->a + 5] - '0') * 10 + (p[r->a + 7] - '0'); + r->t = c == '\r' ? CR1 : LF1; + } else { + return ebadmsg(); + } } break; case CR1: @@ -129,9 +154,7 @@ int ParseHttpRequest(struct HttpRequest *r, const char *p, size_t n) { break; } else if (c == '\n') { return ++r->i; - } else if (c == ':') { - return ebadmsg(); - } else if (c == ' ' || c == '\t') { + } else if (!kHttpToken[c]) { return ebadmsg(); /* RFC7230 § 3.2.4 */ } r->k.a = r->i; @@ -143,6 +166,8 @@ int ParseHttpRequest(struct HttpRequest *r, const char *p, size_t n) { r->k.b = r->i; r->t = HSEP; break; + } else if (!kHttpToken[c]) { + return ebadmsg(); } if (++r->i == n) break; c = p[r->i] & 0xff; @@ -158,7 +183,8 @@ int ParseHttpRequest(struct HttpRequest *r, const char *p, size_t n) { if (c == '\r' || c == '\n') { i = r->i; while (i > r->a && (p[i - 1] == ' ' || p[i - 1] == '\t')) --i; - if ((h = GetHttpHeader(p + r->k.a, r->k.b - r->k.a)) != -1) { + if ((h = GetHttpHeader(p + r->k.a, r->k.b - r->k.a)) != -1 && + (!r->headers[h].a || !kHttpRepeatable[h])) { r->headers[h].a = r->a; r->headers[h].b = i; } else if ((x = realloc( @@ -172,6 +198,8 @@ int ParseHttpRequest(struct HttpRequest *r, const char *p, size_t n) { } r->t = c == '\r' ? CR1 : LF1; break; + } else if ((c < 0x20 && c != '\t') || (0x7F <= c && c < 0xA0)) { + return ebadmsg(); } if (++r->i == n) break; c = p[r->i] & 0xff; diff --git a/net/http/parseip.c b/net/http/parseip.c new file mode 100644 index 000000000..29790607d --- /dev/null +++ b/net/http/parseip.c @@ -0,0 +1,52 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/str/str.h" +#include "net/http/http.h" + +/** + * Parse IPv4 address. + * + * @param n if -1 implies strlen + * @return -1 on failure, otherwise 32-bit host-order unsigned integer + */ +int64_t ParseIp(const char *s, size_t n) { + size_t i; + uint32_t x; + int b, c, j; + if (n == -1) n = s ? strlen(s) : 0; + for (b = x = j = i = 0; i < n; ++i) { + c = s[i] & 255; + if (isdigit(c)) { + b *= 10; + b += c - '0'; + if (b > 255) return -1; + } else if (c == '.') { + x <<= 8; + x |= b; + b = 0; + ++j; + } else { + return -1; + } + } + x <<= 8; + x |= b; + if (j != 3) return -1; + return x; +} diff --git a/net/http/parseurl.c b/net/http/parseurl.c new file mode 100644 index 000000000..a7ba8177d --- /dev/null +++ b/net/http/parseurl.c @@ -0,0 +1,400 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/bits/likely.h" +#include "libc/limits.h" +#include "libc/str/str.h" +#include "libc/x/x.h" +#include "net/http/escape.h" +#include "net/http/url.h" + +struct UrlParser { + int i; + int c; + const char *data; + int size; + bool isform; + bool islatin1; + bool isopaque; + char *p; + char *q; +}; + +static void EmitLatin1(struct UrlParser *u, int c) { + u->p[0] = 0300 | c >> 6; + u->p[1] = 0200 | c & 077; + u->p += 2; +} + +static void EmitKey(struct UrlParser *u, struct UrlParams *h) { + h->p = xrealloc(h->p, ++h->n * sizeof(*h->p)); + h->p[h->n - 1].key.p = u->q; + h->p[h->n - 1].key.n = u->p - u->q; + u->q = u->p; +} + +static void EmitVal(struct UrlParser *u, struct UrlParams *h, bool t) { + if (!t) { + if (u->p > u->q || u->c != '?') { + EmitKey(u, h); + h->p[h->n - 1].val.p = NULL; + h->p[h->n - 1].val.n = 0; + } + } else { + h->p[h->n - 1].val.p = u->q; + h->p[h->n - 1].val.n = u->p - u->q; + u->q = u->p; + } +} + +static void ParseEscape(struct UrlParser *u) { + int a, b, c = '%'; + if (u->i + 2 <= u->size && + ((a = kHexToInt[u->data[u->i + 0] & 0xff]) != -1 && + (b = kHexToInt[u->data[u->i + 1] & 0xff]) != -1)) { + c = a << 4 | b; + u->i += 2; + } + *u->p++ = c; +} + +static bool ParseScheme(struct UrlParser *u, struct Url *h) { + while (u->i < u->size) { + u->c = u->data[u->i++] & 0xff; + if (u->c == '/') { + if (u->i == 1 && u->i < u->size && u->data[u->i] == '/') { + ++u->i; + return true; + } else { + *u->p++ = '/'; + return false; + } + } else if (u->c == ':' && u->i > 1) { + h->scheme.p = u->q; + h->scheme.n = u->p - u->q; + u->q = u->p; + if (u->i < u->size && u->data[u->i] == '/') { + if (u->i + 1 < u->size && u->data[u->i + 1] == '/') { + u->i += 2; + return true; + } else { + return false; + } + } else { + u->isopaque = true; + return false; + } + } else if (u->c == '#' || u->c == '?') { + h->path.p = u->q; + h->path.n = u->p - u->q; + u->q = u->p; + return false; + } else if (u->c == '%') { + ParseEscape(u); + return false; + } else if (u->c >= 0200 && u->islatin1) { + EmitLatin1(u, u->c); + return false; + } else { + *u->p++ = u->c; + if (u->i == 1) { + if (!isalpha(u->c)) { + return false; + } + } else { + if (!isalnum(u->c) && u->c != '+' && u->c != '-' && u->c != '.') { + return false; + } + } + } + } + return false; +} + +static void ParseAuthority(struct UrlParser *u, struct Url *h) { + int t = 0; + const char *c = NULL; + while (u->i < u->size) { + u->c = u->data[u->i++] & 0xff; + if (u->c == '/' || u->c == '#' || u->c == '?') { + break; + } else if (u->c == '[') { + t = -1; + } else if (u->c == ']') { + t = 0; + } else if (u->c == ':' && t >= 0) { + *u->p++ = ':'; + c = u->p; + ++t; + } else if (u->c == '@') { + if (c) { + h->user.p = u->q; + h->user.n = c - 1 - u->q; + h->pass.p = c; + h->pass.n = u->p - c; + c = NULL; + t = 0; + } else { + h->user.p = u->q; + h->user.n = u->p - u->q; + } + u->q = u->p; + } else if (u->c == '%') { + ParseEscape(u); + } else if (u->c >= 0200 && u->islatin1) { + EmitLatin1(u, u->c); + } else { + *u->p++ = u->c; + } + } + if (t == 1) { + h->host.p = u->q; + h->host.n = c - 1 - u->q; + h->port.p = c; + h->port.n = u->p - c; + c = NULL; + } else { + h->host.p = u->q; + h->host.n = u->p - u->q; + } + u->q = u->p; + if (u->c == '/') { + *u->p++ = u->c; + } +} + +static void ParsePath(struct UrlParser *u, struct UrlView *h) { + while (u->i < u->size) { + u->c = u->data[u->i++] & 0xff; + if (u->c == '#') { + break; + } else if (u->c == '?' && !u->isopaque) { + break; + } else if (u->c == '%') { + ParseEscape(u); + } else if (u->c >= 0200 && u->islatin1) { + EmitLatin1(u, u->c); + } else { + *u->p++ = u->c; + } + } + h->p = u->q; + h->n = u->p - u->q; + u->q = u->p; +} + +static void ParseQuery(struct UrlParser *u, struct UrlParams *h) { + bool t = false; + if (!h->p) h->p = xmalloc(0); + while (u->i < u->size) { + u->c = u->data[u->i++] & 0xff; + if (u->c == '#') { + break; + } else if (u->c == '%') { + ParseEscape(u); + } else if (u->c == '+') { + *u->p++ = u->isform ? ' ' : '+'; + } else if (u->c == '&') { + EmitVal(u, h, t); + t = false; + } else if (u->c == '=') { + if (!t) { + EmitKey(u, h); + t = true; + } else { + *u->p++ = '='; + } + } else if (u->c >= 0200 && u->islatin1) { + EmitLatin1(u, u->c); + } else { + *u->p++ = u->c; + } + } + EmitVal(u, h, t); +} + +static void ParseFragment(struct UrlParser *u, struct UrlView *h) { + while (u->i < u->size) { + u->c = u->data[u->i++] & 0xff; + if (u->c == '%') { + ParseEscape(u); + } else if (u->c >= 0200 && u->islatin1) { + EmitLatin1(u, u->c); + } else { + *u->p++ = u->c; + } + } + h->p = u->q; + h->n = u->p - u->q; + u->q = u->p; +} + +static char *ParseUrlImpl(const char *data, size_t size, struct Url *h, + bool latin1) { + char *m; + struct UrlParser u; + if (size == -1) size = data ? strlen(data) : 0; + u.i = 0; + u.c = 0; + u.isform = false; + u.islatin1 = latin1; + u.isopaque = false; + u.data = data; + u.size = size; + memset(h, 0, sizeof(*h)); + u.q = u.p = m = xmalloc(latin1 ? u.size * 2 : u.size); + if (ParseScheme(&u, h)) ParseAuthority(&u, h); + if (u.c != '#' && u.c != '?') ParsePath(&u, &h->path); + if (u.c == '?') ParseQuery(&u, &h->params); + if (u.c == '#') ParseFragment(&u, &h->fragment); + return xrealloc(m, u.p - m); +} + +/** + * Parses URL. + * + * This parser is charset agnostic. Percent encoded bytes are decoded + * for all fields. Returned values might contain things like NUL + * characters, spaces, control codes, and non-canonical encodings. + * Absent can be discerned from empty by checking if the pointer is set. + * + * There's no failure condition for this routine. This is a permissive + * parser. This doesn't normalize path segments like `.` or `..` so use + * IsAcceptablePath() to check for those. No restrictions are imposed + * beyond that which is strictly necessary for parsing. All the data + * that is provided will be consumed to the one of the fields. Strict + * conformance is enforced on some fields more than others, like scheme, + * since it's the most non-deterministically defined field of them all. + * + * Please note this is a URL parser, not a URI parser. Which means we + * support everything everything the URI spec says we should do except + * for the things we won't do, like tokenizing path segments into an + * array and then nesting another array beneath each of those for + * storing semicolon parameters. So this parser won't make SIP easy. + * What it can do is parse HTTP URLs and most URIs like data:opaque, + * better in fact than most things which claim to be URI parsers. + * + * @param data is value like `/hi?x=y&z` or `http://a.example/hi#x` + * @param size is byte length and -1 implies strlen + * @param h is assumed to be uninitialized + * @return memory backing UrlView needing free (and h.params.p too) + * @see URI Generic Syntax RFC3986 RFC2396 + * @see EncodeUrl() + */ +char *ParseUrl(const char *data, size_t size, struct Url *h) { + return ParseUrlImpl(data, size, h, false); +} + +/** + * Parses HTTP Request-URI. + * + * The input is ISO-8859-1 which is transcoded to UTF-8. Therefore we + * assume percent-encoded bytes are expressed as UTF-8. Returned values + * might contain things like NUL characters, C0, and C1 control codes. + * UTF-8 isn't checked for validity and may contain overlong values. + * Absent can be discerned from empty by checking if the pointer is set. + * + * There's no failure condition for this routine. This is a permissive + * parser that doesn't impose character restrictions beyond what is + * necessary for parsing. This doesn't normalize path segments like `.` + * or `..`. Use IsAcceptablePath() to check for those. + * + * @param data is value like `/hi?x=y&z` or `http://a.example/hi#x` + * @param size is byte length and -1 implies strlen + * @param h is assumed to be uninitialized + * @return memory backing UrlView needing free (and h.params.p too) + */ +char *ParseRequestUri(const char *data, size_t size, struct Url *h) { + return ParseUrlImpl(data, size, h, true); +} + +/** + * Parses HTTP POST key-value params. + * + * These are similar to the parameters found in a Request-URI. The main + * difference is that `+` is translated into space here. The mime type + * for this is application/x-www-form-urlencoded. + * + * This parser is charset agnostic. Returned values might contain things + * like NUL characters, NUL, control codes, and non-canonical encodings. + * Absent can be discerned from empty by checking if the pointer is set. + * + * There's no failure condition for this routine. This is a permissive + * parser that doesn't impose character restrictions beyond what is + * necessary for parsing. + * + * @param data is value like `foo=bar&x=y&z` + * @param size is byte length and -1 implies strlen + * @param h must be zeroed by caller and this appends if reused + * @return UrlView memory with same size needing free (h.p needs free too) + */ +char *ParseParams(const char *data, size_t size, struct UrlParams *h) { + char *m; + struct UrlParser u; + if (size == -1) size = data ? strlen(data) : 0; + u.i = 0; + u.c = '?'; + u.isform = true; + u.islatin1 = false; + u.isopaque = false; + u.data = data; + u.size = size; + u.q = u.p = m = xmalloc(u.size); + ParseQuery(&u, h); + return m; +} + +/** + * Parses HTTP Host header. + * + * The input is ISO-8859-1 which is transcoded to UTF-8. Therefore we + * assume percent-encoded bytes are expressed as UTF-8. Returned values + * might contain things like NUL characters, C0, and C1 control codes. + * UTF-8 isn't checked for validity and may contain overlong values. + * Absent can be discerned from empty by checking if the pointer is set. + * + * This function turns an HTTP header HOST[:PORT] into two strings, one + * for host and the other for port. You may then call IsAcceptableHost() + * and IsAcceptablePort() to see if they are valid values. After that a + * function like sscanf() can be used to do the thing you likely thought + * this function would do. + * + * This function doesn't initialize h since it's assumed this will be + * called conditionally after ParseRequestUri() if the host is absent. + * Fields unrelated to authority won't be impacted by this function. + * + * @param data is value like `127.0.0.1` or `foo.example:80` + * @param size is byte length and -1 implies strlen + * @param h is needs to be initialized by caller + * @return memory backing UrlView needing free + */ +char *ParseHost(const char *data, size_t size, struct Url *h) { + char *m; + struct UrlParser u; + if (size == -1) size = data ? strlen(data) : 0; + u.i = 0; + u.c = 0; + u.isform = false; + u.islatin1 = true; + u.isopaque = false; + u.data = data; + u.size = size; + u.q = u.p = m = xmalloc(u.size * 2); + ParseAuthority(&u, h); + return xrealloc(m, u.p - m); +} diff --git a/net/http/rfc2068 b/net/http/rfc2068 deleted file mode 100644 index e16e4fdf7..000000000 --- a/net/http/rfc2068 +++ /dev/null @@ -1,9075 +0,0 @@ - - - - - - -Network Working Group R. Fielding -Request for Comments: 2068 UC Irvine -Category: Standards Track J. Gettys - J. Mogul - DEC - H. Frystyk - T. Berners-Lee - MIT/LCS - January 1997 - - - Hypertext Transfer Protocol -- HTTP/1.1 - -Status of this Memo - - This document specifies an Internet standards track protocol for the - Internet community, and requests discussion and suggestions for - improvements. Please refer to the current edition of the "Internet - Official Protocol Standards" (STD 1) for the standardization state - and status of this protocol. Distribution of this memo is unlimited. - -Abstract - - The Hypertext Transfer Protocol (HTTP) is an application-level - protocol for distributed, collaborative, hypermedia information - systems. It is a generic, stateless, object-oriented protocol which - can be used for many tasks, such as name servers and distributed - object management systems, through extension of its request methods. - A feature of HTTP is the typing and negotiation of data - representation, allowing systems to be built independently of the - data being transferred. - - HTTP has been in use by the World-Wide Web global information - initiative since 1990. This specification defines the protocol - referred to as "HTTP/1.1". - -Table of Contents - - 1 Introduction.............................................7 - 1.1 Purpose ..............................................7 - 1.2 Requirements .........................................7 - 1.3 Terminology ..........................................8 - 1.4 Overall Operation ...................................11 - 2 Notational Conventions and Generic Grammar..............13 - 2.1 Augmented BNF .......................................13 - 2.2 Basic Rules .........................................15 - 3 Protocol Parameters.....................................17 - 3.1 HTTP Version ........................................17 - - - -Fielding, et. al. Standards Track [Page 1] - -RFC 2068 HTTP/1.1 January 1997 - - - 3.2 Uniform Resource Identifiers ........................18 - 3.2.1 General Syntax ...................................18 - 3.2.2 http URL .........................................19 - 3.2.3 URI Comparison ...................................20 - 3.3 Date/Time Formats ...................................21 - 3.3.1 Full Date ........................................21 - 3.3.2 Delta Seconds ....................................22 - 3.4 Character Sets ......................................22 - 3.5 Content Codings .....................................23 - 3.6 Transfer Codings ....................................24 - 3.7 Media Types .........................................25 - 3.7.1 Canonicalization and Text Defaults ...............26 - 3.7.2 Multipart Types ..................................27 - 3.8 Product Tokens ......................................28 - 3.9 Quality Values ......................................28 - 3.10 Language Tags ......................................28 - 3.11 Entity Tags ........................................29 - 3.12 Range Units ........................................30 - 4 HTTP Message............................................30 - 4.1 Message Types .......................................30 - 4.2 Message Headers .....................................31 - 4.3 Message Body ........................................32 - 4.4 Message Length ......................................32 - 4.5 General Header Fields ...............................34 - 5 Request.................................................34 - 5.1 Request-Line ........................................34 - 5.1.1 Method ...........................................35 - 5.1.2 Request-URI ......................................35 - 5.2 The Resource Identified by a Request ................37 - 5.3 Request Header Fields ...............................37 - 6 Response................................................38 - 6.1 Status-Line .........................................38 - 6.1.1 Status Code and Reason Phrase ....................39 - 6.2 Response Header Fields ..............................41 - 7 Entity..................................................41 - 7.1 Entity Header Fields ................................41 - 7.2 Entity Body .........................................42 - 7.2.1 Type .............................................42 - 7.2.2 Length ...........................................43 - 8 Connections.............................................43 - 8.1 Persistent Connections ..............................43 - 8.1.1 Purpose ..........................................43 - 8.1.2 Overall Operation ................................44 - 8.1.3 Proxy Servers ....................................45 - 8.1.4 Practical Considerations .........................45 - 8.2 Message Transmission Requirements ...................46 - 9 Method Definitions......................................48 - 9.1 Safe and Idempotent Methods .........................48 - - - -Fielding, et. al. Standards Track [Page 2] - -RFC 2068 HTTP/1.1 January 1997 - - - 9.1.1 Safe Methods .....................................48 - 9.1.2 Idempotent Methods ...............................49 - 9.2 OPTIONS .............................................49 - 9.3 GET .................................................50 - 9.4 HEAD ................................................50 - 9.5 POST ................................................51 - 9.6 PUT .................................................52 - 9.7 DELETE ..............................................53 - 9.8 TRACE ...............................................53 - 10 Status Code Definitions................................53 - 10.1 Informational 1xx ..................................54 - 10.1.1 100 Continue ....................................54 - 10.1.2 101 Switching Protocols .........................54 - 10.2 Successful 2xx .....................................54 - 10.2.1 200 OK ..........................................54 - 10.2.2 201 Created .....................................55 - 10.2.3 202 Accepted ....................................55 - 10.2.4 203 Non-Authoritative Information ...............55 - 10.2.5 204 No Content ..................................55 - 10.2.6 205 Reset Content ...............................56 - 10.2.7 206 Partial Content .............................56 - 10.3 Redirection 3xx ....................................56 - 10.3.1 300 Multiple Choices ............................57 - 10.3.2 301 Moved Permanently ...........................57 - 10.3.3 302 Moved Temporarily ...........................58 - 10.3.4 303 See Other ...................................58 - 10.3.5 304 Not Modified ................................58 - 10.3.6 305 Use Proxy ...................................59 - 10.4 Client Error 4xx ...................................59 - 10.4.1 400 Bad Request .................................60 - 10.4.2 401 Unauthorized ................................60 - 10.4.3 402 Payment Required ............................60 - 10.4.4 403 Forbidden ...................................60 - 10.4.5 404 Not Found ...................................60 - 10.4.6 405 Method Not Allowed ..........................61 - 10.4.7 406 Not Acceptable ..............................61 - 10.4.8 407 Proxy Authentication Required ...............61 - 10.4.9 408 Request Timeout .............................62 - 10.4.10 409 Conflict ...................................62 - 10.4.11 410 Gone .......................................62 - 10.4.12 411 Length Required ............................63 - 10.4.13 412 Precondition Failed ........................63 - 10.4.14 413 Request Entity Too Large ...................63 - 10.4.15 414 Request-URI Too Long .......................63 - 10.4.16 415 Unsupported Media Type .....................63 - 10.5 Server Error 5xx ...................................64 - 10.5.1 500 Internal Server Error .......................64 - 10.5.2 501 Not Implemented .............................64 - - - -Fielding, et. al. Standards Track [Page 3] - -RFC 2068 HTTP/1.1 January 1997 - - - 10.5.3 502 Bad Gateway .................................64 - 10.5.4 503 Service Unavailable .........................64 - 10.5.5 504 Gateway Timeout .............................64 - 10.5.6 505 HTTP Version Not Supported ..................65 - 11 Access Authentication..................................65 - 11.1 Basic Authentication Scheme ........................66 - 11.2 Digest Authentication Scheme .......................67 - 12 Content Negotiation....................................67 - 12.1 Server-driven Negotiation ..........................68 - 12.2 Agent-driven Negotiation ...........................69 - 12.3 Transparent Negotiation ............................70 - 13 Caching in HTTP........................................70 - 13.1.1 Cache Correctness ...............................72 - 13.1.2 Warnings ........................................73 - 13.1.3 Cache-control Mechanisms ........................74 - 13.1.4 Explicit User Agent Warnings ....................74 - 13.1.5 Exceptions to the Rules and Warnings ............75 - 13.1.6 Client-controlled Behavior ......................75 - 13.2 Expiration Model ...................................75 - 13.2.1 Server-Specified Expiration .....................75 - 13.2.2 Heuristic Expiration ............................76 - 13.2.3 Age Calculations ................................77 - 13.2.4 Expiration Calculations .........................79 - 13.2.5 Disambiguating Expiration Values ................80 - 13.2.6 Disambiguating Multiple Responses ...............80 - 13.3 Validation Model ...................................81 - 13.3.1 Last-modified Dates .............................82 - 13.3.2 Entity Tag Cache Validators .....................82 - 13.3.3 Weak and Strong Validators ......................82 - 13.3.4 Rules for When to Use Entity Tags and Last- - modified Dates..........................................85 - 13.3.5 Non-validating Conditionals .....................86 - 13.4 Response Cachability ...............................86 - 13.5 Constructing Responses From Caches .................87 - 13.5.1 End-to-end and Hop-by-hop Headers ...............88 - 13.5.2 Non-modifiable Headers ..........................88 - 13.5.3 Combining Headers ...............................89 - 13.5.4 Combining Byte Ranges ...........................90 - 13.6 Caching Negotiated Responses .......................90 - 13.7 Shared and Non-Shared Caches .......................91 - 13.8 Errors or Incomplete Response Cache Behavior .......91 - 13.9 Side Effects of GET and HEAD .......................92 - 13.10 Invalidation After Updates or Deletions ...........92 - 13.11 Write-Through Mandatory ...........................93 - 13.12 Cache Replacement .................................93 - 13.13 History Lists .....................................93 - 14 Header Field Definitions...............................94 - 14.1 Accept .............................................95 - - - -Fielding, et. al. Standards Track [Page 4] - -RFC 2068 HTTP/1.1 January 1997 - - - 14.2 Accept-Charset .....................................97 - 14.3 Accept-Encoding ....................................97 - 14.4 Accept-Language ....................................98 - 14.5 Accept-Ranges ......................................99 - 14.6 Age ................................................99 - 14.7 Allow .............................................100 - 14.8 Authorization .....................................100 - 14.9 Cache-Control .....................................101 - 14.9.1 What is Cachable ...............................103 - 14.9.2 What May be Stored by Caches ...................103 - 14.9.3 Modifications of the Basic Expiration Mechanism 104 - 14.9.4 Cache Revalidation and Reload Controls .........105 - 14.9.5 No-Transform Directive .........................107 - 14.9.6 Cache Control Extensions .......................108 - 14.10 Connection .......................................109 - 14.11 Content-Base .....................................109 - 14.12 Content-Encoding .................................110 - 14.13 Content-Language .................................110 - 14.14 Content-Length ...................................111 - 14.15 Content-Location .................................112 - 14.16 Content-MD5 ......................................113 - 14.17 Content-Range ....................................114 - 14.18 Content-Type .....................................116 - 14.19 Date .............................................116 - 14.20 ETag .............................................117 - 14.21 Expires ..........................................117 - 14.22 From .............................................118 - 14.23 Host .............................................119 - 14.24 If-Modified-Since ................................119 - 14.25 If-Match .........................................121 - 14.26 If-None-Match ....................................122 - 14.27 If-Range .........................................123 - 14.28 If-Unmodified-Since ..............................124 - 14.29 Last-Modified ....................................124 - 14.30 Location .........................................125 - 14.31 Max-Forwards .....................................125 - 14.32 Pragma ...........................................126 - 14.33 Proxy-Authenticate ...............................127 - 14.34 Proxy-Authorization ..............................127 - 14.35 Public ...........................................127 - 14.36 Range ............................................128 - 14.36.1 Byte Ranges ...................................128 - 14.36.2 Range Retrieval Requests ......................130 - 14.37 Referer ..........................................131 - 14.38 Retry-After ......................................131 - 14.39 Server ...........................................132 - 14.40 Transfer-Encoding ................................132 - 14.41 Upgrade ..........................................132 - - - -Fielding, et. al. Standards Track [Page 5] - -RFC 2068 HTTP/1.1 January 1997 - - - 14.42 User-Agent .......................................134 - 14.43 Vary .............................................134 - 14.44 Via ..............................................135 - 14.45 Warning ..........................................137 - 14.46 WWW-Authenticate .................................139 - 15 Security Considerations...............................139 - 15.1 Authentication of Clients .........................139 - 15.2 Offering a Choice of Authentication Schemes .......140 - 15.3 Abuse of Server Log Information ...................141 - 15.4 Transfer of Sensitive Information .................141 - 15.5 Attacks Based On File and Path Names ..............142 - 15.6 Personal Information ..............................143 - 15.7 Privacy Issues Connected to Accept Headers ........143 - 15.8 DNS Spoofing ......................................144 - 15.9 Location Headers and Spoofing .....................144 - 16 Acknowledgments.......................................144 - 17 References............................................146 - 18 Authors' Addresses....................................149 - 19 Appendices............................................150 - 19.1 Internet Media Type message/http ..................150 - 19.2 Internet Media Type multipart/byteranges ..........150 - 19.3 Tolerant Applications .............................151 - 19.4 Differences Between HTTP Entities and - MIME Entities...........................................152 - 19.4.1 Conversion to Canonical Form ...................152 - 19.4.2 Conversion of Date Formats .....................153 - 19.4.3 Introduction of Content-Encoding ...............153 - 19.4.4 No Content-Transfer-Encoding ...................153 - 19.4.5 HTTP Header Fields in Multipart Body-Parts .....153 - 19.4.6 Introduction of Transfer-Encoding ..............154 - 19.4.7 MIME-Version ...................................154 - 19.5 Changes from HTTP/1.0 .............................154 - 19.5.1 Changes to Simplify Multi-homed Web Servers and - Conserve IP Addresses .................................155 - 19.6 Additional Features ...............................156 - 19.6.1 Additional Request Methods .....................156 - 19.6.2 Additional Header Field Definitions ............156 - 19.7 Compatibility with Previous Versions ..............160 - 19.7.1 Compatibility with HTTP/1.0 Persistent - Connections............................................161 - - - - - - - - - - - -Fielding, et. al. Standards Track [Page 6] - -RFC 2068 HTTP/1.1 January 1997 - - -1 Introduction - -1.1 Purpose - - The Hypertext Transfer Protocol (HTTP) is an application-level - protocol for distributed, collaborative, hypermedia information - systems. HTTP has been in use by the World-Wide Web global - information initiative since 1990. The first version of HTTP, - referred to as HTTP/0.9, was a simple protocol for raw data transfer - across the Internet. HTTP/1.0, as defined by RFC 1945 [6], improved - the protocol by allowing messages to be in the format of MIME-like - messages, containing metainformation about the data transferred and - modifiers on the request/response semantics. However, HTTP/1.0 does - not sufficiently take into consideration the effects of hierarchical - proxies, caching, the need for persistent connections, and virtual - hosts. In addition, the proliferation of incompletely-implemented - applications calling themselves "HTTP/1.0" has necessitated a - protocol version change in order for two communicating applications - to determine each other's true capabilities. - - This specification defines the protocol referred to as "HTTP/1.1". - This protocol includes more stringent requirements than HTTP/1.0 in - order to ensure reliable implementation of its features. - - Practical information systems require more functionality than simple - retrieval, including search, front-end update, and annotation. HTTP - allows an open-ended set of methods that indicate the purpose of a - request. It builds on the discipline of reference provided by the - Uniform Resource Identifier (URI) [3][20], as a location (URL) [4] or - name (URN) , for indicating the resource to which a method is to be - applied. Messages are passed in a format similar to that used by - Internet mail as defined by the Multipurpose Internet Mail Extensions - (MIME). - - HTTP is also used as a generic protocol for communication between - user agents and proxies/gateways to other Internet systems, including - those supported by the SMTP [16], NNTP [13], FTP [18], Gopher [2], - and WAIS [10] protocols. In this way, HTTP allows basic hypermedia - access to resources available from diverse applications. - -1.2 Requirements - - This specification uses the same words as RFC 1123 [8] for defining - the significance of each particular requirement. These words are: - - MUST - This word or the adjective "required" means that the item is an - absolute requirement of the specification. - - - -Fielding, et. al. Standards Track [Page 7] - -RFC 2068 HTTP/1.1 January 1997 - - - SHOULD - This word or the adjective "recommended" means that there may - exist valid reasons in particular circumstances to ignore this - item, but the full implications should be understood and the case - carefully weighed before choosing a different course. - - MAY - This word or the adjective "optional" means that this item is - truly optional. One vendor may choose to include the item because - a particular marketplace requires it or because it enhances the - product, for example; another vendor may omit the same item. - - An implementation is not compliant if it fails to satisfy one or more - of the MUST requirements for the protocols it implements. An - implementation that satisfies all the MUST and all the SHOULD - requirements for its protocols is said to be "unconditionally - compliant"; one that satisfies all the MUST requirements but not all - the SHOULD requirements for its protocols is said to be - "conditionally compliant." - -1.3 Terminology - - This specification uses a number of terms to refer to the roles - played by participants in, and objects of, the HTTP communication. - - connection - A transport layer virtual circuit established between two programs - for the purpose of communication. - - message - The basic unit of HTTP communication, consisting of a structured - sequence of octets matching the syntax defined in section 4 and - transmitted via the connection. - - request - An HTTP request message, as defined in section 5. - - response - An HTTP response message, as defined in section 6. - - resource - A network data object or service that can be identified by a URI, - as defined in section 3.2. Resources may be available in multiple - representations (e.g. multiple languages, data formats, size, - resolutions) or vary in other ways. - - - - - - -Fielding, et. al. Standards Track [Page 8] - -RFC 2068 HTTP/1.1 January 1997 - - - entity - The information transferred as the payload of a request or - response. An entity consists of metainformation in the form of - entity-header fields and content in the form of an entity-body, as - described in section 7. - - representation - An entity included with a response that is subject to content - negotiation, as described in section 12. There may exist multiple - representations associated with a particular response status. - - content negotiation - The mechanism for selecting the appropriate representation when - servicing a request, as described in section 12. The - representation of entities in any response can be negotiated - (including error responses). - - variant - A resource may have one, or more than one, representation(s) - associated with it at any given instant. Each of these - representations is termed a `variant.' Use of the term `variant' - does not necessarily imply that the resource is subject to content - negotiation. - - client - A program that establishes connections for the purpose of sending - requests. - - user agent - The client which initiates a request. These are often browsers, - editors, spiders (web-traversing robots), or other end user tools. - - server - An application program that accepts connections in order to - service requests by sending back responses. Any given program may - be capable of being both a client and a server; our use of these - terms refers only to the role being performed by the program for a - particular connection, rather than to the program's capabilities - in general. Likewise, any server may act as an origin server, - proxy, gateway, or tunnel, switching behavior based on the nature - of each request. - - origin server - The server on which a given resource resides or is to be created. - - - - - - - -Fielding, et. al. Standards Track [Page 9] - -RFC 2068 HTTP/1.1 January 1997 - - - proxy - An intermediary program which acts as both a server and a client - for the purpose of making requests on behalf of other clients. - Requests are serviced internally or by passing them on, with - possible translation, to other servers. A proxy must implement - both the client and server requirements of this specification. - - gateway - A server which acts as an intermediary for some other server. - Unlike a proxy, a gateway receives requests as if it were the - origin server for the requested resource; the requesting client - may not be aware that it is communicating with a gateway. - - tunnel - An intermediary program which is acting as a blind relay between - two connections. Once active, a tunnel is not considered a party - to the HTTP communication, though the tunnel may have been - initiated by an HTTP request. The tunnel ceases to exist when both - ends of the relayed connections are closed. - - cache - A program's local store of response messages and the subsystem - that controls its message storage, retrieval, and deletion. A - cache stores cachable responses in order to reduce the response - time and network bandwidth consumption on future, equivalent - requests. Any client or server may include a cache, though a cache - cannot be used by a server that is acting as a tunnel. - - cachable - A response is cachable if a cache is allowed to store a copy of - the response message for use in answering subsequent requests. The - rules for determining the cachability of HTTP responses are - defined in section 13. Even if a resource is cachable, there may - be additional constraints on whether a cache can use the cached - copy for a particular request. - - first-hand - A response is first-hand if it comes directly and without - unnecessary delay from the origin server, perhaps via one or more - proxies. A response is also first-hand if its validity has just - been checked directly with the origin server. - - explicit expiration time - The time at which the origin server intends that an entity should - no longer be returned by a cache without further validation. - - - - - - -Fielding, et. al. Standards Track [Page 10] - -RFC 2068 HTTP/1.1 January 1997 - - - heuristic expiration time - An expiration time assigned by a cache when no explicit expiration - time is available. - - age - The age of a response is the time since it was sent by, or - successfully validated with, the origin server. - - freshness lifetime - The length of time between the generation of a response and its - expiration time. - - fresh - A response is fresh if its age has not yet exceeded its freshness - lifetime. - - stale - A response is stale if its age has passed its freshness lifetime. - - semantically transparent - A cache behaves in a "semantically transparent" manner, with - respect to a particular response, when its use affects neither the - requesting client nor the origin server, except to improve - performance. When a cache is semantically transparent, the client - receives exactly the same response (except for hop-by-hop headers) - that it would have received had its request been handled directly - by the origin server. - - validator - A protocol element (e.g., an entity tag or a Last-Modified time) - that is used to find out whether a cache entry is an equivalent - copy of an entity. - -1.4 Overall Operation - - The HTTP protocol is a request/response protocol. A client sends a - request to the server in the form of a request method, URI, and - protocol version, followed by a MIME-like message containing request - modifiers, client information, and possible body content over a - connection with a server. The server responds with a status line, - including the message's protocol version and a success or error code, - followed by a MIME-like message containing server information, entity - metainformation, and possible entity-body content. The relationship - between HTTP and MIME is described in appendix 19.4. - - - - - - - -Fielding, et. al. Standards Track [Page 11] - -RFC 2068 HTTP/1.1 January 1997 - - - Most HTTP communication is initiated by a user agent and consists of - a request to be applied to a resource on some origin server. In the - simplest case, this may be accomplished via a single connection (v) - between the user agent (UA) and the origin server (O). - - request chain ------------------------> - UA -------------------v------------------- O - <----------------------- response chain - - A more complicated situation occurs when one or more intermediaries - are present in the request/response chain. There are three common - forms of intermediary: proxy, gateway, and tunnel. A proxy is a - forwarding agent, receiving requests for a URI in its absolute form, - rewriting all or part of the message, and forwarding the reformatted - request toward the server identified by the URI. A gateway is a - receiving agent, acting as a layer above some other server(s) and, if - necessary, translating the requests to the underlying server's - protocol. A tunnel acts as a relay point between two connections - without changing the messages; tunnels are used when the - communication needs to pass through an intermediary (such as a - firewall) even when the intermediary cannot understand the contents - of the messages. - - request chain --------------------------------------> - UA -----v----- A -----v----- B -----v----- C -----v----- O - <------------------------------------- response chain - - The figure above shows three intermediaries (A, B, and C) between the - user agent and origin server. A request or response message that - travels the whole chain will pass through four separate connections. - This distinction is important because some HTTP communication options - may apply only to the connection with the nearest, non-tunnel - neighbor, only to the end-points of the chain, or to all connections - along the chain. Although the diagram is linear, each participant - may be engaged in multiple, simultaneous communications. For example, - B may be receiving requests from many clients other than A, and/or - forwarding requests to servers other than C, at the same time that it - is handling A's request. - - Any party to the communication which is not acting as a tunnel may - employ an internal cache for handling requests. The effect of a cache - is that the request/response chain is shortened if one of the - participants along the chain has a cached response applicable to that - request. The following illustrates the resulting chain if B has a - cached copy of an earlier response from O (via C) for a request which - has not been cached by UA or A. - - - - - -Fielding, et. al. Standards Track [Page 12] - -RFC 2068 HTTP/1.1 January 1997 - - - request chain ----------> - UA -----v----- A -----v----- B - - - - - - C - - - - - - O - <--------- response chain - - Not all responses are usefully cachable, and some requests may - contain modifiers which place special requirements on cache behavior. - HTTP requirements for cache behavior and cachable responses are - defined in section 13. - - In fact, there are a wide variety of architectures and configurations - of caches and proxies currently being experimented with or deployed - across the World Wide Web; these systems include national hierarchies - of proxy caches to save transoceanic bandwidth, systems that - broadcast or multicast cache entries, organizations that distribute - subsets of cached data via CD-ROM, and so on. HTTP systems are used - in corporate intranets over high-bandwidth links, and for access via - PDAs with low-power radio links and intermittent connectivity. The - goal of HTTP/1.1 is to support the wide diversity of configurations - already deployed while introducing protocol constructs that meet the - needs of those who build web applications that require high - reliability and, failing that, at least reliable indications of - failure. - - HTTP communication usually takes place over TCP/IP connections. The - default port is TCP 80, but other ports can be used. This does not - preclude HTTP from being implemented on top of any other protocol on - the Internet, or on other networks. HTTP only presumes a reliable - transport; any protocol that provides such guarantees can be used; - the mapping of the HTTP/1.1 request and response structures onto the - transport data units of the protocol in question is outside the scope - of this specification. - - In HTTP/1.0, most implementations used a new connection for each - request/response exchange. In HTTP/1.1, a connection may be used for - one or more request/response exchanges, although connections may be - closed for a variety of reasons (see section 8.1). - -2 Notational Conventions and Generic Grammar - -2.1 Augmented BNF - - All of the mechanisms specified in this document are described in - both prose and an augmented Backus-Naur Form (BNF) similar to that - used by RFC 822 [9]. Implementers will need to be familiar with the - notation in order to understand this specification. The augmented BNF - includes the following constructs: - - - - - -Fielding, et. al. Standards Track [Page 13] - -RFC 2068 HTTP/1.1 January 1997 - - -name = definition - The name of a rule is simply the name itself (without any enclosing - "<" and ">") and is separated from its definition by the equal "=" - character. Whitespace is only significant in that indentation of - continuation lines is used to indicate a rule definition that spans - more than one line. Certain basic rules are in uppercase, such as - SP, LWS, HT, CRLF, DIGIT, ALPHA, etc. Angle brackets are used - within definitions whenever their presence will facilitate - discerning the use of rule names. - -"literal" - Quotation marks surround literal text. Unless stated otherwise, the - text is case-insensitive. - -rule1 | rule2 - Elements separated by a bar ("|") are alternatives, e.g., "yes | - no" will accept yes or no. - -(rule1 rule2) - Elements enclosed in parentheses are treated as a single element. - Thus, "(elem (foo | bar) elem)" allows the token sequences "elem - foo elem" and "elem bar elem". - -*rule - The character "*" preceding an element indicates repetition. The - full form is "*element" indicating at least and at most - occurrences of element. Default values are 0 and infinity so - that "*(element)" allows any number, including zero; "1*element" - requires at least one; and "1*2element" allows one or two. - -[rule] - Square brackets enclose optional elements; "[foo bar]" is - equivalent to "*1(foo bar)". - -N rule - Specific repetition: "(element)" is equivalent to - "*(element)"; that is, exactly occurrences of (element). - Thus 2DIGIT is a 2-digit number, and 3ALPHA is a string of three - alphabetic characters. - -#rule - A construct "#" is defined, similar to "*", for defining lists of - elements. The full form is "#element " indicating at least - and at most elements, each separated by one or more commas - (",") and optional linear whitespace (LWS). This makes the usual - form of lists very easy; a rule such as "( *LWS element *( *LWS "," - *LWS element )) " can be shown as "1#element". Wherever this - construct is used, null elements are allowed, but do not contribute - - - -Fielding, et. al. Standards Track [Page 14] - -RFC 2068 HTTP/1.1 January 1997 - - - to the count of elements present. That is, "(element), , (element) - " is permitted, but counts as only two elements. Therefore, where - at least one element is required, at least one non-null element - must be present. Default values are 0 and infinity so that - "#element" allows any number, including zero; "1#element" requires - at least one; and "1#2element" allows one or two. - -; comment - A semi-colon, set off some distance to the right of rule text, - starts a comment that continues to the end of line. This is a - simple way of including useful notes in parallel with the - specifications. - -implied *LWS - The grammar described by this specification is word-based. Except - where noted otherwise, linear whitespace (LWS) can be included - between any two adjacent words (token or quoted-string), and - between adjacent tokens and delimiters (tspecials), without - changing the interpretation of a field. At least one delimiter - (tspecials) must exist between any two tokens, since they would - otherwise be interpreted as a single token. - -2.2 Basic Rules - - The following rules are used throughout this specification to - describe basic parsing constructs. The US-ASCII coded character set - is defined by ANSI X3.4-1986 [21]. - - OCTET = - CHAR = - UPALPHA = - LOALPHA = - ALPHA = UPALPHA | LOALPHA - DIGIT = - CTL = - CR = - LF = - SP = - HT = - <"> = - - - - - - - - - - -Fielding, et. al. Standards Track [Page 15] - -RFC 2068 HTTP/1.1 January 1997 - - - HTTP/1.1 defines the sequence CR LF as the end-of-line marker for all - protocol elements except the entity-body (see appendix 19.3 for - tolerant applications). The end-of-line marker within an entity-body - is defined by its associated media type, as described in section 3.7. - - CRLF = CR LF - - HTTP/1.1 headers can be folded onto multiple lines if the - continuation line begins with a space or horizontal tab. All linear - white space, including folding, has the same semantics as SP. - - LWS = [CRLF] 1*( SP | HT ) - - The TEXT rule is only used for descriptive field contents and values - that are not intended to be interpreted by the message parser. Words - of *TEXT may contain characters from character sets other than ISO - 8859-1 [22] only when encoded according to the rules of RFC 1522 - [14]. - - TEXT = - - Hexadecimal numeric characters are used in several protocol elements. - - HEX = "A" | "B" | "C" | "D" | "E" | "F" - | "a" | "b" | "c" | "d" | "e" | "f" | DIGIT - - Many HTTP/1.1 header field values consist of words separated by LWS - or special characters. These special characters MUST be in a quoted - string to be used within a parameter value. - - token = 1* - - tspecials = "(" | ")" | "<" | ">" | "@" - | "," | ";" | ":" | "\" | <"> - | "/" | "[" | "]" | "?" | "=" - | "{" | "}" | SP | HT - - Comments can be included in some HTTP header fields by surrounding - the comment text with parentheses. Comments are only allowed in - fields containing "comment" as part of their field value definition. - In all other fields, parentheses are considered part of the field - value. - - comment = "(" *( ctext | comment ) ")" - ctext = - - - - - -Fielding, et. al. Standards Track [Page 16] - -RFC 2068 HTTP/1.1 January 1997 - - - A string of text is parsed as a single word if it is quoted using - double-quote marks. - - quoted-string = ( <"> *(qdtext) <"> ) - - qdtext = > - - The backslash character ("\") may be used as a single-character quoting - mechanism only within quoted-string and comment constructs. - - quoted-pair = "\" CHAR - -3 Protocol Parameters - -3.1 HTTP Version - - HTTP uses a "." numbering scheme to indicate versions - of the protocol. The protocol versioning policy is intended to allow - the sender to indicate the format of a message and its capacity for - understanding further HTTP communication, rather than the features - obtained via that communication. No change is made to the version - number for the addition of message components which do not affect - communication behavior or which only add to extensible field values. - The number is incremented when the changes made to the - protocol add features which do not change the general message parsing - algorithm, but which may add to the message semantics and imply - additional capabilities of the sender. The number is - incremented when the format of a message within the protocol is - changed. - - The version of an HTTP message is indicated by an HTTP-Version field - in the first line of the message. - - HTTP-Version = "HTTP" "/" 1*DIGIT "." 1*DIGIT - - Note that the major and minor numbers MUST be treated as separate - integers and that each may be incremented higher than a single digit. - Thus, HTTP/2.4 is a lower version than HTTP/2.13, which in turn is - lower than HTTP/12.3. Leading zeros MUST be ignored by recipients and - MUST NOT be sent. - - Applications sending Request or Response messages, as defined by this - specification, MUST include an HTTP-Version of "HTTP/1.1". Use of - this version number indicates that the sending application is at - least conditionally compliant with this specification. - - The HTTP version of an application is the highest HTTP version for - which the application is at least conditionally compliant. - - - -Fielding, et. al. Standards Track [Page 17] - -RFC 2068 HTTP/1.1 January 1997 - - - Proxy and gateway applications must be careful when forwarding - messages in protocol versions different from that of the application. - Since the protocol version indicates the protocol capability of the - sender, a proxy/gateway MUST never send a message with a version - indicator which is greater than its actual version; if a higher - version request is received, the proxy/gateway MUST either downgrade - the request version, respond with an error, or switch to tunnel - behavior. Requests with a version lower than that of the - proxy/gateway's version MAY be upgraded before being forwarded; the - proxy/gateway's response to that request MUST be in the same major - version as the request. - - Note: Converting between versions of HTTP may involve modification - of header fields required or forbidden by the versions involved. - -3.2 Uniform Resource Identifiers - - URIs have been known by many names: WWW addresses, Universal Document - Identifiers, Universal Resource Identifiers , and finally the - combination of Uniform Resource Locators (URL) and Names (URN). As - far as HTTP is concerned, Uniform Resource Identifiers are simply - formatted strings which identify--via name, location, or any other - characteristic--a resource. - -3.2.1 General Syntax - - URIs in HTTP can be represented in absolute form or relative to some - known base URI, depending upon the context of their use. The two - forms are differentiated by the fact that absolute URIs always begin - with a scheme name followed by a colon. - - URI = ( absoluteURI | relativeURI ) [ "#" fragment ] - - absoluteURI = scheme ":" *( uchar | reserved ) - - relativeURI = net_path | abs_path | rel_path - - net_path = "//" net_loc [ abs_path ] - abs_path = "/" rel_path - rel_path = [ path ] [ ";" params ] [ "?" query ] - - path = fsegment *( "/" segment ) - fsegment = 1*pchar - segment = *pchar - - params = param *( ";" param ) - param = *( pchar | "/" ) - - - - -Fielding, et. al. Standards Track [Page 18] - -RFC 2068 HTTP/1.1 January 1997 - - - scheme = 1*( ALPHA | DIGIT | "+" | "-" | "." ) - net_loc = *( pchar | ";" | "?" ) - - query = *( uchar | reserved ) - fragment = *( uchar | reserved ) - - pchar = uchar | ":" | "@" | "&" | "=" | "+" - uchar = unreserved | escape - unreserved = ALPHA | DIGIT | safe | extra | national - - escape = "%" HEX HEX - reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" - extra = "!" | "*" | "'" | "(" | ")" | "," - safe = "$" | "-" | "_" | "." - unsafe = CTL | SP | <"> | "#" | "%" | "<" | ">" - national = - - For definitive information on URL syntax and semantics, see RFC 1738 - [4] and RFC 1808 [11]. The BNF above includes national characters not - allowed in valid URLs as specified by RFC 1738, since HTTP servers - are not restricted in the set of unreserved characters allowed to - represent the rel_path part of addresses, and HTTP proxies may - receive requests for URIs not defined by RFC 1738. - - The HTTP protocol does not place any a priori limit on the length of - a URI. Servers MUST be able to handle the URI of any resource they - serve, and SHOULD be able to handle URIs of unbounded length if they - provide GET-based forms that could generate such URIs. A server - SHOULD return 414 (Request-URI Too Long) status if a URI is longer - than the server can handle (see section 10.4.15). - - Note: Servers should be cautious about depending on URI lengths - above 255 bytes, because some older client or proxy implementations - may not properly support these lengths. - -3.2.2 http URL - - The "http" scheme is used to locate network resources via the HTTP - protocol. This section defines the scheme-specific syntax and - semantics for http URLs. - - - - - - - - - - -Fielding, et. al. Standards Track [Page 19] - -RFC 2068 HTTP/1.1 January 1997 - - - http_URL = "http:" "//" host [ ":" port ] [ abs_path ] - - host = - - port = *DIGIT - - If the port is empty or not given, port 80 is assumed. The semantics - are that the identified resource is located at the server listening - for TCP connections on that port of that host, and the Request-URI - for the resource is abs_path. The use of IP addresses in URL's SHOULD - be avoided whenever possible (see RFC 1900 [24]). If the abs_path is - not present in the URL, it MUST be given as "/" when used as a - Request-URI for a resource (section 5.1.2). - -3.2.3 URI Comparison - - When comparing two URIs to decide if they match or not, a client - SHOULD use a case-sensitive octet-by-octet comparison of the entire - URIs, with these exceptions: - - o A port that is empty or not given is equivalent to the default - port for that URI; - - o Comparisons of host names MUST be case-insensitive; - - o Comparisons of scheme names MUST be case-insensitive; - - o An empty abs_path is equivalent to an abs_path of "/". - - Characters other than those in the "reserved" and "unsafe" sets (see - section 3.2) are equivalent to their ""%" HEX HEX" encodings. - - For example, the following three URIs are equivalent: - - http://abc.com:80/~smith/home.html - http://ABC.com/%7Esmith/home.html - http://ABC.com:/%7esmith/home.html - - - - - - - - - - - - -Fielding, et. al. Standards Track [Page 20] - -RFC 2068 HTTP/1.1 January 1997 - - -3.3 Date/Time Formats - -3.3.1 Full Date - - HTTP applications have historically allowed three different formats - for the representation of date/time stamps: - - Sun, 06 Nov 1994 08:49:37 GMT ; RFC 822, updated by RFC 1123 - Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036 - Sun Nov 6 08:49:37 1994 ; ANSI C's asctime() format - - The first format is preferred as an Internet standard and represents - a fixed-length subset of that defined by RFC 1123 (an update to RFC - 822). The second format is in common use, but is based on the - obsolete RFC 850 [12] date format and lacks a four-digit year. - HTTP/1.1 clients and servers that parse the date value MUST accept - all three formats (for compatibility with HTTP/1.0), though they MUST - only generate the RFC 1123 format for representing HTTP-date values - in header fields. - - Note: Recipients of date values are encouraged to be robust in - accepting date values that may have been sent by non-HTTP - applications, as is sometimes the case when retrieving or posting - messages via proxies/gateways to SMTP or NNTP. - - All HTTP date/time stamps MUST be represented in Greenwich Mean Time - (GMT), without exception. This is indicated in the first two formats - by the inclusion of "GMT" as the three-letter abbreviation for time - zone, and MUST be assumed when reading the asctime format. - - HTTP-date = rfc1123-date | rfc850-date | asctime-date - - rfc1123-date = wkday "," SP date1 SP time SP "GMT" - rfc850-date = weekday "," SP date2 SP time SP "GMT" - asctime-date = wkday SP date3 SP time SP 4DIGIT - - date1 = 2DIGIT SP month SP 4DIGIT - ; day month year (e.g., 02 Jun 1982) - date2 = 2DIGIT "-" month "-" 2DIGIT - ; day-month-year (e.g., 02-Jun-82) - date3 = month SP ( 2DIGIT | ( SP 1DIGIT )) - ; month day (e.g., Jun 2) - - time = 2DIGIT ":" 2DIGIT ":" 2DIGIT - ; 00:00:00 - 23:59:59 - - wkday = "Mon" | "Tue" | "Wed" - | "Thu" | "Fri" | "Sat" | "Sun" - - - -Fielding, et. al. Standards Track [Page 21] - -RFC 2068 HTTP/1.1 January 1997 - - - weekday = "Monday" | "Tuesday" | "Wednesday" - | "Thursday" | "Friday" | "Saturday" | "Sunday" - - month = "Jan" | "Feb" | "Mar" | "Apr" - | "May" | "Jun" | "Jul" | "Aug" - | "Sep" | "Oct" | "Nov" | "Dec" - - Note: HTTP requirements for the date/time stamp format apply only - to their usage within the protocol stream. Clients and servers are - not required to use these formats for user presentation, request - logging, etc. - -3.3.2 Delta Seconds - - Some HTTP header fields allow a time value to be specified as an - integer number of seconds, represented in decimal, after the time - that the message was received. - - delta-seconds = 1*DIGIT - -3.4 Character Sets - - HTTP uses the same definition of the term "character set" as that - described for MIME: - - The term "character set" is used in this document to refer to a - method used with one or more tables to convert a sequence of octets - into a sequence of characters. Note that unconditional conversion - in the other direction is not required, in that not all characters - may be available in a given character set and a character set may - provide more than one sequence of octets to represent a particular - character. This definition is intended to allow various kinds of - character encodings, from simple single-table mappings such as US- - ASCII to complex table switching methods such as those that use ISO - 2022's techniques. However, the definition associated with a MIME - character set name MUST fully specify the mapping to be performed - from octets to characters. In particular, use of external profiling - information to determine the exact mapping is not permitted. - - Note: This use of the term "character set" is more commonly - referred to as a "character encoding." However, since HTTP and MIME - share the same registry, it is important that the terminology also - be shared. - - - - - - - - -Fielding, et. al. Standards Track [Page 22] - -RFC 2068 HTTP/1.1 January 1997 - - - HTTP character sets are identified by case-insensitive tokens. The - complete set of tokens is defined by the IANA Character Set registry - [19]. - - charset = token - - Although HTTP allows an arbitrary token to be used as a charset - value, any token that has a predefined value within the IANA - Character Set registry MUST represent the character set defined by - that registry. Applications SHOULD limit their use of character sets - to those defined by the IANA registry. - -3.5 Content Codings - - Content coding values indicate an encoding transformation that has - been or can be applied to an entity. Content codings are primarily - used to allow a document to be compressed or otherwise usefully - transformed without losing the identity of its underlying media type - and without loss of information. Frequently, the entity is stored in - coded form, transmitted directly, and only decoded by the recipient. - - content-coding = token - - All content-coding values are case-insensitive. HTTP/1.1 uses - content-coding values in the Accept-Encoding (section 14.3) and - Content-Encoding (section 14.12) header fields. Although the value - describes the content-coding, what is more important is that it - indicates what decoding mechanism will be required to remove the - encoding. - - The Internet Assigned Numbers Authority (IANA) acts as a registry for - content-coding value tokens. Initially, the registry contains the - following tokens: - - gzip An encoding format produced by the file compression program "gzip" - (GNU zip) as described in RFC 1952 [25]. This format is a Lempel- - Ziv coding (LZ77) with a 32 bit CRC. - - compress - The encoding format produced by the common UNIX file compression - program "compress". This format is an adaptive Lempel-Ziv-Welch - coding (LZW). - - - - - - - - - -Fielding, et. al. Standards Track [Page 23] - -RFC 2068 HTTP/1.1 January 1997 - - - Note: Use of program names for the identification of encoding - formats is not desirable and should be discouraged for future - encodings. Their use here is representative of historical practice, - not good design. For compatibility with previous implementations of - HTTP, applications should consider "x-gzip" and "x-compress" to be - equivalent to "gzip" and "compress" respectively. - - deflate The "zlib" format defined in RFC 1950[31] in combination with - the "deflate" compression mechanism described in RFC 1951[29]. - - New content-coding value tokens should be registered; to allow - interoperability between clients and servers, specifications of the - content coding algorithms needed to implement a new value should be - publicly available and adequate for independent implementation, and - conform to the purpose of content coding defined in this section. - -3.6 Transfer Codings - - Transfer coding values are used to indicate an encoding - transformation that has been, can be, or may need to be applied to an - entity-body in order to ensure "safe transport" through the network. - This differs from a content coding in that the transfer coding is a - property of the message, not of the original entity. - - transfer-coding = "chunked" | transfer-extension - - transfer-extension = token - - All transfer-coding values are case-insensitive. HTTP/1.1 uses - transfer coding values in the Transfer-Encoding header field (section - 14.40). - - Transfer codings are analogous to the Content-Transfer-Encoding - values of MIME , which were designed to enable safe transport of - binary data over a 7-bit transport service. However, safe transport - has a different focus for an 8bit-clean transfer protocol. In HTTP, - the only unsafe characteristic of message-bodies is the difficulty in - determining the exact body length (section 7.2.2), or the desire to - encrypt data over a shared transport. - - The chunked encoding modifies the body of a message in order to - transfer it as a series of chunks, each with its own size indicator, - followed by an optional footer containing entity-header fields. This - allows dynamically-produced content to be transferred along with the - information necessary for the recipient to verify that it has - received the full message. - - - - - -Fielding, et. al. Standards Track [Page 24] - -RFC 2068 HTTP/1.1 January 1997 - - - Chunked-Body = *chunk - "0" CRLF - footer - CRLF - - chunk = chunk-size [ chunk-ext ] CRLF - chunk-data CRLF - - hex-no-zero = - - chunk-size = hex-no-zero *HEX - chunk-ext = *( ";" chunk-ext-name [ "=" chunk-ext-value ] ) - chunk-ext-name = token - chunk-ext-val = token | quoted-string - chunk-data = chunk-size(OCTET) - - footer = *entity-header - - The chunked encoding is ended by a zero-sized chunk followed by the - footer, which is terminated by an empty line. The purpose of the - footer is to provide an efficient way to supply information about an - entity that is generated dynamically; applications MUST NOT send - header fields in the footer which are not explicitly defined as being - appropriate for the footer, such as Content-MD5 or future extensions - to HTTP for digital signatures or other facilities. - - An example process for decoding a Chunked-Body is presented in - appendix 19.4.6. - - All HTTP/1.1 applications MUST be able to receive and decode the - "chunked" transfer coding, and MUST ignore transfer coding extensions - they do not understand. A server which receives an entity-body with a - transfer-coding it does not understand SHOULD return 501 - (Unimplemented), and close the connection. A server MUST NOT send - transfer-codings to an HTTP/1.0 client. - -3.7 Media Types - - HTTP uses Internet Media Types in the Content-Type (section 14.18) - and Accept (section 14.1) header fields in order to provide open and - extensible data typing and type negotiation. - - media-type = type "/" subtype *( ";" parameter ) - type = token - subtype = token - - Parameters may follow the type/subtype in the form of attribute/value - pairs. - - - -Fielding, et. al. Standards Track [Page 25] - -RFC 2068 HTTP/1.1 January 1997 - - - parameter = attribute "=" value - attribute = token - value = token | quoted-string - - The type, subtype, and parameter attribute names are case- - insensitive. Parameter values may or may not be case-sensitive, - depending on the semantics of the parameter name. Linear white space - (LWS) MUST NOT be used between the type and subtype, nor between an - attribute and its value. User agents that recognize the media-type - MUST process (or arrange to be processed by any external applications - used to process that type/subtype by the user agent) the parameters - for that MIME type as described by that type/subtype definition to - the and inform the user of any problems discovered. - - Note: some older HTTP applications do not recognize media type - parameters. When sending data to older HTTP applications, - implementations should only use media type parameters when they are - required by that type/subtype definition. - - Media-type values are registered with the Internet Assigned Number - Authority (IANA). The media type registration process is outlined in - RFC 2048 [17]. Use of non-registered media types is discouraged. - -3.7.1 Canonicalization and Text Defaults - - Internet media types are registered with a canonical form. In - general, an entity-body transferred via HTTP messages MUST be - represented in the appropriate canonical form prior to its - transmission; the exception is "text" types, as defined in the next - paragraph. - - When in canonical form, media subtypes of the "text" type use CRLF as - the text line break. HTTP relaxes this requirement and allows the - transport of text media with plain CR or LF alone representing a line - break when it is done consistently for an entire entity-body. HTTP - applications MUST accept CRLF, bare CR, and bare LF as being - representative of a line break in text media received via HTTP. In - addition, if the text is represented in a character set that does not - use octets 13 and 10 for CR and LF respectively, as is the case for - some multi-byte character sets, HTTP allows the use of whatever octet - sequences are defined by that character set to represent the - equivalent of CR and LF for line breaks. This flexibility regarding - line breaks applies only to text media in the entity-body; a bare CR - or LF MUST NOT be substituted for CRLF within any of the HTTP control - structures (such as header fields and multipart boundaries). - - If an entity-body is encoded with a Content-Encoding, the underlying - data MUST be in a form defined above prior to being encoded. - - - -Fielding, et. al. Standards Track [Page 26] - -RFC 2068 HTTP/1.1 January 1997 - - - The "charset" parameter is used with some media types to define the - character set (section 3.4) of the data. When no explicit charset - parameter is provided by the sender, media subtypes of the "text" - type are defined to have a default charset value of "ISO-8859-1" when - received via HTTP. Data in character sets other than "ISO-8859-1" or - its subsets MUST be labeled with an appropriate charset value. - - Some HTTP/1.0 software has interpreted a Content-Type header without - charset parameter incorrectly to mean "recipient should guess." - Senders wishing to defeat this behavior MAY include a charset - parameter even when the charset is ISO-8859-1 and SHOULD do so when - it is known that it will not confuse the recipient. - - Unfortunately, some older HTTP/1.0 clients did not deal properly with - an explicit charset parameter. HTTP/1.1 recipients MUST respect the - charset label provided by the sender; and those user agents that have - a provision to "guess" a charset MUST use the charset from the - content-type field if they support that charset, rather than the - recipient's preference, when initially displaying a document. - -3.7.2 Multipart Types - - MIME provides for a number of "multipart" types -- encapsulations of - one or more entities within a single message-body. All multipart - types share a common syntax, as defined in MIME [7], and MUST - include a boundary parameter as part of the media type value. The - message body is itself a protocol element and MUST therefore use only - CRLF to represent line breaks between body-parts. Unlike in MIME, the - epilogue of any multipart message MUST be empty; HTTP applications - MUST NOT transmit the epilogue (even if the original multipart - contains an epilogue). - - In HTTP, multipart body-parts MAY contain header fields which are - significant to the meaning of that part. A Content-Location header - field (section 14.15) SHOULD be included in the body-part of each - enclosed entity that can be identified by a URL. - - In general, an HTTP user agent SHOULD follow the same or similar - behavior as a MIME user agent would upon receipt of a multipart type. - If an application receives an unrecognized multipart subtype, the - application MUST treat it as being equivalent to "multipart/mixed". - - Note: The "multipart/form-data" type has been specifically defined - for carrying form data suitable for processing via the POST request - method, as described in RFC 1867 [15]. - - - - - - -Fielding, et. al. Standards Track [Page 27] - -RFC 2068 HTTP/1.1 January 1997 - - -3.8 Product Tokens - - Product tokens are used to allow communicating applications to - identify themselves by software name and version. Most fields using - product tokens also allow sub-products which form a significant part - of the application to be listed, separated by whitespace. By - convention, the products are listed in order of their significance - for identifying the application. - - product = token ["/" product-version] - product-version = token - - Examples: - - User-Agent: CERN-LineMode/2.15 libwww/2.17b3 - Server: Apache/0.8.4 - - Product tokens should be short and to the point -- use of them for - advertising or other non-essential information is explicitly - forbidden. Although any token character may appear in a product- - version, this token SHOULD only be used for a version identifier - (i.e., successive versions of the same product SHOULD only differ in - the product-version portion of the product value). - -3.9 Quality Values - - HTTP content negotiation (section 12) uses short "floating point" - numbers to indicate the relative importance ("weight") of various - negotiable parameters. A weight is normalized to a real number in the - range 0 through 1, where 0 is the minimum and 1 the maximum value. - HTTP/1.1 applications MUST NOT generate more than three digits after - the decimal point. User configuration of these values SHOULD also be - limited in this fashion. - - qvalue = ( "0" [ "." 0*3DIGIT ] ) - | ( "1" [ "." 0*3("0") ] ) - - "Quality values" is a misnomer, since these values merely represent - relative degradation in desired quality. - -3.10 Language Tags - - A language tag identifies a natural language spoken, written, or - otherwise conveyed by human beings for communication of information - to other human beings. Computer languages are explicitly excluded. - HTTP uses language tags within the Accept-Language and Content- - Language fields. - - - - -Fielding, et. al. Standards Track [Page 28] - -RFC 2068 HTTP/1.1 January 1997 - - - The syntax and registry of HTTP language tags is the same as that - defined by RFC 1766 [1]. In summary, a language tag is composed of 1 - or more parts: A primary language tag and a possibly empty series of - subtags: - - language-tag = primary-tag *( "-" subtag ) - - primary-tag = 1*8ALPHA - subtag = 1*8ALPHA - - Whitespace is not allowed within the tag and all tags are case- - insensitive. The name space of language tags is administered by the - IANA. Example tags include: - - en, en-US, en-cockney, i-cherokee, x-pig-latin - - where any two-letter primary-tag is an ISO 639 language abbreviation - and any two-letter initial subtag is an ISO 3166 country code. (The - last three tags above are not registered tags; all but the last are - examples of tags which could be registered in future.) - -3.11 Entity Tags - - Entity tags are used for comparing two or more entities from the same - requested resource. HTTP/1.1 uses entity tags in the ETag (section - 14.20), If-Match (section 14.25), If-None-Match (section 14.26), and - If-Range (section 14.27) header fields. The definition of how they - are used and compared as cache validators is in section 13.3.3. An - entity tag consists of an opaque quoted string, possibly prefixed by - a weakness indicator. - - entity-tag = [ weak ] opaque-tag - - weak = "W/" - opaque-tag = quoted-string - - A "strong entity tag" may be shared by two entities of a resource - only if they are equivalent by octet equality. - - A "weak entity tag," indicated by the "W/" prefix, may be shared by - two entities of a resource only if the entities are equivalent and - could be substituted for each other with no significant change in - semantics. A weak entity tag can only be used for weak comparison. - - An entity tag MUST be unique across all versions of all entities - associated with a particular resource. A given entity tag value may - be used for entities obtained by requests on different URIs without - implying anything about the equivalence of those entities. - - - -Fielding, et. al. Standards Track [Page 29] - -RFC 2068 HTTP/1.1 January 1997 - - -3.12 Range Units - - HTTP/1.1 allows a client to request that only part (a range of) the - response entity be included within the response. HTTP/1.1 uses range - units in the Range (section 14.36) and Content-Range (section 14.17) - header fields. An entity may be broken down into subranges according - to various structural units. - - range-unit = bytes-unit | other-range-unit - - bytes-unit = "bytes" - other-range-unit = token - -The only range unit defined by HTTP/1.1 is "bytes". HTTP/1.1 - implementations may ignore ranges specified using other units. - HTTP/1.1 has been designed to allow implementations of applications - that do not depend on knowledge of ranges. - -4 HTTP Message - -4.1 Message Types - - HTTP messages consist of requests from client to server and responses - from server to client. - - HTTP-message = Request | Response ; HTTP/1.1 messages - - Request (section 5) and Response (section 6) messages use the generic - message format of RFC 822 [9] for transferring entities (the payload - of the message). Both types of message consist of a start-line, one - or more header fields (also known as "headers"), an empty line (i.e., - a line with nothing preceding the CRLF) indicating the end of the - header fields, and an optional message-body. - - generic-message = start-line - *message-header - CRLF - [ message-body ] - - start-line = Request-Line | Status-Line - - In the interest of robustness, servers SHOULD ignore any empty - line(s) received where a Request-Line is expected. In other words, if - the server is reading the protocol stream at the beginning of a - message and receives a CRLF first, it should ignore the CRLF. - - - - - - -Fielding, et. al. Standards Track [Page 30] - -RFC 2068 HTTP/1.1 January 1997 - - - Note: certain buggy HTTP/1.0 client implementations generate an - extra CRLF's after a POST request. To restate what is explicitly - forbidden by the BNF, an HTTP/1.1 client must not preface or follow - a request with an extra CRLF. - -4.2 Message Headers - - HTTP header fields, which include general-header (section 4.5), - request-header (section 5.3), response-header (section 6.2), and - entity-header (section 7.1) fields, follow the same generic format as - that given in Section 3.1 of RFC 822 [9]. Each header field consists - of a name followed by a colon (":") and the field value. Field names - are case-insensitive. The field value may be preceded by any amount - of LWS, though a single SP is preferred. Header fields can be - extended over multiple lines by preceding each extra line with at - least one SP or HT. Applications SHOULD follow "common form" when - generating HTTP constructs, since there might exist some - implementations that fail to accept anything beyond the common forms. - - message-header = field-name ":" [ field-value ] CRLF - - field-name = token - field-value = *( field-content | LWS ) - - field-content = - - The order in which header fields with differing field names are - received is not significant. However, it is "good practice" to send - general-header fields first, followed by request-header or response- - header fields, and ending with the entity-header fields. - - Multiple message-header fields with the same field-name may be - present in a message if and only if the entire field-value for that - header field is defined as a comma-separated list [i.e., #(values)]. - It MUST be possible to combine the multiple header fields into one - "field-name: field-value" pair, without changing the semantics of the - message, by appending each subsequent field-value to the first, each - separated by a comma. The order in which header fields with the same - field-name are received is therefore significant to the - interpretation of the combined field value, and thus a proxy MUST NOT - change the order of these field values when a message is forwarded. - - - - - - - - -Fielding, et. al. Standards Track [Page 31] - -RFC 2068 HTTP/1.1 January 1997 - - -4.3 Message Body - - The message-body (if any) of an HTTP message is used to carry the - entity-body associated with the request or response. The message-body - differs from the entity-body only when a transfer coding has been - applied, as indicated by the Transfer-Encoding header field (section - 14.40). - - message-body = entity-body - | - - Transfer-Encoding MUST be used to indicate any transfer codings - applied by an application to ensure safe and proper transfer of the - message. Transfer-Encoding is a property of the message, not of the - entity, and thus can be added or removed by any application along the - request/response chain. - - The rules for when a message-body is allowed in a message differ for - requests and responses. - - The presence of a message-body in a request is signaled by the - inclusion of a Content-Length or Transfer-Encoding header field in - the request's message-headers. A message-body MAY be included in a - request only when the request method (section 5.1.1) allows an - entity-body. - - For response messages, whether or not a message-body is included with - a message is dependent on both the request method and the response - status code (section 6.1.1). All responses to the HEAD request method - MUST NOT include a message-body, even though the presence of entity- - header fields might lead one to believe they do. All 1xx - (informational), 204 (no content), and 304 (not modified) responses - MUST NOT include a message-body. All other responses do include a - message-body, although it may be of zero length. - -4.4 Message Length - - When a message-body is included with a message, the length of that - body is determined by one of the following (in order of precedence): - - 1. Any response message which MUST NOT include a message-body - (such as the 1xx, 204, and 304 responses and any response to a HEAD - request) is always terminated by the first empty line after the - header fields, regardless of the entity-header fields present in the - message. - - 2. If a Transfer-Encoding header field (section 14.40) is present and - indicates that the "chunked" transfer coding has been applied, then - - - -Fielding, et. al. Standards Track [Page 32] - -RFC 2068 HTTP/1.1 January 1997 - - - the length is defined by the chunked encoding (section 3.6). - - 3. If a Content-Length header field (section 14.14) is present, its - value in bytes represents the length of the message-body. - - 4. If the message uses the media type "multipart/byteranges", which is - self-delimiting, then that defines the length. This media type MUST - NOT be used unless the sender knows that the recipient can parse it; - the presence in a request of a Range header with multiple byte-range - specifiers implies that the client can parse multipart/byteranges - responses. - - 5. By the server closing the connection. (Closing the connection - cannot be used to indicate the end of a request body, since that - would leave no possibility for the server to send back a response.) - - For compatibility with HTTP/1.0 applications, HTTP/1.1 requests - containing a message-body MUST include a valid Content-Length header - field unless the server is known to be HTTP/1.1 compliant. If a - request contains a message-body and a Content-Length is not given, - the server SHOULD respond with 400 (bad request) if it cannot - determine the length of the message, or with 411 (length required) if - it wishes to insist on receiving a valid Content-Length. - - All HTTP/1.1 applications that receive entities MUST accept the - "chunked" transfer coding (section 3.6), thus allowing this mechanism - to be used for messages when the message length cannot be determined - in advance. - - Messages MUST NOT include both a Content-Length header field and the - "chunked" transfer coding. If both are received, the Content-Length - MUST be ignored. - - When a Content-Length is given in a message where a message-body is - allowed, its field value MUST exactly match the number of OCTETs in - the message-body. HTTP/1.1 user agents MUST notify the user when an - invalid length is received and detected. - - - - - - - - - - - - - - -Fielding, et. al. Standards Track [Page 33] - -RFC 2068 HTTP/1.1 January 1997 - - -4.5 General Header Fields - - There are a few header fields which have general applicability for - both request and response messages, but which do not apply to the - entity being transferred. These header fields apply only to the - message being transmitted. - - general-header = Cache-Control ; Section 14.9 - | Connection ; Section 14.10 - | Date ; Section 14.19 - | Pragma ; Section 14.32 - | Transfer-Encoding ; Section 14.40 - | Upgrade ; Section 14.41 - | Via ; Section 14.44 - - General-header field names can be extended reliably only in - combination with a change in the protocol version. However, new or - experimental header fields may be given the semantics of general - header fields if all parties in the communication recognize them to - be general-header fields. Unrecognized header fields are treated as - entity-header fields. - -5 Request - - A request message from a client to a server includes, within the - first line of that message, the method to be applied to the resource, - the identifier of the resource, and the protocol version in use. - - Request = Request-Line ; Section 5.1 - *( general-header ; Section 4.5 - | request-header ; Section 5.3 - | entity-header ) ; Section 7.1 - CRLF - [ message-body ] ; Section 7.2 - -5.1 Request-Line - - The Request-Line begins with a method token, followed by the - Request-URI and the protocol version, and ending with CRLF. The - elements are separated by SP characters. No CR or LF are allowed - except in the final CRLF sequence. - - Request-Line = Method SP Request-URI SP HTTP-Version CRLF - - - - - - - - -Fielding, et. al. Standards Track [Page 34] - -RFC 2068 HTTP/1.1 January 1997 - - -5.1.1 Method - - The Method token indicates the method to be performed on the resource - identified by the Request-URI. The method is case-sensitive. - - Method = "OPTIONS" ; Section 9.2 - | "GET" ; Section 9.3 - | "HEAD" ; Section 9.4 - | "POST" ; Section 9.5 - | "PUT" ; Section 9.6 - | "DELETE" ; Section 9.7 - | "TRACE" ; Section 9.8 - | extension-method - - extension-method = token - - The list of methods allowed by a resource can be specified in an - Allow header field (section 14.7). The return code of the response - always notifies the client whether a method is currently allowed on a - resource, since the set of allowed methods can change dynamically. - Servers SHOULD return the status code 405 (Method Not Allowed) if the - method is known by the server but not allowed for the requested - resource, and 501 (Not Implemented) if the method is unrecognized or - not implemented by the server. The list of methods known by a server - can be listed in a Public response-header field (section 14.35). - - The methods GET and HEAD MUST be supported by all general-purpose - servers. All other methods are optional; however, if the above - methods are implemented, they MUST be implemented with the same - semantics as those specified in section 9. - -5.1.2 Request-URI - - The Request-URI is a Uniform Resource Identifier (section 3.2) and - identifies the resource upon which to apply the request. - - Request-URI = "*" | absoluteURI | abs_path - - The three options for Request-URI are dependent on the nature of the - request. The asterisk "*" means that the request does not apply to a - particular resource, but to the server itself, and is only allowed - when the method used does not necessarily apply to a resource. One - example would be - - OPTIONS * HTTP/1.1 - - The absoluteURI form is required when the request is being made to a - proxy. The proxy is requested to forward the request or service it - - - -Fielding, et. al. Standards Track [Page 35] - -RFC 2068 HTTP/1.1 January 1997 - - - from a valid cache, and return the response. Note that the proxy MAY - forward the request on to another proxy or directly to the server - specified by the absoluteURI. In order to avoid request loops, a - proxy MUST be able to recognize all of its server names, including - any aliases, local variations, and the numeric IP address. An example - Request-Line would be: - - GET http://www.w3.org/pub/WWW/TheProject.html HTTP/1.1 - - To allow for transition to absoluteURIs in all requests in future - versions of HTTP, all HTTP/1.1 servers MUST accept the absoluteURI - form in requests, even though HTTP/1.1 clients will only generate - them in requests to proxies. - - The most common form of Request-URI is that used to identify a - resource on an origin server or gateway. In this case the absolute - path of the URI MUST be transmitted (see section 3.2.1, abs_path) as - the Request-URI, and the network location of the URI (net_loc) MUST - be transmitted in a Host header field. For example, a client wishing - to retrieve the resource above directly from the origin server would - create a TCP connection to port 80 of the host "www.w3.org" and send - the lines: - - GET /pub/WWW/TheProject.html HTTP/1.1 - Host: www.w3.org - - followed by the remainder of the Request. Note that the absolute path - cannot be empty; if none is present in the original URI, it MUST be - given as "/" (the server root). - - If a proxy receives a request without any path in the Request-URI and - the method specified is capable of supporting the asterisk form of - request, then the last proxy on the request chain MUST forward the - request with "*" as the final Request-URI. For example, the request - - OPTIONS http://www.ics.uci.edu:8001 HTTP/1.1 - - would be forwarded by the proxy as - - OPTIONS * HTTP/1.1 - Host: www.ics.uci.edu:8001 - - after connecting to port 8001 of host "www.ics.uci.edu". - - The Request-URI is transmitted in the format specified in section - 3.2.1. The origin server MUST decode the Request-URI in order to - properly interpret the request. Servers SHOULD respond to invalid - Request-URIs with an appropriate status code. - - - -Fielding, et. al. Standards Track [Page 36] - -RFC 2068 HTTP/1.1 January 1997 - - - In requests that they forward, proxies MUST NOT rewrite the - "abs_path" part of a Request-URI in any way except as noted above to - replace a null abs_path with "*", no matter what the proxy does in - its internal implementation. - - Note: The "no rewrite" rule prevents the proxy from changing the - meaning of the request when the origin server is improperly using a - non-reserved URL character for a reserved purpose. Implementers - should be aware that some pre-HTTP/1.1 proxies have been known to - rewrite the Request-URI. - -5.2 The Resource Identified by a Request - - HTTP/1.1 origin servers SHOULD be aware that the exact resource - identified by an Internet request is determined by examining both the - Request-URI and the Host header field. - - An origin server that does not allow resources to differ by the - requested host MAY ignore the Host header field value. (But see - section 19.5.1 for other requirements on Host support in HTTP/1.1.) - - An origin server that does differentiate resources based on the host - requested (sometimes referred to as virtual hosts or vanity - hostnames) MUST use the following rules for determining the requested - resource on an HTTP/1.1 request: - - 1. If Request-URI is an absoluteURI, the host is part of the - Request-URI. Any Host header field value in the request MUST be - ignored. - - 2. If the Request-URI is not an absoluteURI, and the request - includes a Host header field, the host is determined by the Host - header field value. - - 3. If the host as determined by rule 1 or 2 is not a valid host on - the server, the response MUST be a 400 (Bad Request) error - message. - - Recipients of an HTTP/1.0 request that lacks a Host header field MAY - attempt to use heuristics (e.g., examination of the URI path for - something unique to a particular host) in order to determine what - exact resource is being requested. - -5.3 Request Header Fields - - The request-header fields allow the client to pass additional - information about the request, and about the client itself, to the - server. These fields act as request modifiers, with semantics - - - -Fielding, et. al. Standards Track [Page 37] - -RFC 2068 HTTP/1.1 January 1997 - - - equivalent to the parameters on a programming language method - invocation. - - request-header = Accept ; Section 14.1 - | Accept-Charset ; Section 14.2 - | Accept-Encoding ; Section 14.3 - | Accept-Language ; Section 14.4 - | Authorization ; Section 14.8 - | From ; Section 14.22 - | Host ; Section 14.23 - | If-Modified-Since ; Section 14.24 - | If-Match ; Section 14.25 - | If-None-Match ; Section 14.26 - | If-Range ; Section 14.27 - | If-Unmodified-Since ; Section 14.28 - | Max-Forwards ; Section 14.31 - | Proxy-Authorization ; Section 14.34 - | Range ; Section 14.36 - | Referer ; Section 14.37 - | User-Agent ; Section 14.42 - - Request-header field names can be extended reliably only in - combination with a change in the protocol version. However, new or - experimental header fields MAY be given the semantics of request- - header fields if all parties in the communication recognize them to - be request-header fields. Unrecognized header fields are treated as - entity-header fields. - -6 Response - - After receiving and interpreting a request message, a server responds - with an HTTP response message. - - Response = Status-Line ; Section 6.1 - *( general-header ; Section 4.5 - | response-header ; Section 6.2 - | entity-header ) ; Section 7.1 - CRLF - [ message-body ] ; Section 7.2 - -6.1 Status-Line - - The first line of a Response message is the Status-Line, consisting - of the protocol version followed by a numeric status code and its - associated textual phrase, with each element separated by SP - characters. No CR or LF is allowed except in the final CRLF - sequence. - - - - -Fielding, et. al. Standards Track [Page 38] - -RFC 2068 HTTP/1.1 January 1997 - - - Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF - -6.1.1 Status Code and Reason Phrase - - The Status-Code element is a 3-digit integer result code of the - attempt to understand and satisfy the request. These codes are fully - defined in section 10. The Reason-Phrase is intended to give a short - textual description of the Status-Code. The Status-Code is intended - for use by automata and the Reason-Phrase is intended for the human - user. The client is not required to examine or display the Reason- - Phrase. - - The first digit of the Status-Code defines the class of response. The - last two digits do not have any categorization role. There are 5 - values for the first digit: - - o 1xx: Informational - Request received, continuing process - - o 2xx: Success - The action was successfully received, understood, - and accepted - - o 3xx: Redirection - Further action must be taken in order to - complete the request - - o 4xx: Client Error - The request contains bad syntax or cannot be - fulfilled - - o 5xx: Server Error - The server failed to fulfill an apparently - valid request - - The individual values of the numeric status codes defined for - HTTP/1.1, and an example set of corresponding Reason-Phrase's, are - presented below. The reason phrases listed here are only recommended - -- they may be replaced by local equivalents without affecting the - protocol. - - Status-Code = "100" ; Continue - | "101" ; Switching Protocols - | "200" ; OK - | "201" ; Created - | "202" ; Accepted - | "203" ; Non-Authoritative Information - | "204" ; No Content - | "205" ; Reset Content - | "206" ; Partial Content - | "300" ; Multiple Choices - | "301" ; Moved Permanently - | "302" ; Moved Temporarily - - - -Fielding, et. al. Standards Track [Page 39] - -RFC 2068 HTTP/1.1 January 1997 - - - | "303" ; See Other - | "304" ; Not Modified - | "305" ; Use Proxy - | "400" ; Bad Request - | "401" ; Unauthorized - | "402" ; Payment Required - | "403" ; Forbidden - | "404" ; Not Found - | "405" ; Method Not Allowed - | "406" ; Not Acceptable - | "407" ; Proxy Authentication Required - | "408" ; Request Time-out - | "409" ; Conflict - | "410" ; Gone - | "411" ; Length Required - | "412" ; Precondition Failed - | "413" ; Request Entity Too Large - | "414" ; Request-URI Too Large - | "415" ; Unsupported Media Type - | "500" ; Internal Server Error - | "501" ; Not Implemented - | "502" ; Bad Gateway - | "503" ; Service Unavailable - | "504" ; Gateway Time-out - | "505" ; HTTP Version not supported - | extension-code - - extension-code = 3DIGIT - - Reason-Phrase = * - - HTTP status codes are extensible. HTTP applications are not required - to understand the meaning of all registered status codes, though such - understanding is obviously desirable. However, applications MUST - understand the class of any status code, as indicated by the first - digit, and treat any unrecognized response as being equivalent to the - x00 status code of that class, with the exception that an - unrecognized response MUST NOT be cached. For example, if an - unrecognized status code of 431 is received by the client, it can - safely assume that there was something wrong with its request and - treat the response as if it had received a 400 status code. In such - cases, user agents SHOULD present to the user the entity returned - with the response, since that entity is likely to include human- - readable information which will explain the unusual status. - - - - - - - -Fielding, et. al. Standards Track [Page 40] - -RFC 2068 HTTP/1.1 January 1997 - - -6.2 Response Header Fields - - The response-header fields allow the server to pass additional - information about the response which cannot be placed in the Status- - Line. These header fields give information about the server and about - further access to the resource identified by the Request-URI. - - response-header = Age ; Section 14.6 - | Location ; Section 14.30 - | Proxy-Authenticate ; Section 14.33 - | Public ; Section 14.35 - | Retry-After ; Section 14.38 - | Server ; Section 14.39 - | Vary ; Section 14.43 - | Warning ; Section 14.45 - | WWW-Authenticate ; Section 14.46 - - Response-header field names can be extended reliably only in - combination with a change in the protocol version. However, new or - experimental header fields MAY be given the semantics of response- - header fields if all parties in the communication recognize them to - be response-header fields. Unrecognized header fields are treated as - entity-header fields. - -7 Entity - - Request and Response messages MAY transfer an entity if not otherwise - restricted by the request method or response status code. An entity - consists of entity-header fields and an entity-body, although some - responses will only include the entity-headers. - - In this section, both sender and recipient refer to either the client - or the server, depending on who sends and who receives the entity. - -7.1 Entity Header Fields - - Entity-header fields define optional metainformation about the - entity-body or, if no body is present, about the resource identified - by the request. - - - - - - - - - - - - -Fielding, et. al. Standards Track [Page 41] - -RFC 2068 HTTP/1.1 January 1997 - - - entity-header = Allow ; Section 14.7 - | Content-Base ; Section 14.11 - | Content-Encoding ; Section 14.12 - | Content-Language ; Section 14.13 - | Content-Length ; Section 14.14 - | Content-Location ; Section 14.15 - | Content-MD5 ; Section 14.16 - | Content-Range ; Section 14.17 - | Content-Type ; Section 14.18 - | ETag ; Section 14.20 - | Expires ; Section 14.21 - | Last-Modified ; Section 14.29 - | extension-header - - extension-header = message-header - - The extension-header mechanism allows additional entity-header fields - to be defined without changing the protocol, but these fields cannot - be assumed to be recognizable by the recipient. Unrecognized header - fields SHOULD be ignored by the recipient and forwarded by proxies. - -7.2 Entity Body - - The entity-body (if any) sent with an HTTP request or response is in - a format and encoding defined by the entity-header fields. - - entity-body = *OCTET - - An entity-body is only present in a message when a message-body is - present, as described in section 4.3. The entity-body is obtained - from the message-body by decoding any Transfer-Encoding that may have - been applied to ensure safe and proper transfer of the message. - -7.2.1 Type - - When an entity-body is included with a message, the data type of that - body is determined via the header fields Content-Type and Content- - Encoding. These define a two-layer, ordered encoding model: - - entity-body := Content-Encoding( Content-Type( data ) ) - - Content-Type specifies the media type of the underlying data. - Content-Encoding may be used to indicate any additional content - codings applied to the data, usually for the purpose of data - compression, that are a property of the requested resource. There is - no default encoding. - - - - - -Fielding, et. al. Standards Track [Page 42] - -RFC 2068 HTTP/1.1 January 1997 - - - Any HTTP/1.1 message containing an entity-body SHOULD include a - Content-Type header field defining the media type of that body. If - and only if the media type is not given by a Content-Type field, the - recipient MAY attempt to guess the media type via inspection of its - content and/or the name extension(s) of the URL used to identify the - resource. If the media type remains unknown, the recipient SHOULD - treat it as type "application/octet-stream". - -7.2.2 Length - - The length of an entity-body is the length of the message-body after - any transfer codings have been removed. Section 4.4 defines how the - length of a message-body is determined. - -8 Connections - -8.1 Persistent Connections - -8.1.1 Purpose - - Prior to persistent connections, a separate TCP connection was - established to fetch each URL, increasing the load on HTTP servers - and causing congestion on the Internet. The use of inline images and - other associated data often requires a client to make multiple - requests of the same server in a short amount of time. Analyses of - these performance problems are available [30][27]; analysis and - results from a prototype implementation are in [26]. - - Persistent HTTP connections have a number of advantages: - - o By opening and closing fewer TCP connections, CPU time is saved, - and memory used for TCP protocol control blocks is also saved. - o HTTP requests and responses can be pipelined on a connection. - Pipelining allows a client to make multiple requests without - waiting for each response, allowing a single TCP connection to be - used much more efficiently, with much lower elapsed time. - o Network congestion is reduced by reducing the number of packets - caused by TCP opens, and by allowing TCP sufficient time to - determine the congestion state of the network. - o HTTP can evolve more gracefully; since errors can be reported - without the penalty of closing the TCP connection. Clients using - future versions of HTTP might optimistically try a new feature, but - if communicating with an older server, retry with old semantics - after an error is reported. - - HTTP implementations SHOULD implement persistent connections. - - - - - -Fielding, et. al. Standards Track [Page 43] - -RFC 2068 HTTP/1.1 January 1997 - - -8.1.2 Overall Operation - - A significant difference between HTTP/1.1 and earlier versions of - HTTP is that persistent connections are the default behavior of any - HTTP connection. That is, unless otherwise indicated, the client may - assume that the server will maintain a persistent connection. - - Persistent connections provide a mechanism by which a client and a - server can signal the close of a TCP connection. This signaling takes - place using the Connection header field. Once a close has been - signaled, the client MUST not send any more requests on that - connection. - -8.1.2.1 Negotiation - - An HTTP/1.1 server MAY assume that a HTTP/1.1 client intends to - maintain a persistent connection unless a Connection header including - the connection-token "close" was sent in the request. If the server - chooses to close the connection immediately after sending the - response, it SHOULD send a Connection header including the - connection-token close. - - An HTTP/1.1 client MAY expect a connection to remain open, but would - decide to keep it open based on whether the response from a server - contains a Connection header with the connection-token close. In case - the client does not want to maintain a connection for more than that - request, it SHOULD send a Connection header including the - connection-token close. - - If either the client or the server sends the close token in the - Connection header, that request becomes the last one for the - connection. - - Clients and servers SHOULD NOT assume that a persistent connection is - maintained for HTTP versions less than 1.1 unless it is explicitly - signaled. See section 19.7.1 for more information on backwards - compatibility with HTTP/1.0 clients. - - In order to remain persistent, all messages on the connection must - have a self-defined message length (i.e., one not defined by closure - of the connection), as described in section 4.4. - -8.1.2.2 Pipelining - - A client that supports persistent connections MAY "pipeline" its - requests (i.e., send multiple requests without waiting for each - response). A server MUST send its responses to those requests in the - same order that the requests were received. - - - -Fielding, et. al. Standards Track [Page 44] - -RFC 2068 HTTP/1.1 January 1997 - - - Clients which assume persistent connections and pipeline immediately - after connection establishment SHOULD be prepared to retry their - connection if the first pipelined attempt fails. If a client does - such a retry, it MUST NOT pipeline before it knows the connection is - persistent. Clients MUST also be prepared to resend their requests if - the server closes the connection before sending all of the - corresponding responses. - -8.1.3 Proxy Servers - - It is especially important that proxies correctly implement the - properties of the Connection header field as specified in 14.2.1. - - The proxy server MUST signal persistent connections separately with - its clients and the origin servers (or other proxy servers) that it - connects to. Each persistent connection applies to only one transport - link. - - A proxy server MUST NOT establish a persistent connection with an - HTTP/1.0 client. - -8.1.4 Practical Considerations - - Servers will usually have some time-out value beyond which they will - no longer maintain an inactive connection. Proxy servers might make - this a higher value since it is likely that the client will be making - more connections through the same server. The use of persistent - connections places no requirements on the length of this time-out for - either the client or the server. - - When a client or server wishes to time-out it SHOULD issue a graceful - close on the transport connection. Clients and servers SHOULD both - constantly watch for the other side of the transport close, and - respond to it as appropriate. If a client or server does not detect - the other side's close promptly it could cause unnecessary resource - drain on the network. - - A client, server, or proxy MAY close the transport connection at any - time. For example, a client MAY have started to send a new request at - the same time that the server has decided to close the "idle" - connection. From the server's point of view, the connection is being - closed while it was idle, but from the client's point of view, a - request is in progress. - - This means that clients, servers, and proxies MUST be able to recover - from asynchronous close events. Client software SHOULD reopen the - transport connection and retransmit the aborted request without user - interaction so long as the request method is idempotent (see section - - - -Fielding, et. al. Standards Track [Page 45] - -RFC 2068 HTTP/1.1 January 1997 - - - 9.1.2); other methods MUST NOT be automatically retried, although - user agents MAY offer a human operator the choice of retrying the - request. - - However, this automatic retry SHOULD NOT be repeated if the second - request fails. - - Servers SHOULD always respond to at least one request per connection, - if at all possible. Servers SHOULD NOT close a connection in the - middle of transmitting a response, unless a network or client failure - is suspected. - - Clients that use persistent connections SHOULD limit the number of - simultaneous connections that they maintain to a given server. A - single-user client SHOULD maintain AT MOST 2 connections with any - server or proxy. A proxy SHOULD use up to 2*N connections to another - server or proxy, where N is the number of simultaneously active - users. These guidelines are intended to improve HTTP response times - and avoid congestion of the Internet or other networks. - -8.2 Message Transmission Requirements - -General requirements: - -o HTTP/1.1 servers SHOULD maintain persistent connections and use - TCP's flow control mechanisms to resolve temporary overloads, - rather than terminating connections with the expectation that - clients will retry. The latter technique can exacerbate network - congestion. - -o An HTTP/1.1 (or later) client sending a message-body SHOULD monitor - the network connection for an error status while it is transmitting - the request. If the client sees an error status, it SHOULD - immediately cease transmitting the body. If the body is being sent - using a "chunked" encoding (section 3.6), a zero length chunk and - empty footer MAY be used to prematurely mark the end of the - message. If the body was preceded by a Content-Length header, the - client MUST close the connection. - -o An HTTP/1.1 (or later) client MUST be prepared to accept a 100 - (Continue) status followed by a regular response. - -o An HTTP/1.1 (or later) server that receives a request from a - HTTP/1.0 (or earlier) client MUST NOT transmit the 100 (continue) - response; it SHOULD either wait for the request to be completed - normally (thus avoiding an interrupted request) or close the - connection prematurely. - - - - -Fielding, et. al. Standards Track [Page 46] - -RFC 2068 HTTP/1.1 January 1997 - - - Upon receiving a method subject to these requirements from an - HTTP/1.1 (or later) client, an HTTP/1.1 (or later) server MUST either - respond with 100 (Continue) status and continue to read from the - input stream, or respond with an error status. If it responds with an - error status, it MAY close the transport (TCP) connection or it MAY - continue to read and discard the rest of the request. It MUST NOT - perform the requested method if it returns an error status. - - Clients SHOULD remember the version number of at least the most - recently used server; if an HTTP/1.1 client has seen an HTTP/1.1 or - later response from the server, and it sees the connection close - before receiving any status from the server, the client SHOULD retry - the request without user interaction so long as the request method is - idempotent (see section 9.1.2); other methods MUST NOT be - automatically retried, although user agents MAY offer a human - operator the choice of retrying the request.. If the client does - retry the request, the client - - o MUST first send the request header fields, and then - - o MUST wait for the server to respond with either a 100 (Continue) - response, in which case the client should continue, or with an - error status. - - If an HTTP/1.1 client has not seen an HTTP/1.1 or later response from - the server, it should assume that the server implements HTTP/1.0 or - older and will not use the 100 (Continue) response. If in this case - the client sees the connection close before receiving any status from - the server, the client SHOULD retry the request. If the client does - retry the request to this HTTP/1.0 server, it should use the - following "binary exponential backoff" algorithm to be assured of - obtaining a reliable response: - - 1. Initiate a new connection to the server - - 2. Transmit the request-headers - - 3. Initialize a variable R to the estimated round-trip time to the - server (e.g., based on the time it took to establish the - connection), or to a constant value of 5 seconds if the round-trip - time is not available. - - 4. Compute T = R * (2**N), where N is the number of previous retries - of this request. - - 5. Wait either for an error response from the server, or for T seconds - (whichever comes first) - - - - -Fielding, et. al. Standards Track [Page 47] - -RFC 2068 HTTP/1.1 January 1997 - - - 6. If no error response is received, after T seconds transmit the body - of the request. - - 7. If client sees that the connection is closed prematurely, repeat - from step 1 until the request is accepted, an error response is - received, or the user becomes impatient and terminates the retry - process. - - No matter what the server version, if an error status is received, - the client - - o MUST NOT continue and - - o MUST close the connection if it has not completed sending the - message. - - An HTTP/1.1 (or later) client that sees the connection close after - receiving a 100 (Continue) but before receiving any other status - SHOULD retry the request, and need not wait for 100 (Continue) - response (but MAY do so if this simplifies the implementation). - -9 Method Definitions - - The set of common methods for HTTP/1.1 is defined below. Although - this set can be expanded, additional methods cannot be assumed to - share the same semantics for separately extended clients and servers. - - The Host request-header field (section 14.23) MUST accompany all - HTTP/1.1 requests. - -9.1 Safe and Idempotent Methods - -9.1.1 Safe Methods - - Implementers should be aware that the software represents the user in - their interactions over the Internet, and should be careful to allow - the user to be aware of any actions they may take which may have an - unexpected significance to themselves or others. - - In particular, the convention has been established that the GET and - HEAD methods should never have the significance of taking an action - other than retrieval. These methods should be considered "safe." This - allows user agents to represent other methods, such as POST, PUT and - DELETE, in a special way, so that the user is made aware of the fact - that a possibly unsafe action is being requested. - - Naturally, it is not possible to ensure that the server does not - generate side-effects as a result of performing a GET request; in - - - -Fielding, et. al. Standards Track [Page 48] - -RFC 2068 HTTP/1.1 January 1997 - - - fact, some dynamic resources consider that a feature. The important - distinction here is that the user did not request the side-effects, - so therefore cannot be held accountable for them. - -9.1.2 Idempotent Methods - - Methods may also have the property of "idempotence" in that (aside - from error or expiration issues) the side-effects of N > 0 identical - requests is the same as for a single request. The methods GET, HEAD, - PUT and DELETE share this property. - -9.2 OPTIONS - - The OPTIONS method represents a request for information about the - communication options available on the request/response chain - identified by the Request-URI. This method allows the client to - determine the options and/or requirements associated with a resource, - or the capabilities of a server, without implying a resource action - or initiating a resource retrieval. - - Unless the server's response is an error, the response MUST NOT - include entity information other than what can be considered as - communication options (e.g., Allow is appropriate, but Content-Type - is not). Responses to this method are not cachable. - - If the Request-URI is an asterisk ("*"), the OPTIONS request is - intended to apply to the server as a whole. A 200 response SHOULD - include any header fields which indicate optional features - implemented by the server (e.g., Public), including any extensions - not defined by this specification, in addition to any applicable - general or response-header fields. As described in section 5.1.2, an - "OPTIONS *" request can be applied through a proxy by specifying the - destination server in the Request-URI without any path information. - - If the Request-URI is not an asterisk, the OPTIONS request applies - only to the options that are available when communicating with that - resource. A 200 response SHOULD include any header fields which - indicate optional features implemented by the server and applicable - to that resource (e.g., Allow), including any extensions not defined - by this specification, in addition to any applicable general or - response-header fields. If the OPTIONS request passes through a - proxy, the proxy MUST edit the response to exclude those options - which apply to a proxy's capabilities and which are known to be - unavailable through that proxy. - - - - - - - -Fielding, et. al. Standards Track [Page 49] - -RFC 2068 HTTP/1.1 January 1997 - - -9.3 GET - - The GET method means retrieve whatever information (in the form of an - entity) is identified by the Request-URI. If the Request-URI refers - to a data-producing process, it is the produced data which shall be - returned as the entity in the response and not the source text of the - process, unless that text happens to be the output of the process. - - The semantics of the GET method change to a "conditional GET" if the - request message includes an If-Modified-Since, If-Unmodified-Since, - If-Match, If-None-Match, or If-Range header field. A conditional GET - method requests that the entity be transferred only under the - circumstances described by the conditional header field(s). The - conditional GET method is intended to reduce unnecessary network - usage by allowing cached entities to be refreshed without requiring - multiple requests or transferring data already held by the client. - - The semantics of the GET method change to a "partial GET" if the - request message includes a Range header field. A partial GET requests - that only part of the entity be transferred, as described in section - 14.36. The partial GET method is intended to reduce unnecessary - network usage by allowing partially-retrieved entities to be - completed without transferring data already held by the client. - - The response to a GET request is cachable if and only if it meets the - requirements for HTTP caching described in section 13. - -9.4 HEAD - - The HEAD method is identical to GET except that the server MUST NOT - return a message-body in the response. The metainformation contained - in the HTTP headers in response to a HEAD request SHOULD be identical - to the information sent in response to a GET request. This method can - be used for obtaining metainformation about the entity implied by the - request without transferring the entity-body itself. This method is - often used for testing hypertext links for validity, accessibility, - and recent modification. - - The response to a HEAD request may be cachable in the sense that the - information contained in the response may be used to update a - previously cached entity from that resource. If the new field values - indicate that the cached entity differs from the current entity (as - would be indicated by a change in Content-Length, Content-MD5, ETag - or Last-Modified), then the cache MUST treat the cache entry as - stale. - - - - - - -Fielding, et. al. Standards Track [Page 50] - -RFC 2068 HTTP/1.1 January 1997 - - -9.5 POST - - The POST method is used to request that the destination server accept - the entity enclosed in the request as a new subordinate of the - resource identified by the Request-URI in the Request-Line. POST is - designed to allow a uniform method to cover the following functions: - - o Annotation of existing resources; - - o Posting a message to a bulletin board, newsgroup, mailing list, - or similar group of articles; - - o Providing a block of data, such as the result of submitting a - form, to a data-handling process; - - o Extending a database through an append operation. - - The actual function performed by the POST method is determined by the - server and is usually dependent on the Request-URI. The posted entity - is subordinate to that URI in the same way that a file is subordinate - to a directory containing it, a news article is subordinate to a - newsgroup to which it is posted, or a record is subordinate to a - database. - - The action performed by the POST method might not result in a - resource that can be identified by a URI. In this case, either 200 - (OK) or 204 (No Content) is the appropriate response status, - depending on whether or not the response includes an entity that - describes the result. - - If a resource has been created on the origin server, the response - SHOULD be 201 (Created) and contain an entity which describes the - status of the request and refers to the new resource, and a Location - header (see section 14.30). - - Responses to this method are not cachable, unless the response - includes appropriate Cache-Control or Expires header fields. However, - the 303 (See Other) response can be used to direct the user agent to - retrieve a cachable resource. - - POST requests must obey the message transmission requirements set out - in section 8.2. - - - - - - - - - -Fielding, et. al. Standards Track [Page 51] - -RFC 2068 HTTP/1.1 January 1997 - - -9.6 PUT - - The PUT method requests that the enclosed entity be stored under the - supplied Request-URI. If the Request-URI refers to an already - existing resource, the enclosed entity SHOULD be considered as a - modified version of the one residing on the origin server. If the - Request-URI does not point to an existing resource, and that URI is - capable of being defined as a new resource by the requesting user - agent, the origin server can create the resource with that URI. If a - new resource is created, the origin server MUST inform the user agent - via the 201 (Created) response. If an existing resource is modified, - either the 200 (OK) or 204 (No Content) response codes SHOULD be sent - to indicate successful completion of the request. If the resource - could not be created or modified with the Request-URI, an appropriate - error response SHOULD be given that reflects the nature of the - problem. The recipient of the entity MUST NOT ignore any Content-* - (e.g. Content-Range) headers that it does not understand or implement - and MUST return a 501 (Not Implemented) response in such cases. - - If the request passes through a cache and the Request-URI identifies - one or more currently cached entities, those entries should be - treated as stale. Responses to this method are not cachable. - - The fundamental difference between the POST and PUT requests is - reflected in the different meaning of the Request-URI. The URI in a - POST request identifies the resource that will handle the enclosed - entity. That resource may be a data-accepting process, a gateway to - some other protocol, or a separate entity that accepts annotations. - In contrast, the URI in a PUT request identifies the entity enclosed - with the request -- the user agent knows what URI is intended and the - server MUST NOT attempt to apply the request to some other resource. - If the server desires that the request be applied to a different URI, - it MUST send a 301 (Moved Permanently) response; the user agent MAY - then make its own decision regarding whether or not to redirect the - request. - - A single resource MAY be identified by many different URIs. For - example, an article may have a URI for identifying "the current - version" which is separate from the URI identifying each particular - version. In this case, a PUT request on a general URI may result in - several other URIs being defined by the origin server. - - HTTP/1.1 does not define how a PUT method affects the state of an - origin server. - - PUT requests must obey the message transmission requirements set out - in section 8.2. - - - - -Fielding, et. al. Standards Track [Page 52] - -RFC 2068 HTTP/1.1 January 1997 - - -9.7 DELETE - - The DELETE method requests that the origin server delete the resource - identified by the Request-URI. This method MAY be overridden by human - intervention (or other means) on the origin server. The client cannot - be guaranteed that the operation has been carried out, even if the - status code returned from the origin server indicates that the action - has been completed successfully. However, the server SHOULD not - indicate success unless, at the time the response is given, it - intends to delete the resource or move it to an inaccessible - location. - - A successful response SHOULD be 200 (OK) if the response includes an - entity describing the status, 202 (Accepted) if the action has not - yet been enacted, or 204 (No Content) if the response is OK but does - not include an entity. - - If the request passes through a cache and the Request-URI identifies - one or more currently cached entities, those entries should be - treated as stale. Responses to this method are not cachable. - -9.8 TRACE - - The TRACE method is used to invoke a remote, application-layer loop- - back of the request message. The final recipient of the request - SHOULD reflect the message received back to the client as the - entity-body of a 200 (OK) response. The final recipient is either the - origin server or the first proxy or gateway to receive a Max-Forwards - value of zero (0) in the request (see section 14.31). A TRACE request - MUST NOT include an entity. - - TRACE allows the client to see what is being received at the other - end of the request chain and use that data for testing or diagnostic - information. The value of the Via header field (section 14.44) is of - particular interest, since it acts as a trace of the request chain. - Use of the Max-Forwards header field allows the client to limit the - length of the request chain, which is useful for testing a chain of - proxies forwarding messages in an infinite loop. - - If successful, the response SHOULD contain the entire request message - in the entity-body, with a Content-Type of "message/http". Responses - to this method MUST NOT be cached. - -10 Status Code Definitions - - Each Status-Code is described below, including a description of which - method(s) it can follow and any metainformation required in the - response. - - - -Fielding, et. al. Standards Track [Page 53] - -RFC 2068 HTTP/1.1 January 1997 - - -10.1 Informational 1xx - - This class of status code indicates a provisional response, - consisting only of the Status-Line and optional headers, and is - terminated by an empty line. Since HTTP/1.0 did not define any 1xx - status codes, servers MUST NOT send a 1xx response to an HTTP/1.0 - client except under experimental conditions. - -10.1.1 100 Continue - - The client may continue with its request. This interim response is - used to inform the client that the initial part of the request has - been received and has not yet been rejected by the server. The client - SHOULD continue by sending the remainder of the request or, if the - request has already been completed, ignore this response. The server - MUST send a final response after the request has been completed. - -10.1.2 101 Switching Protocols - - The server understands and is willing to comply with the client's - request, via the Upgrade message header field (section 14.41), for a - change in the application protocol being used on this connection. The - server will switch protocols to those defined by the response's - Upgrade header field immediately after the empty line which - terminates the 101 response. - - The protocol should only be switched when it is advantageous to do - so. For example, switching to a newer version of HTTP is - advantageous over older versions, and switching to a real-time, - synchronous protocol may be advantageous when delivering resources - that use such features. - -10.2 Successful 2xx - - This class of status code indicates that the client's request was - successfully received, understood, and accepted. - -10.2.1 200 OK - - The request has succeeded. The information returned with the response - is dependent on the method used in the request, for example: - - GET an entity corresponding to the requested resource is sent in the - response; - - HEAD the entity-header fields corresponding to the requested resource - are sent in the response without any message-body; - - - - -Fielding, et. al. Standards Track [Page 54] - -RFC 2068 HTTP/1.1 January 1997 - - - POST an entity describing or containing the result of the action; - - TRACE an entity containing the request message as received by the end - server. - -10.2.2 201 Created - - The request has been fulfilled and resulted in a new resource being - created. The newly created resource can be referenced by the URI(s) - returned in the entity of the response, with the most specific URL - for the resource given by a Location header field. The origin server - MUST create the resource before returning the 201 status code. If the - action cannot be carried out immediately, the server should respond - with 202 (Accepted) response instead. - -10.2.3 202 Accepted - - The request has been accepted for processing, but the processing has - not been completed. The request MAY or MAY NOT eventually be acted - upon, as it MAY be disallowed when processing actually takes place. - There is no facility for re-sending a status code from an - asynchronous operation such as this. - - The 202 response is intentionally non-committal. Its purpose is to - allow a server to accept a request for some other process (perhaps a - batch-oriented process that is only run once per day) without - requiring that the user agent's connection to the server persist - until the process is completed. The entity returned with this - response SHOULD include an indication of the request's current status - and either a pointer to a status monitor or some estimate of when the - user can expect the request to be fulfilled. - -10.2.4 203 Non-Authoritative Information - - The returned metainformation in the entity-header is not the - definitive set as available from the origin server, but is gathered - from a local or a third-party copy. The set presented MAY be a subset - or superset of the original version. For example, including local - annotation information about the resource MAY result in a superset of - the metainformation known by the origin server. Use of this response - code is not required and is only appropriate when the response would - otherwise be 200 (OK). - -10.2.5 204 No Content - - The server has fulfilled the request but there is no new information - to send back. If the client is a user agent, it SHOULD NOT change its - document view from that which caused the request to be sent. This - - - -Fielding, et. al. Standards Track [Page 55] - -RFC 2068 HTTP/1.1 January 1997 - - - response is primarily intended to allow input for actions to take - place without causing a change to the user agent's active document - view. The response MAY include new metainformation in the form of - entity-headers, which SHOULD apply to the document currently in the - user agent's active view. - - The 204 response MUST NOT include a message-body, and thus is always - terminated by the first empty line after the header fields. - -10.2.6 205 Reset Content - - The server has fulfilled the request and the user agent SHOULD reset - the document view which caused the request to be sent. This response - is primarily intended to allow input for actions to take place via - user input, followed by a clearing of the form in which the input is - given so that the user can easily initiate another input action. The - response MUST NOT include an entity. - -10.2.7 206 Partial Content - - The server has fulfilled the partial GET request for the resource. - The request must have included a Range header field (section 14.36) - indicating the desired range. The response MUST include either a - Content-Range header field (section 14.17) indicating the range - included with this response, or a multipart/byteranges Content-Type - including Content-Range fields for each part. If multipart/byteranges - is not used, the Content-Length header field in the response MUST - match the actual number of OCTETs transmitted in the message-body. - - A cache that does not support the Range and Content-Range headers - MUST NOT cache 206 (Partial) responses. - -10.3 Redirection 3xx - - This class of status code indicates that further action needs to be - taken by the user agent in order to fulfill the request. The action - required MAY be carried out by the user agent without interaction - with the user if and only if the method used in the second request is - GET or HEAD. A user agent SHOULD NOT automatically redirect a request - more than 5 times, since such redirections usually indicate an - infinite loop. - - - - - - - - - - -Fielding, et. al. Standards Track [Page 56] - -RFC 2068 HTTP/1.1 January 1997 - - -10.3.1 300 Multiple Choices - - The requested resource corresponds to any one of a set of - representations, each with its own specific location, and agent- - driven negotiation information (section 12) is being provided so that - the user (or user agent) can select a preferred representation and - redirect its request to that location. - - Unless it was a HEAD request, the response SHOULD include an entity - containing a list of resource characteristics and location(s) from - which the user or user agent can choose the one most appropriate. The - entity format is specified by the media type given in the Content- - Type header field. Depending upon the format and the capabilities of - the user agent, selection of the most appropriate choice may be - performed automatically. However, this specification does not define - any standard for such automatic selection. - - If the server has a preferred choice of representation, it SHOULD - include the specific URL for that representation in the Location - field; user agents MAY use the Location field value for automatic - redirection. This response is cachable unless indicated otherwise. - -10.3.2 301 Moved Permanently - - The requested resource has been assigned a new permanent URI and any - future references to this resource SHOULD be done using one of the - returned URIs. Clients with link editing capabilities SHOULD - automatically re-link references to the Request-URI to one or more of - the new references returned by the server, where possible. This - response is cachable unless indicated otherwise. - - If the new URI is a location, its URL SHOULD be given by the Location - field in the response. Unless the request method was HEAD, the entity - of the response SHOULD contain a short hypertext note with a - hyperlink to the new URI(s). - - If the 301 status code is received in response to a request other - than GET or HEAD, the user agent MUST NOT automatically redirect the - request unless it can be confirmed by the user, since this might - change the conditions under which the request was issued. - - Note: When automatically redirecting a POST request after receiving - a 301 status code, some existing HTTP/1.0 user agents will - erroneously change it into a GET request. - - - - - - - -Fielding, et. al. Standards Track [Page 57] - -RFC 2068 HTTP/1.1 January 1997 - - -10.3.3 302 Moved Temporarily - - The requested resource resides temporarily under a different URI. - Since the redirection may be altered on occasion, the client SHOULD - continue to use the Request-URI for future requests. This response is - only cachable if indicated by a Cache-Control or Expires header - field. - - If the new URI is a location, its URL SHOULD be given by the Location - field in the response. Unless the request method was HEAD, the entity - of the response SHOULD contain a short hypertext note with a - hyperlink to the new URI(s). - - If the 302 status code is received in response to a request other - than GET or HEAD, the user agent MUST NOT automatically redirect the - request unless it can be confirmed by the user, since this might - change the conditions under which the request was issued. - - Note: When automatically redirecting a POST request after receiving - a 302 status code, some existing HTTP/1.0 user agents will - erroneously change it into a GET request. - -10.3.4 303 See Other - - The response to the request can be found under a different URI and - SHOULD be retrieved using a GET method on that resource. This method - exists primarily to allow the output of a POST-activated script to - redirect the user agent to a selected resource. The new URI is not a - substitute reference for the originally requested resource. The 303 - response is not cachable, but the response to the second (redirected) - request MAY be cachable. - - If the new URI is a location, its URL SHOULD be given by the Location - field in the response. Unless the request method was HEAD, the entity - of the response SHOULD contain a short hypertext note with a - hyperlink to the new URI(s). - -10.3.5 304 Not Modified - - If the client has performed a conditional GET request and access is - allowed, but the document has not been modified, the server SHOULD - respond with this status code. The response MUST NOT contain a - message-body. - - - - - - - - -Fielding, et. al. Standards Track [Page 58] - -RFC 2068 HTTP/1.1 January 1997 - - - The response MUST include the following header fields: - - o Date - - o ETag and/or Content-Location, if the header would have been sent in - a 200 response to the same request - - o Expires, Cache-Control, and/or Vary, if the field-value might - differ from that sent in any previous response for the same variant - - If the conditional GET used a strong cache validator (see section - 13.3.3), the response SHOULD NOT include other entity-headers. - Otherwise (i.e., the conditional GET used a weak validator), the - response MUST NOT include other entity-headers; this prevents - inconsistencies between cached entity-bodies and updated headers. - - If a 304 response indicates an entity not currently cached, then the - cache MUST disregard the response and repeat the request without the - conditional. - - If a cache uses a received 304 response to update a cache entry, the - cache MUST update the entry to reflect any new field values given in - the response. - - The 304 response MUST NOT include a message-body, and thus is always - terminated by the first empty line after the header fields. - -10.3.6 305 Use Proxy - - The requested resource MUST be accessed through the proxy given by - the Location field. The Location field gives the URL of the proxy. - The recipient is expected to repeat the request via the proxy. - -10.4 Client Error 4xx - - The 4xx class of status code is intended for cases in which the - client seems to have erred. Except when responding to a HEAD request, - the server SHOULD include an entity containing an explanation of the - error situation, and whether it is a temporary or permanent - condition. These status codes are applicable to any request method. - User agents SHOULD display any included entity to the user. - - Note: If the client is sending data, a server implementation using - TCP should be careful to ensure that the client acknowledges - receipt of the packet(s) containing the response, before the server - closes the input connection. If the client continues sending data - to the server after the close, the server's TCP stack will send a - reset packet to the client, which may erase the client's - - - -Fielding, et. al. Standards Track [Page 59] - -RFC 2068 HTTP/1.1 January 1997 - - - unacknowledged input buffers before they can be read and - interpreted by the HTTP application. - -10.4.1 400 Bad Request - - The request could not be understood by the server due to malformed - syntax. The client SHOULD NOT repeat the request without - modifications. - -10.4.2 401 Unauthorized - - The request requires user authentication. The response MUST include a - WWW-Authenticate header field (section 14.46) containing a challenge - applicable to the requested resource. The client MAY repeat the - request with a suitable Authorization header field (section 14.8). If - the request already included Authorization credentials, then the 401 - response indicates that authorization has been refused for those - credentials. If the 401 response contains the same challenge as the - prior response, and the user agent has already attempted - authentication at least once, then the user SHOULD be presented the - entity that was given in the response, since that entity MAY include - relevant diagnostic information. HTTP access authentication is - explained in section 11. - -10.4.3 402 Payment Required - - This code is reserved for future use. - -10.4.4 403 Forbidden - - The server understood the request, but is refusing to fulfill it. - Authorization will not help and the request SHOULD NOT be repeated. - If the request method was not HEAD and the server wishes to make - public why the request has not been fulfilled, it SHOULD describe the - reason for the refusal in the entity. This status code is commonly - used when the server does not wish to reveal exactly why the request - has been refused, or when no other response is applicable. - -10.4.5 404 Not Found - - The server has not found anything matching the Request-URI. No - indication is given of whether the condition is temporary or - permanent. - - - - - - - - -Fielding, et. al. Standards Track [Page 60] - -RFC 2068 HTTP/1.1 January 1997 - - - If the server does not wish to make this information available to the - client, the status code 403 (Forbidden) can be used instead. The 410 - (Gone) status code SHOULD be used if the server knows, through some - internally configurable mechanism, that an old resource is - permanently unavailable and has no forwarding address. - -10.4.6 405 Method Not Allowed - - The method specified in the Request-Line is not allowed for the - resource identified by the Request-URI. The response MUST include an - Allow header containing a list of valid methods for the requested - resource. - -10.4.7 406 Not Acceptable - - The resource identified by the request is only capable of generating - response entities which have content characteristics not acceptable - according to the accept headers sent in the request. - - Unless it was a HEAD request, the response SHOULD include an entity - containing a list of available entity characteristics and location(s) - from which the user or user agent can choose the one most - appropriate. The entity format is specified by the media type given - in the Content-Type header field. Depending upon the format and the - capabilities of the user agent, selection of the most appropriate - choice may be performed automatically. However, this specification - does not define any standard for such automatic selection. - - Note: HTTP/1.1 servers are allowed to return responses which are - not acceptable according to the accept headers sent in the request. - In some cases, this may even be preferable to sending a 406 - response. User agents are encouraged to inspect the headers of an - incoming response to determine if it is acceptable. If the response - could be unacceptable, a user agent SHOULD temporarily stop receipt - of more data and query the user for a decision on further actions. - -10.4.8 407 Proxy Authentication Required - - This code is similar to 401 (Unauthorized), but indicates that the - client MUST first authenticate itself with the proxy. The proxy MUST - return a Proxy-Authenticate header field (section 14.33) containing a - challenge applicable to the proxy for the requested resource. The - client MAY repeat the request with a suitable Proxy-Authorization - header field (section 14.34). HTTP access authentication is explained - in section 11. - - - - - - -Fielding, et. al. Standards Track [Page 61] - -RFC 2068 HTTP/1.1 January 1997 - - -10.4.9 408 Request Timeout - - The client did not produce a request within the time that the server - was prepared to wait. The client MAY repeat the request without - modifications at any later time. - -10.4.10 409 Conflict - - The request could not be completed due to a conflict with the current - state of the resource. This code is only allowed in situations where - it is expected that the user might be able to resolve the conflict - and resubmit the request. The response body SHOULD include enough - information for the user to recognize the source of the conflict. - Ideally, the response entity would include enough information for the - user or user agent to fix the problem; however, that may not be - possible and is not required. - - Conflicts are most likely to occur in response to a PUT request. If - versioning is being used and the entity being PUT includes changes to - a resource which conflict with those made by an earlier (third-party) - request, the server MAY use the 409 response to indicate that it - can't complete the request. In this case, the response entity SHOULD - contain a list of the differences between the two versions in a - format defined by the response Content-Type. - -10.4.11 410 Gone - - The requested resource is no longer available at the server and no - forwarding address is known. This condition SHOULD be considered - permanent. Clients with link editing capabilities SHOULD delete - references to the Request-URI after user approval. If the server does - not know, or has no facility to determine, whether or not the - condition is permanent, the status code 404 (Not Found) SHOULD be - used instead. This response is cachable unless indicated otherwise. - - The 410 response is primarily intended to assist the task of web - maintenance by notifying the recipient that the resource is - intentionally unavailable and that the server owners desire that - remote links to that resource be removed. Such an event is common for - limited-time, promotional services and for resources belonging to - individuals no longer working at the server's site. It is not - necessary to mark all permanently unavailable resources as "gone" or - to keep the mark for any length of time -- that is left to the - discretion of the server owner. - - - - - - - -Fielding, et. al. Standards Track [Page 62] - -RFC 2068 HTTP/1.1 January 1997 - - -10.4.12 411 Length Required - - The server refuses to accept the request without a defined Content- - Length. The client MAY repeat the request if it adds a valid - Content-Length header field containing the length of the message-body - in the request message. - -10.4.13 412 Precondition Failed - - The precondition given in one or more of the request-header fields - evaluated to false when it was tested on the server. This response - code allows the client to place preconditions on the current resource - metainformation (header field data) and thus prevent the requested - method from being applied to a resource other than the one intended. - -10.4.14 413 Request Entity Too Large - - The server is refusing to process a request because the request - entity is larger than the server is willing or able to process. The - server may close the connection to prevent the client from continuing - the request. - - If the condition is temporary, the server SHOULD include a Retry- - After header field to indicate that it is temporary and after what - time the client may try again. - -10.4.15 414 Request-URI Too Long - - The server is refusing to service the request because the Request-URI - is longer than the server is willing to interpret. This rare - condition is only likely to occur when a client has improperly - converted a POST request to a GET request with long query - information, when the client has descended into a URL "black hole" of - redirection (e.g., a redirected URL prefix that points to a suffix of - itself), or when the server is under attack by a client attempting to - exploit security holes present in some servers using fixed-length - buffers for reading or manipulating the Request-URI. - -10.4.16 415 Unsupported Media Type - - The server is refusing to service the request because the entity of - the request is in a format not supported by the requested resource - for the requested method. - - - - - - - - -Fielding, et. al. Standards Track [Page 63] - -RFC 2068 HTTP/1.1 January 1997 - - -10.5 Server Error 5xx - - Response status codes beginning with the digit "5" indicate cases in - which the server is aware that it has erred or is incapable of - performing the request. Except when responding to a HEAD request, the - server SHOULD include an entity containing an explanation of the - error situation, and whether it is a temporary or permanent - condition. User agents SHOULD display any included entity to the - user. These response codes are applicable to any request method. - -10.5.1 500 Internal Server Error - - The server encountered an unexpected condition which prevented it - from fulfilling the request. - -10.5.2 501 Not Implemented - - The server does not support the functionality required to fulfill the - request. This is the appropriate response when the server does not - recognize the request method and is not capable of supporting it for - any resource. - -10.5.3 502 Bad Gateway - - The server, while acting as a gateway or proxy, received an invalid - response from the upstream server it accessed in attempting to - fulfill the request. - -10.5.4 503 Service Unavailable - - The server is currently unable to handle the request due to a - temporary overloading or maintenance of the server. The implication - is that this is a temporary condition which will be alleviated after - some delay. If known, the length of the delay may be indicated in a - Retry-After header. If no Retry-After is given, the client SHOULD - handle the response as it would for a 500 response. - - Note: The existence of the 503 status code does not imply that a - server must use it when becoming overloaded. Some servers may wish - to simply refuse the connection. - -10.5.5 504 Gateway Timeout - - The server, while acting as a gateway or proxy, did not receive a - timely response from the upstream server it accessed in attempting to - complete the request. - - - - - -Fielding, et. al. Standards Track [Page 64] - -RFC 2068 HTTP/1.1 January 1997 - - -10.5.6 505 HTTP Version Not Supported - - The server does not support, or refuses to support, the HTTP protocol - version that was used in the request message. The server is - indicating that it is unable or unwilling to complete the request - using the same major version as the client, as described in section - 3.1, other than with this error message. The response SHOULD contain - an entity describing why that version is not supported and what other - protocols are supported by that server. - -11 Access Authentication - - HTTP provides a simple challenge-response authentication mechanism - which MAY be used by a server to challenge a client request and by a - client to provide authentication information. It uses an extensible, - case-insensitive token to identify the authentication scheme, - followed by a comma-separated list of attribute-value pairs which - carry the parameters necessary for achieving authentication via that - scheme. - - auth-scheme = token - - auth-param = token "=" quoted-string - - The 401 (Unauthorized) response message is used by an origin server - to challenge the authorization of a user agent. This response MUST - include a WWW-Authenticate header field containing at least one - challenge applicable to the requested resource. - - challenge = auth-scheme 1*SP realm *( "," auth-param ) - - realm = "realm" "=" realm-value - realm-value = quoted-string - - The realm attribute (case-insensitive) is required for all - authentication schemes which issue a challenge. The realm value - (case-sensitive), in combination with the canonical root URL (see - section 5.1.2) of the server being accessed, defines the protection - space. These realms allow the protected resources on a server to be - partitioned into a set of protection spaces, each with its own - authentication scheme and/or authorization database. The realm value - is a string, generally assigned by the origin server, which may have - additional semantics specific to the authentication scheme. - - A user agent that wishes to authenticate itself with a server-- - usually, but not necessarily, after receiving a 401 or 411 response- - -MAY do so by including an Authorization header field with the - request. The Authorization field value consists of credentials - - - -Fielding, et. al. Standards Track [Page 65] - -RFC 2068 HTTP/1.1 January 1997 - - - containing the authentication information of the user agent for the - realm of the resource being requested. - - credentials = basic-credentials - | auth-scheme #auth-param - - The domain over which credentials can be automatically applied by a - user agent is determined by the protection space. If a prior request - has been authorized, the same credentials MAY be reused for all other - requests within that protection space for a period of time determined - by the authentication scheme, parameters, and/or user preference. - Unless otherwise defined by the authentication scheme, a single - protection space cannot extend outside the scope of its server. - - If the server does not wish to accept the credentials sent with a - request, it SHOULD return a 401 (Unauthorized) response. The response - MUST include a WWW-Authenticate header field containing the (possibly - new) challenge applicable to the requested resource and an entity - explaining the refusal. - - The HTTP protocol does not restrict applications to this simple - challenge-response mechanism for access authentication. Additional - mechanisms MAY be used, such as encryption at the transport level or - via message encapsulation, and with additional header fields - specifying authentication information. However, these additional - mechanisms are not defined by this specification. - - Proxies MUST be completely transparent regarding user agent - authentication. That is, they MUST forward the WWW-Authenticate and - Authorization headers untouched, and follow the rules found in - section 14.8. - - HTTP/1.1 allows a client to pass authentication information to and - from a proxy via the Proxy-Authenticate and Proxy-Authorization - headers. - -11.1 Basic Authentication Scheme - - The "basic" authentication scheme is based on the model that the user - agent must authenticate itself with a user-ID and a password for each - realm. The realm value should be considered an opaque string which - can only be compared for equality with other realms on that server. - The server will service the request only if it can validate the - user-ID and password for the protection space of the Request-URI. - There are no optional authentication parameters. - - - - - - -Fielding, et. al. Standards Track [Page 66] - -RFC 2068 HTTP/1.1 January 1997 - - - Upon receipt of an unauthorized request for a URI within the - protection space, the server MAY respond with a challenge like the - following: - - WWW-Authenticate: Basic realm="WallyWorld" - - where "WallyWorld" is the string assigned by the server to identify - the protection space of the Request-URI. - - To receive authorization, the client sends the userid and password, - separated by a single colon (":") character, within a base64 encoded - string in the credentials. - - basic-credentials = "Basic" SP basic-cookie - - basic-cookie = - - user-pass = userid ":" password - - userid = * - - password = *TEXT - - Userids might be case sensitive. - - If the user agent wishes to send the userid "Aladdin" and password - "open sesame", it would use the following header field: - - Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ== - - See section 15 for security considerations associated with Basic - authentication. - -11.2 Digest Authentication Scheme - - A digest authentication for HTTP is specified in RFC 2069 [32]. - -12 Content Negotiation - - Most HTTP responses include an entity which contains information for - interpretation by a human user. Naturally, it is desirable to supply - the user with the "best available" entity corresponding to the - request. Unfortunately for servers and caches, not all users have - the same preferences for what is "best," and not all user agents are - equally capable of rendering all entity types. For that reason, HTTP - has provisions for several mechanisms for "content negotiation" -- - the process of selecting the best representation for a given response - - - -Fielding, et. al. Standards Track [Page 67] - -RFC 2068 HTTP/1.1 January 1997 - - - when there are multiple representations available. - - Note: This is not called "format negotiation" because the alternate - representations may be of the same media type, but use different - capabilities of that type, be in different languages, etc. - - Any response containing an entity-body MAY be subject to negotiation, - including error responses. - - There are two kinds of content negotiation which are possible in - HTTP: server-driven and agent-driven negotiation. These two kinds of - negotiation are orthogonal and thus may be used separately or in - combination. One method of combination, referred to as transparent - negotiation, occurs when a cache uses the agent-driven negotiation - information provided by the origin server in order to provide - server-driven negotiation for subsequent requests. - -12.1 Server-driven Negotiation - - If the selection of the best representation for a response is made by - an algorithm located at the server, it is called server-driven - negotiation. Selection is based on the available representations of - the response (the dimensions over which it can vary; e.g. language, - content-coding, etc.) and the contents of particular header fields in - the request message or on other information pertaining to the request - (such as the network address of the client). - - Server-driven negotiation is advantageous when the algorithm for - selecting from among the available representations is difficult to - describe to the user agent, or when the server desires to send its - "best guess" to the client along with the first response (hoping to - avoid the round-trip delay of a subsequent request if the "best - guess" is good enough for the user). In order to improve the server's - guess, the user agent MAY include request header fields (Accept, - Accept-Language, Accept-Encoding, etc.) which describe its - preferences for such a response. - - Server-driven negotiation has disadvantages: - -1. It is impossible for the server to accurately determine what might be - "best" for any given user, since that would require complete - knowledge of both the capabilities of the user agent and the intended - use for the response (e.g., does the user want to view it on screen - or print it on paper?). - -2. Having the user agent describe its capabilities in every request can - be both very inefficient (given that only a small percentage of - responses have multiple representations) and a potential violation of - - - -Fielding, et. al. Standards Track [Page 68] - -RFC 2068 HTTP/1.1 January 1997 - - - the user's privacy. - -3. It complicates the implementation of an origin server and the - algorithms for generating responses to a request. - -4. It may limit a public cache's ability to use the same response for - multiple user's requests. - - HTTP/1.1 includes the following request-header fields for enabling - server-driven negotiation through description of user agent - capabilities and user preferences: Accept (section 14.1), Accept- - Charset (section 14.2), Accept-Encoding (section 14.3), Accept- - Language (section 14.4), and User-Agent (section 14.42). However, an - origin server is not limited to these dimensions and MAY vary the - response based on any aspect of the request, including information - outside the request-header fields or within extension header fields - not defined by this specification. - - HTTP/1.1 origin servers MUST include an appropriate Vary header field - (section 14.43) in any cachable response based on server-driven - negotiation. The Vary header field describes the dimensions over - which the response might vary (i.e. the dimensions over which the - origin server picks its "best guess" response from multiple - representations). - - HTTP/1.1 public caches MUST recognize the Vary header field when it - is included in a response and obey the requirements described in - section 13.6 that describes the interactions between caching and - content negotiation. - -12.2 Agent-driven Negotiation - - With agent-driven negotiation, selection of the best representation - for a response is performed by the user agent after receiving an - initial response from the origin server. Selection is based on a list - of the available representations of the response included within the - header fields (this specification reserves the field-name Alternates, - as described in appendix 19.6.2.1) or entity-body of the initial - response, with each representation identified by its own URI. - Selection from among the representations may be performed - automatically (if the user agent is capable of doing so) or manually - by the user selecting from a generated (possibly hypertext) menu. - - Agent-driven negotiation is advantageous when the response would vary - over commonly-used dimensions (such as type, language, or encoding), - when the origin server is unable to determine a user agent's - capabilities from examining the request, and generally when public - caches are used to distribute server load and reduce network usage. - - - -Fielding, et. al. Standards Track [Page 69] - -RFC 2068 HTTP/1.1 January 1997 - - - Agent-driven negotiation suffers from the disadvantage of needing a - second request to obtain the best alternate representation. This - second request is only efficient when caching is used. In addition, - this specification does not define any mechanism for supporting - automatic selection, though it also does not prevent any such - mechanism from being developed as an extension and used within - HTTP/1.1. - - HTTP/1.1 defines the 300 (Multiple Choices) and 406 (Not Acceptable) - status codes for enabling agent-driven negotiation when the server is - unwilling or unable to provide a varying response using server-driven - negotiation. - -12.3 Transparent Negotiation - - Transparent negotiation is a combination of both server-driven and - agent-driven negotiation. When a cache is supplied with a form of the - list of available representations of the response (as in agent-driven - negotiation) and the dimensions of variance are completely understood - by the cache, then the cache becomes capable of performing server- - driven negotiation on behalf of the origin server for subsequent - requests on that resource. - - Transparent negotiation has the advantage of distributing the - negotiation work that would otherwise be required of the origin - server and also removing the second request delay of agent-driven - negotiation when the cache is able to correctly guess the right - response. - - This specification does not define any mechanism for transparent - negotiation, though it also does not prevent any such mechanism from - being developed as an extension and used within HTTP/1.1. An HTTP/1.1 - cache performing transparent negotiation MUST include a Vary header - field in the response (defining the dimensions of its variance) if it - is cachable to ensure correct interoperation with all HTTP/1.1 - clients. The agent-driven negotiation information supplied by the - origin server SHOULD be included with the transparently negotiated - response. - -13 Caching in HTTP - - HTTP is typically used for distributed information systems, where - performance can be improved by the use of response caches. The - HTTP/1.1 protocol includes a number of elements intended to make - caching work as well as possible. Because these elements are - inextricable from other aspects of the protocol, and because they - interact with each other, it is useful to describe the basic caching - design of HTTP separately from the detailed descriptions of methods, - - - -Fielding, et. al. Standards Track [Page 70] - -RFC 2068 HTTP/1.1 January 1997 - - - headers, response codes, etc. - - Caching would be useless if it did not significantly improve - performance. The goal of caching in HTTP/1.1 is to eliminate the need - to send requests in many cases, and to eliminate the need to send - full responses in many other cases. The former reduces the number of - network round-trips required for many operations; we use an - "expiration" mechanism for this purpose (see section 13.2). The - latter reduces network bandwidth requirements; we use a "validation" - mechanism for this purpose (see section 13.3). - - Requirements for performance, availability, and disconnected - operation require us to be able to relax the goal of semantic - transparency. The HTTP/1.1 protocol allows origin servers, caches, - and clients to explicitly reduce transparency when necessary. - However, because non-transparent operation may confuse non-expert - users, and may be incompatible with certain server applications (such - as those for ordering merchandise), the protocol requires that - transparency be relaxed - - o only by an explicit protocol-level request when relaxed by client - or origin server - - o only with an explicit warning to the end user when relaxed by cache - or client - - - - - - - - - - - - - - - - - - - - - - - - - - -Fielding, et. al. Standards Track [Page 71] - -RFC 2068 HTTP/1.1 January 1997 - - - Therefore, the HTTP/1.1 protocol provides these important elements: - - 1. Protocol features that provide full semantic transparency when this - is required by all parties. - - 2. Protocol features that allow an origin server or user agent to - explicitly request and control non-transparent operation. - - 3. Protocol features that allow a cache to attach warnings to - responses that do not preserve the requested approximation of - semantic transparency. - - A basic principle is that it must be possible for the clients to - detect any potential relaxation of semantic transparency. - - Note: The server, cache, or client implementer may be faced with - design decisions not explicitly discussed in this specification. If - a decision may affect semantic transparency, the implementer ought - to err on the side of maintaining transparency unless a careful and - complete analysis shows significant benefits in breaking - transparency. - -13.1.1 Cache Correctness - - A correct cache MUST respond to a request with the most up-to-date - response held by the cache that is appropriate to the request (see - sections 13.2.5, 13.2.6, and 13.12) which meets one of the following - conditions: - - 1. It has been checked for equivalence with what the origin server - would have returned by revalidating the response with the origin - server (section 13.3); - - 2. It is "fresh enough" (see section 13.2). In the default case, this - means it meets the least restrictive freshness requirement of the - client, server, and cache (see section 14.9); if the origin server - so specifies, it is the freshness requirement of the origin server - alone. - - 3. It includes a warning if the freshness demand of the client or the - origin server is violated (see section 13.1.5 and 14.45). - - 4. It is an appropriate 304 (Not Modified), 305 (Proxy Redirect), or - error (4xx or 5xx) response message. - - If the cache can not communicate with the origin server, then a - correct cache SHOULD respond as above if the response can be - correctly served from the cache; if not it MUST return an error or - - - -Fielding, et. al. Standards Track [Page 72] - -RFC 2068 HTTP/1.1 January 1997 - - - warning indicating that there was a communication failure. - - If a cache receives a response (either an entire response, or a 304 - (Not Modified) response) that it would normally forward to the - requesting client, and the received response is no longer fresh, the - cache SHOULD forward it to the requesting client without adding a new - Warning (but without removing any existing Warning headers). A cache - SHOULD NOT attempt to revalidate a response simply because that - response became stale in transit; this might lead to an infinite - loop. An user agent that receives a stale response without a Warning - MAY display a warning indication to the user. - -13.1.2 Warnings - - Whenever a cache returns a response that is neither first-hand nor - "fresh enough" (in the sense of condition 2 in section 13.1.1), it - must attach a warning to that effect, using a Warning response- - header. This warning allows clients to take appropriate action. - - Warnings may be used for other purposes, both cache-related and - otherwise. The use of a warning, rather than an error status code, - distinguish these responses from true failures. - - Warnings are always cachable, because they never weaken the - transparency of a response. This means that warnings can be passed to - HTTP/1.0 caches without danger; such caches will simply pass the - warning along as an entity-header in the response. - - Warnings are assigned numbers between 0 and 99. This specification - defines the code numbers and meanings of each currently assigned - warnings, allowing a client or cache to take automated action in some - (but not all) cases. - - Warnings also carry a warning text. The text may be in any - appropriate natural language (perhaps based on the client's Accept - headers), and include an optional indication of what character set is - used. - - Multiple warnings may be attached to a response (either by the origin - server or by a cache), including multiple warnings with the same code - number. For example, a server may provide the same warning with texts - in both English and Basque. - - When multiple warnings are attached to a response, it may not be - practical or reasonable to display all of them to the user. This - version of HTTP does not specify strict priority rules for deciding - which warnings to display and in what order, but does suggest some - heuristics. - - - -Fielding, et. al. Standards Track [Page 73] - -RFC 2068 HTTP/1.1 January 1997 - - - The Warning header and the currently defined warnings are described - in section 14.45. - -13.1.3 Cache-control Mechanisms - - The basic cache mechanisms in HTTP/1.1 (server-specified expiration - times and validators) are implicit directives to caches. In some - cases, a server or client may need to provide explicit directives to - the HTTP caches. We use the Cache-Control header for this purpose. - - The Cache-Control header allows a client or server to transmit a - variety of directives in either requests or responses. These - directives typically override the default caching algorithms. As a - general rule, if there is any apparent conflict between header - values, the most restrictive interpretation should be applied (that - is, the one that is most likely to preserve semantic transparency). - However, in some cases, Cache-Control directives are explicitly - specified as weakening the approximation of semantic transparency - (for example, "max-stale" or "public"). - - The Cache-Control directives are described in detail in section 14.9. - -13.1.4 Explicit User Agent Warnings - - Many user agents make it possible for users to override the basic - caching mechanisms. For example, the user agent may allow the user to - specify that cached entities (even explicitly stale ones) are never - validated. Or the user agent might habitually add "Cache-Control: - max-stale=3600" to every request. The user should have to explicitly - request either non-transparent behavior, or behavior that results in - abnormally ineffective caching. - - If the user has overridden the basic caching mechanisms, the user - agent should explicitly indicate to the user whenever this results in - the display of information that might not meet the server's - transparency requirements (in particular, if the displayed entity is - known to be stale). Since the protocol normally allows the user agent - to determine if responses are stale or not, this indication need only - be displayed when this actually happens. The indication need not be a - dialog box; it could be an icon (for example, a picture of a rotting - fish) or some other visual indicator. - - If the user has overridden the caching mechanisms in a way that would - abnormally reduce the effectiveness of caches, the user agent should - continually display an indication (for example, a picture of currency - in flames) so that the user does not inadvertently consume excess - resources or suffer from excessive latency. - - - - -Fielding, et. al. Standards Track [Page 74] - -RFC 2068 HTTP/1.1 January 1997 - - -13.1.5 Exceptions to the Rules and Warnings - - In some cases, the operator of a cache may choose to configure it to - return stale responses even when not requested by clients. This - decision should not be made lightly, but may be necessary for reasons - of availability or performance, especially when the cache is poorly - connected to the origin server. Whenever a cache returns a stale - response, it MUST mark it as such (using a Warning header). This - allows the client software to alert the user that there may be a - potential problem. - - It also allows the user agent to take steps to obtain a first-hand or - fresh response. For this reason, a cache SHOULD NOT return a stale - response if the client explicitly requests a first-hand or fresh one, - unless it is impossible to comply for technical or policy reasons. - -13.1.6 Client-controlled Behavior - - While the origin server (and to a lesser extent, intermediate caches, - by their contribution to the age of a response) are the primary - source of expiration information, in some cases the client may need - to control a cache's decision about whether to return a cached - response without validating it. Clients do this using several - directives of the Cache-Control header. - - A client's request may specify the maximum age it is willing to - accept of an unvalidated response; specifying a value of zero forces - the cache(s) to revalidate all responses. A client may also specify - the minimum time remaining before a response expires. Both of these - options increase constraints on the behavior of caches, and so cannot - further relax the cache's approximation of semantic transparency. - - A client may also specify that it will accept stale responses, up to - some maximum amount of staleness. This loosens the constraints on the - caches, and so may violate the origin server's specified constraints - on semantic transparency, but may be necessary to support - disconnected operation, or high availability in the face of poor - connectivity. - -13.2 Expiration Model - -13.2.1 Server-Specified Expiration - - HTTP caching works best when caches can entirely avoid making - requests to the origin server. The primary mechanism for avoiding - requests is for an origin server to provide an explicit expiration - time in the future, indicating that a response may be used to satisfy - subsequent requests. In other words, a cache can return a fresh - - - -Fielding, et. al. Standards Track [Page 75] - -RFC 2068 HTTP/1.1 January 1997 - - - response without first contacting the server. - - Our expectation is that servers will assign future explicit - expiration times to responses in the belief that the entity is not - likely to change, in a semantically significant way, before the - expiration time is reached. This normally preserves semantic - transparency, as long as the server's expiration times are carefully - chosen. - - The expiration mechanism applies only to responses taken from a cache - and not to first-hand responses forwarded immediately to the - requesting client. - - If an origin server wishes to force a semantically transparent cache - to validate every request, it may assign an explicit expiration time - in the past. This means that the response is always stale, and so the - cache SHOULD validate it before using it for subsequent requests. See - section 14.9.4 for a more restrictive way to force revalidation. - - If an origin server wishes to force any HTTP/1.1 cache, no matter how - it is configured, to validate every request, it should use the - "must-revalidate" Cache-Control directive (see section 14.9). - - Servers specify explicit expiration times using either the Expires - header, or the max-age directive of the Cache-Control header. - - An expiration time cannot be used to force a user agent to refresh - its display or reload a resource; its semantics apply only to caching - mechanisms, and such mechanisms need only check a resource's - expiration status when a new request for that resource is initiated. - See section 13.13 for explanation of the difference between caches - and history mechanisms. - -13.2.2 Heuristic Expiration - - Since origin servers do not always provide explicit expiration times, - HTTP caches typically assign heuristic expiration times, employing - algorithms that use other header values (such as the Last-Modified - time) to estimate a plausible expiration time. The HTTP/1.1 - specification does not provide specific algorithms, but does impose - worst-case constraints on their results. Since heuristic expiration - times may compromise semantic transparency, they should be used - cautiously, and we encourage origin servers to provide explicit - expiration times as much as possible. - - - - - - - -Fielding, et. al. Standards Track [Page 76] - -RFC 2068 HTTP/1.1 January 1997 - - -13.2.3 Age Calculations - - In order to know if a cached entry is fresh, a cache needs to know if - its age exceeds its freshness lifetime. We discuss how to calculate - the latter in section 13.2.4; this section describes how to calculate - the age of a response or cache entry. - - In this discussion, we use the term "now" to mean "the current value - of the clock at the host performing the calculation." Hosts that use - HTTP, but especially hosts running origin servers and caches, should - use NTP [28] or some similar protocol to synchronize their clocks to - a globally accurate time standard. - - Also note that HTTP/1.1 requires origin servers to send a Date header - with every response, giving the time at which the response was - generated. We use the term "date_value" to denote the value of the - Date header, in a form appropriate for arithmetic operations. - - HTTP/1.1 uses the Age response-header to help convey age information - between caches. The Age header value is the sender's estimate of the - amount of time since the response was generated at the origin server. - In the case of a cached response that has been revalidated with the - origin server, the Age value is based on the time of revalidation, - not of the original response. - - In essence, the Age value is the sum of the time that the response - has been resident in each of the caches along the path from the - origin server, plus the amount of time it has been in transit along - network paths. - - We use the term "age_value" to denote the value of the Age header, in - a form appropriate for arithmetic operations. - - A response's age can be calculated in two entirely independent ways: - - 1. now minus date_value, if the local clock is reasonably well - synchronized to the origin server's clock. If the result is - negative, the result is replaced by zero. - - 2. age_value, if all of the caches along the response path - implement HTTP/1.1. - - Given that we have two independent ways to compute the age of a - response when it is received, we can combine these as - - corrected_received_age = max(now - date_value, age_value) - - and as long as we have either nearly synchronized clocks or all- - - - -Fielding, et. al. Standards Track [Page 77] - -RFC 2068 HTTP/1.1 January 1997 - - - HTTP/1.1 paths, one gets a reliable (conservative) result. - - Note that this correction is applied at each HTTP/1.1 cache along the - path, so that if there is an HTTP/1.0 cache in the path, the correct - received age is computed as long as the receiving cache's clock is - nearly in sync. We don't need end-to-end clock synchronization - (although it is good to have), and there is no explicit clock - synchronization step. - - Because of network-imposed delays, some significant interval may pass - from the time that a server generates a response and the time it is - received at the next outbound cache or client. If uncorrected, this - delay could result in improperly low ages. - - Because the request that resulted in the returned Age value must have - been initiated prior to that Age value's generation, we can correct - for delays imposed by the network by recording the time at which the - request was initiated. Then, when an Age value is received, it MUST - be interpreted relative to the time the request was initiated, not - the time that the response was received. This algorithm results in - conservative behavior no matter how much delay is experienced. So, we - compute: - - corrected_initial_age = corrected_received_age - + (now - request_time) - - where "request_time" is the time (according to the local clock) when - the request that elicited this response was sent. - - Summary of age calculation algorithm, when a cache receives a - response: - - /* - * age_value - * is the value of Age: header received by the cache with - * this response. - * date_value - * is the value of the origin server's Date: header - * request_time - * is the (local) time when the cache made the request - * that resulted in this cached response - * response_time - * is the (local) time when the cache received the - * response - * now - * is the current (local) time - */ - apparent_age = max(0, response_time - date_value); - - - -Fielding, et. al. Standards Track [Page 78] - -RFC 2068 HTTP/1.1 January 1997 - - - corrected_received_age = max(apparent_age, age_value); - response_delay = response_time - request_time; - corrected_initial_age = corrected_received_age + response_delay; - resident_time = now - response_time; - current_age = corrected_initial_age + resident_time; - - When a cache sends a response, it must add to the - corrected_initial_age the amount of time that the response was - resident locally. It must then transmit this total age, using the Age - header, to the next recipient cache. - - Note that a client cannot reliably tell that a response is first- - hand, but the presence of an Age header indicates that a response - is definitely not first-hand. Also, if the Date in a response is - earlier than the client's local request time, the response is - probably not first-hand (in the absence of serious clock skew). - -13.2.4 Expiration Calculations - - In order to decide whether a response is fresh or stale, we need to - compare its freshness lifetime to its age. The age is calculated as - described in section 13.2.3; this section describes how to calculate - the freshness lifetime, and to determine if a response has expired. - In the discussion below, the values can be represented in any form - appropriate for arithmetic operations. - - We use the term "expires_value" to denote the value of the Expires - header. We use the term "max_age_value" to denote an appropriate - value of the number of seconds carried by the max-age directive of - the Cache-Control header in a response (see section 14.10. - - The max-age directive takes priority over Expires, so if max-age is - present in a response, the calculation is simply: - - freshness_lifetime = max_age_value - - Otherwise, if Expires is present in the response, the calculation is: - - freshness_lifetime = expires_value - date_value - - Note that neither of these calculations is vulnerable to clock skew, - since all of the information comes from the origin server. - - If neither Expires nor Cache-Control: max-age appears in the - response, and the response does not include other restrictions on - caching, the cache MAY compute a freshness lifetime using a - heuristic. If the value is greater than 24 hours, the cache must - attach Warning 13 to any response whose age is more than 24 hours if - - - -Fielding, et. al. Standards Track [Page 79] - -RFC 2068 HTTP/1.1 January 1997 - - - such warning has not already been added. - - Also, if the response does have a Last-Modified time, the heuristic - expiration value SHOULD be no more than some fraction of the interval - since that time. A typical setting of this fraction might be 10%. - - The calculation to determine if a response has expired is quite - simple: - - response_is_fresh = (freshness_lifetime > current_age) - -13.2.5 Disambiguating Expiration Values - - Because expiration values are assigned optimistically, it is possible - for two caches to contain fresh values for the same resource that are - different. - - If a client performing a retrieval receives a non-first-hand response - for a request that was already fresh in its own cache, and the Date - header in its existing cache entry is newer than the Date on the new - response, then the client MAY ignore the response. If so, it MAY - retry the request with a "Cache-Control: max-age=0" directive (see - section 14.9), to force a check with the origin server. - - If a cache has two fresh responses for the same representation with - different validators, it MUST use the one with the more recent Date - header. This situation may arise because the cache is pooling - responses from other caches, or because a client has asked for a - reload or a revalidation of an apparently fresh cache entry. - -13.2.6 Disambiguating Multiple Responses - - Because a client may be receiving responses via multiple paths, so - that some responses flow through one set of caches and other - responses flow through a different set of caches, a client may - receive responses in an order different from that in which the origin - server sent them. We would like the client to use the most recently - generated response, even if older responses are still apparently - fresh. - - Neither the entity tag nor the expiration value can impose an - ordering on responses, since it is possible that a later response - intentionally carries an earlier expiration time. However, the - HTTP/1.1 specification requires the transmission of Date headers on - every response, and the Date values are ordered to a granularity of - one second. - - - - - -Fielding, et. al. Standards Track [Page 80] - -RFC 2068 HTTP/1.1 January 1997 - - - When a client tries to revalidate a cache entry, and the response it - receives contains a Date header that appears to be older than the one - for the existing entry, then the client SHOULD repeat the request - unconditionally, and include - - Cache-Control: max-age=0 - - to force any intermediate caches to validate their copies directly - with the origin server, or - - Cache-Control: no-cache - - to force any intermediate caches to obtain a new copy from the origin - server. - - If the Date values are equal, then the client may use either response - (or may, if it is being extremely prudent, request a new response). - Servers MUST NOT depend on clients being able to choose - deterministically between responses generated during the same second, - if their expiration times overlap. - -13.3 Validation Model - - When a cache has a stale entry that it would like to use as a - response to a client's request, it first has to check with the origin - server (or possibly an intermediate cache with a fresh response) to - see if its cached entry is still usable. We call this "validating" - the cache entry. Since we do not want to have to pay the overhead of - retransmitting the full response if the cached entry is good, and we - do not want to pay the overhead of an extra round trip if the cached - entry is invalid, the HTTP/1.1 protocol supports the use of - conditional methods. - - The key protocol features for supporting conditional methods are - those concerned with "cache validators." When an origin server - generates a full response, it attaches some sort of validator to it, - which is kept with the cache entry. When a client (user agent or - proxy cache) makes a conditional request for a resource for which it - has a cache entry, it includes the associated validator in the - request. - - The server then checks that validator against the current validator - for the entity, and, if they match, it responds with a special status - code (usually, 304 (Not Modified)) and no entity-body. Otherwise, it - returns a full response (including entity-body). Thus, we avoid - transmitting the full response if the validator matches, and we avoid - an extra round trip if it does not match. - - - - -Fielding, et. al. Standards Track [Page 81] - -RFC 2068 HTTP/1.1 January 1997 - - - Note: the comparison functions used to decide if validators match - are defined in section 13.3.3. - - In HTTP/1.1, a conditional request looks exactly the same as a normal - request for the same resource, except that it carries a special - header (which includes the validator) that implicitly turns the - method (usually, GET) into a conditional. - - The protocol includes both positive and negative senses of cache- - validating conditions. That is, it is possible to request either that - a method be performed if and only if a validator matches or if and - only if no validators match. - - Note: a response that lacks a validator may still be cached, and - served from cache until it expires, unless this is explicitly - prohibited by a Cache-Control directive. However, a cache cannot do - a conditional retrieval if it does not have a validator for the - entity, which means it will not be refreshable after it expires. - -13.3.1 Last-modified Dates - - The Last-Modified entity-header field value is often used as a cache - validator. In simple terms, a cache entry is considered to be valid - if the entity has not been modified since the Last-Modified value. - -13.3.2 Entity Tag Cache Validators - - The ETag entity-header field value, an entity tag, provides for an - "opaque" cache validator. This may allow more reliable validation in - situations where it is inconvenient to store modification dates, - where the one-second resolution of HTTP date values is not - sufficient, or where the origin server wishes to avoid certain - paradoxes that may arise from the use of modification dates. - - Entity Tags are described in section 3.11. The headers used with - entity tags are described in sections 14.20, 14.25, 14.26 and 14.43. - -13.3.3 Weak and Strong Validators - - Since both origin servers and caches will compare two validators to - decide if they represent the same or different entities, one normally - would expect that if the entity (the entity-body or any entity- - headers) changes in any way, then the associated validator would - change as well. If this is true, then we call this validator a - "strong validator." - - However, there may be cases when a server prefers to change the - validator only on semantically significant changes, and not when - - - -Fielding, et. al. Standards Track [Page 82] - -RFC 2068 HTTP/1.1 January 1997 - - - insignificant aspects of the entity change. A validator that does not - always change when the resource changes is a "weak validator." - - Entity tags are normally "strong validators," but the protocol - provides a mechanism to tag an entity tag as "weak." One can think of - a strong validator as one that changes whenever the bits of an entity - changes, while a weak value changes whenever the meaning of an entity - changes. Alternatively, one can think of a strong validator as part - of an identifier for a specific entity, while a weak validator is - part of an identifier for a set of semantically equivalent entities. - - Note: One example of a strong validator is an integer that is - incremented in stable storage every time an entity is changed. - - An entity's modification time, if represented with one-second - resolution, could be a weak validator, since it is possible that - the resource may be modified twice during a single second. - - Support for weak validators is optional; however, weak validators - allow for more efficient caching of equivalent objects; for - example, a hit counter on a site is probably good enough if it is - updated every few days or weeks, and any value during that period - is likely "good enough" to be equivalent. - - A "use" of a validator is either when a client generates a request - and includes the validator in a validating header field, or when a - server compares two validators. - - Strong validators are usable in any context. Weak validators are only - usable in contexts that do not depend on exact equality of an entity. - For example, either kind is usable for a conditional GET of a full - entity. However, only a strong validator is usable for a sub-range - retrieval, since otherwise the client may end up with an internally - inconsistent entity. - - The only function that the HTTP/1.1 protocol defines on validators is - comparison. There are two validator comparison functions, depending - on whether the comparison context allows the use of weak validators - or not: - - o The strong comparison function: in order to be considered equal, - both validators must be identical in every way, and neither may be - weak. - o The weak comparison function: in order to be considered equal, both - validators must be identical in every way, but either or both of - them may be tagged as "weak" without affecting the result. - - The weak comparison function MAY be used for simple (non-subrange) - - - -Fielding, et. al. Standards Track [Page 83] - -RFC 2068 HTTP/1.1 January 1997 - - - GET requests. The strong comparison function MUST be used in all - other cases. - - An entity tag is strong unless it is explicitly tagged as weak. - Section 3.11 gives the syntax for entity tags. - - A Last-Modified time, when used as a validator in a request, is - implicitly weak unless it is possible to deduce that it is strong, - using the following rules: - - o The validator is being compared by an origin server to the actual - current validator for the entity and, - o That origin server reliably knows that the associated entity did - not change twice during the second covered by the presented - validator. -or - - o The validator is about to be used by a client in an If-Modified- - Since or If-Unmodified-Since header, because the client has a cache - entry for the associated entity, and - o That cache entry includes a Date value, which gives the time when - the origin server sent the original response, and - o The presented Last-Modified time is at least 60 seconds before the - Date value. -or - - o The validator is being compared by an intermediate cache to the - validator stored in its cache entry for the entity, and - o That cache entry includes a Date value, which gives the time when - the origin server sent the original response, and - o The presented Last-Modified time is at least 60 seconds before the - Date value. - - This method relies on the fact that if two different responses were - sent by the origin server during the same second, but both had the - same Last-Modified time, then at least one of those responses would - have a Date value equal to its Last-Modified time. The arbitrary 60- - second limit guards against the possibility that the Date and Last- - Modified values are generated from different clocks, or at somewhat - different times during the preparation of the response. An - implementation may use a value larger than 60 seconds, if it is - believed that 60 seconds is too short. - - If a client wishes to perform a sub-range retrieval on a value for - which it has only a Last-Modified time and no opaque validator, it - may do this only if the Last-Modified time is strong in the sense - described here. - - - - -Fielding, et. al. Standards Track [Page 84] - -RFC 2068 HTTP/1.1 January 1997 - - - A cache or origin server receiving a cache-conditional request, other - than a full-body GET request, MUST use the strong comparison function - to evaluate the condition. - - These rules allow HTTP/1.1 caches and clients to safely perform sub- - range retrievals on values that have been obtained from HTTP/1.0 - servers. - -13.3.4 Rules for When to Use Entity Tags and Last-modified Dates - - We adopt a set of rules and recommendations for origin servers, - clients, and caches regarding when various validator types should be - used, and for what purposes. - - HTTP/1.1 origin servers: - - o SHOULD send an entity tag validator unless it is not feasible to - generate one. - o MAY send a weak entity tag instead of a strong entity tag, if - performance considerations support the use of weak entity tags, or - if it is unfeasible to send a strong entity tag. - o SHOULD send a Last-Modified value if it is feasible to send one, - unless the risk of a breakdown in semantic transparency that could - result from using this date in an If-Modified-Since header would - lead to serious problems. - - In other words, the preferred behavior for an HTTP/1.1 origin server - is to send both a strong entity tag and a Last-Modified value. - - In order to be legal, a strong entity tag MUST change whenever the - associated entity value changes in any way. A weak entity tag SHOULD - change whenever the associated entity changes in a semantically - significant way. - - Note: in order to provide semantically transparent caching, an - origin server must avoid reusing a specific strong entity tag value - for two different entities, or reusing a specific weak entity tag - value for two semantically different entities. Cache entries may - persist for arbitrarily long periods, regardless of expiration - times, so it may be inappropriate to expect that a cache will never - again attempt to validate an entry using a validator that it - obtained at some point in the past. - - HTTP/1.1 clients: - - o If an entity tag has been provided by the origin server, MUST - use that entity tag in any cache-conditional request (using - If-Match or If-None-Match). - - - -Fielding, et. al. Standards Track [Page 85] - -RFC 2068 HTTP/1.1 January 1997 - - - o If only a Last-Modified value has been provided by the origin - server, SHOULD use that value in non-subrange cache-conditional - requests (using If-Modified-Since). - o If only a Last-Modified value has been provided by an HTTP/1.0 - origin server, MAY use that value in subrange cache-conditional - requests (using If-Unmodified-Since:). The user agent should - provide a way to disable this, in case of difficulty. - o If both an entity tag and a Last-Modified value have been - provided by the origin server, SHOULD use both validators in - cache-conditional requests. This allows both HTTP/1.0 and - HTTP/1.1 caches to respond appropriately. - - An HTTP/1.1 cache, upon receiving a request, MUST use the most - restrictive validator when deciding whether the client's cache entry - matches the cache's own cache entry. This is only an issue when the - request contains both an entity tag and a last-modified-date - validator (If-Modified-Since or If-Unmodified-Since). - - A note on rationale: The general principle behind these rules is - that HTTP/1.1 servers and clients should transmit as much non- - redundant information as is available in their responses and - requests. HTTP/1.1 systems receiving this information will make the - most conservative assumptions about the validators they receive. - - HTTP/1.0 clients and caches will ignore entity tags. Generally, - last-modified values received or used by these systems will support - transparent and efficient caching, and so HTTP/1.1 origin servers - should provide Last-Modified values. In those rare cases where the - use of a Last-Modified value as a validator by an HTTP/1.0 system - could result in a serious problem, then HTTP/1.1 origin servers - should not provide one. - -13.3.5 Non-validating Conditionals - - The principle behind entity tags is that only the service author - knows the semantics of a resource well enough to select an - appropriate cache validation mechanism, and the specification of any - validator comparison function more complex than byte-equality would - open up a can of worms. Thus, comparisons of any other headers - (except Last-Modified, for compatibility with HTTP/1.0) are never - used for purposes of validating a cache entry. - -13.4 Response Cachability - - Unless specifically constrained by a Cache-Control (section 14.9) - directive, a caching system may always store a successful response - (see section 13.8) as a cache entry, may return it without validation - if it is fresh, and may return it after successful validation. If - - - -Fielding, et. al. Standards Track [Page 86] - -RFC 2068 HTTP/1.1 January 1997 - - - there is neither a cache validator nor an explicit expiration time - associated with a response, we do not expect it to be cached, but - certain caches may violate this expectation (for example, when little - or no network connectivity is available). A client can usually detect - that such a response was taken from a cache by comparing the Date - header to the current time. - - Note that some HTTP/1.0 caches are known to violate this - expectation without providing any Warning. - - However, in some cases it may be inappropriate for a cache to retain - an entity, or to return it in response to a subsequent request. This - may be because absolute semantic transparency is deemed necessary by - the service author, or because of security or privacy considerations. - Certain Cache-Control directives are therefore provided so that the - server can indicate that certain resource entities, or portions - thereof, may not be cached regardless of other considerations. - - Note that section 14.8 normally prevents a shared cache from saving - and returning a response to a previous request if that request - included an Authorization header. - - A response received with a status code of 200, 203, 206, 300, 301 or - 410 may be stored by a cache and used in reply to a subsequent - request, subject to the expiration mechanism, unless a Cache-Control - directive prohibits caching. However, a cache that does not support - the Range and Content-Range headers MUST NOT cache 206 (Partial - Content) responses. - - A response received with any other status code MUST NOT be returned - in a reply to a subsequent request unless there are Cache-Control - directives or another header(s) that explicitly allow it. For - example, these include the following: an Expires header (section - 14.21); a "max-age", "must-revalidate", "proxy-revalidate", "public" - or "private" Cache-Control directive (section 14.9). - -13.5 Constructing Responses From Caches - - The purpose of an HTTP cache is to store information received in - response to requests, for use in responding to future requests. In - many cases, a cache simply returns the appropriate parts of a - response to the requester. However, if the cache holds a cache entry - based on a previous response, it may have to combine parts of a new - response with what is held in the cache entry. - - - - - - - -Fielding, et. al. Standards Track [Page 87] - -RFC 2068 HTTP/1.1 January 1997 - - -13.5.1 End-to-end and Hop-by-hop Headers - - For the purpose of defining the behavior of caches and non-caching - proxies, we divide HTTP headers into two categories: - - o End-to-end headers, which must be transmitted to the - ultimate recipient of a request or response. End-to-end - headers in responses must be stored as part of a cache entry - and transmitted in any response formed from a cache entry. - o Hop-by-hop headers, which are meaningful only for a single - transport-level connection, and are not stored by caches or - forwarded by proxies. - - The following HTTP/1.1 headers are hop-by-hop headers: - - o Connection - o Keep-Alive - o Public - o Proxy-Authenticate - o Transfer-Encoding - o Upgrade - - All other headers defined by HTTP/1.1 are end-to-end headers. - - Hop-by-hop headers introduced in future versions of HTTP MUST be - listed in a Connection header, as described in section 14.10. - -13.5.2 Non-modifiable Headers - - Some features of the HTTP/1.1 protocol, such as Digest - Authentication, depend on the value of certain end-to-end headers. A - cache or non-caching proxy SHOULD NOT modify an end-to-end header - unless the definition of that header requires or specifically allows - that. - - A cache or non-caching proxy MUST NOT modify any of the following - fields in a request or response, nor may it add any of these fields - if not already present: - - o Content-Location - o ETag - o Expires - o Last-Modified - - - - - - - - -Fielding, et. al. Standards Track [Page 88] - -RFC 2068 HTTP/1.1 January 1997 - - - A cache or non-caching proxy MUST NOT modify or add any of the - following fields in a response that contains the no-transform Cache- - Control directive, or in any request: - - o Content-Encoding - o Content-Length - o Content-Range - o Content-Type - - A cache or non-caching proxy MAY modify or add these fields in a - response that does not include no-transform, but if it does so, it - MUST add a Warning 14 (Transformation applied) if one does not - already appear in the response. - - Warning: unnecessary modification of end-to-end headers may cause - authentication failures if stronger authentication mechanisms are - introduced in later versions of HTTP. Such authentication - mechanisms may rely on the values of header fields not listed here. - -13.5.3 Combining Headers - - When a cache makes a validating request to a server, and the server - provides a 304 (Not Modified) response, the cache must construct a - response to send to the requesting client. The cache uses the - entity-body stored in the cache entry as the entity-body of this - outgoing response. The end-to-end headers stored in the cache entry - are used for the constructed response, except that any end-to-end - headers provided in the 304 response MUST replace the corresponding - headers from the cache entry. Unless the cache decides to remove the - cache entry, it MUST also replace the end-to-end headers stored with - the cache entry with corresponding headers received in the incoming - response. - - In other words, the set of end-to-end headers received in the - incoming response overrides all corresponding end-to-end headers - stored with the cache entry. The cache may add Warning headers (see - section 14.45) to this set. - - If a header field-name in the incoming response matches more than one - header in the cache entry, all such old headers are replaced. - - Note: this rule allows an origin server to use a 304 (Not Modified) - response to update any header associated with a previous response - for the same entity, although it might not always be meaningful or - correct to do so. This rule does not allow an origin server to use - a 304 (not Modified) response to entirely delete a header that it - had provided with a previous response. - - - - -Fielding, et. al. Standards Track [Page 89] - -RFC 2068 HTTP/1.1 January 1997 - - -13.5.4 Combining Byte Ranges - - A response may transfer only a subrange of the bytes of an entity- - body, either because the request included one or more Range - specifications, or because a connection was broken prematurely. After - several such transfers, a cache may have received several ranges of - the same entity-body. - - If a cache has a stored non-empty set of subranges for an entity, and - an incoming response transfers another subrange, the cache MAY - combine the new subrange with the existing set if both the following - conditions are met: - - o Both the incoming response and the cache entry must have a cache - validator. - o The two cache validators must match using the strong comparison - function (see section 13.3.3). - - If either requirement is not meant, the cache must use only the most - recent partial response (based on the Date values transmitted with - every response, and using the incoming response if these values are - equal or missing), and must discard the other partial information. - -13.6 Caching Negotiated Responses - - Use of server-driven content negotiation (section 12), as indicated - by the presence of a Vary header field in a response, alters the - conditions and procedure by which a cache can use the response for - subsequent requests. - - A server MUST use the Vary header field (section 14.43) to inform a - cache of what header field dimensions are used to select among - multiple representations of a cachable response. A cache may use the - selected representation (the entity included with that particular - response) for replying to subsequent requests on that resource only - when the subsequent requests have the same or equivalent values for - all header fields specified in the Vary response-header. Requests - with a different value for one or more of those header fields would - be forwarded toward the origin server. - - If an entity tag was assigned to the representation, the forwarded - request SHOULD be conditional and include the entity tags in an If- - None-Match header field from all its cache entries for the Request- - URI. This conveys to the server the set of entities currently held by - the cache, so that if any one of these entities matches the requested - entity, the server can use the ETag header in its 304 (Not Modified) - response to tell the cache which entry is appropriate. If the - entity-tag of the new response matches that of an existing entry, the - - - -Fielding, et. al. Standards Track [Page 90] - -RFC 2068 HTTP/1.1 January 1997 - - - new response SHOULD be used to update the header fields of the - existing entry, and the result MUST be returned to the client. - - The Vary header field may also inform the cache that the - representation was selected using criteria not limited to the - request-headers; in this case, a cache MUST NOT use the response in a - reply to a subsequent request unless the cache relays the new request - to the origin server in a conditional request and the server responds - with 304 (Not Modified), including an entity tag or Content-Location - that indicates which entity should be used. - - If any of the existing cache entries contains only partial content - for the associated entity, its entity-tag SHOULD NOT be included in - the If-None-Match header unless the request is for a range that would - be fully satisfied by that entry. - - If a cache receives a successful response whose Content-Location - field matches that of an existing cache entry for the same Request- - URI, whose entity-tag differs from that of the existing entry, and - whose Date is more recent than that of the existing entry, the - existing entry SHOULD NOT be returned in response to future requests, - and should be deleted from the cache. - -13.7 Shared and Non-Shared Caches - - For reasons of security and privacy, it is necessary to make a - distinction between "shared" and "non-shared" caches. A non-shared - cache is one that is accessible only to a single user. Accessibility - in this case SHOULD be enforced by appropriate security mechanisms. - All other caches are considered to be "shared." Other sections of - this specification place certain constraints on the operation of - shared caches in order to prevent loss of privacy or failure of - access controls. - -13.8 Errors or Incomplete Response Cache Behavior - - A cache that receives an incomplete response (for example, with fewer - bytes of data than specified in a Content-Length header) may store - the response. However, the cache MUST treat this as a partial - response. Partial responses may be combined as described in section - 13.5.4; the result might be a full response or might still be - partial. A cache MUST NOT return a partial response to a client - without explicitly marking it as such, using the 206 (Partial - Content) status code. A cache MUST NOT return a partial response - using a status code of 200 (OK). - - If a cache receives a 5xx response while attempting to revalidate an - entry, it may either forward this response to the requesting client, - - - -Fielding, et. al. Standards Track [Page 91] - -RFC 2068 HTTP/1.1 January 1997 - - - or act as if the server failed to respond. In the latter case, it MAY - return a previously received response unless the cached entry - includes the "must-revalidate" Cache-Control directive (see section - 14.9). - -13.9 Side Effects of GET and HEAD - - Unless the origin server explicitly prohibits the caching of their - responses, the application of GET and HEAD methods to any resources - SHOULD NOT have side effects that would lead to erroneous behavior if - these responses are taken from a cache. They may still have side - effects, but a cache is not required to consider such side effects in - its caching decisions. Caches are always expected to observe an - origin server's explicit restrictions on caching. - - We note one exception to this rule: since some applications have - traditionally used GETs and HEADs with query URLs (those containing a - "?" in the rel_path part) to perform operations with significant side - effects, caches MUST NOT treat responses to such URLs as fresh unless - the server provides an explicit expiration time. This specifically - means that responses from HTTP/1.0 servers for such URIs should not - be taken from a cache. See section 9.1.1 for related information. - -13.10 Invalidation After Updates or Deletions - - The effect of certain methods at the origin server may cause one or - more existing cache entries to become non-transparently invalid. That - is, although they may continue to be "fresh," they do not accurately - reflect what the origin server would return for a new request. - - There is no way for the HTTP protocol to guarantee that all such - cache entries are marked invalid. For example, the request that - caused the change at the origin server may not have gone through the - proxy where a cache entry is stored. However, several rules help - reduce the likelihood of erroneous behavior. - - In this section, the phrase "invalidate an entity" means that the - cache should either remove all instances of that entity from its - storage, or should mark these as "invalid" and in need of a mandatory - revalidation before they can be returned in response to a subsequent - request. - - - - - - - - - - -Fielding, et. al. Standards Track [Page 92] - -RFC 2068 HTTP/1.1 January 1997 - - - Some HTTP methods may invalidate an entity. This is either the entity - referred to by the Request-URI, or by the Location or Content- - Location response-headers (if present). These methods are: - - o PUT - o DELETE - o POST - - In order to prevent denial of service attacks, an invalidation based - on the URI in a Location or Content-Location header MUST only be - performed if the host part is the same as in the Request-URI. - -13.11 Write-Through Mandatory - - All methods that may be expected to cause modifications to the origin - server's resources MUST be written through to the origin server. This - currently includes all methods except for GET and HEAD. A cache MUST - NOT reply to such a request from a client before having transmitted - the request to the inbound server, and having received a - corresponding response from the inbound server. This does not prevent - a cache from sending a 100 (Continue) response before the inbound - server has replied. - - The alternative (known as "write-back" or "copy-back" caching) is not - allowed in HTTP/1.1, due to the difficulty of providing consistent - updates and the problems arising from server, cache, or network - failure prior to write-back. - -13.12 Cache Replacement - - If a new cachable (see sections 14.9.2, 13.2.5, 13.2.6 and 13.8) - response is received from a resource while any existing responses for - the same resource are cached, the cache SHOULD use the new response - to reply to the current request. It may insert it into cache storage - and may, if it meets all other requirements, use it to respond to any - future requests that would previously have caused the old response to - be returned. If it inserts the new response into cache storage it - should follow the rules in section 13.5.3. - - Note: a new response that has an older Date header value than - existing cached responses is not cachable. - -13.13 History Lists - - User agents often have history mechanisms, such as "Back" buttons and - history lists, which can be used to redisplay an entity retrieved - earlier in a session. - - - - -Fielding, et. al. Standards Track [Page 93] - -RFC 2068 HTTP/1.1 January 1997 - - - History mechanisms and caches are different. In particular history - mechanisms SHOULD NOT try to show a semantically transparent view of - the current state of a resource. Rather, a history mechanism is meant - to show exactly what the user saw at the time when the resource was - retrieved. - - By default, an expiration time does not apply to history mechanisms. - If the entity is still in storage, a history mechanism should display - it even if the entity has expired, unless the user has specifically - configured the agent to refresh expired history documents. - - This should not be construed to prohibit the history mechanism from - telling the user that a view may be stale. - - Note: if history list mechanisms unnecessarily prevent users from - viewing stale resources, this will tend to force service authors to - avoid using HTTP expiration controls and cache controls when they - would otherwise like to. Service authors may consider it important - that users not be presented with error messages or warning messages - when they use navigation controls (such as BACK) to view previously - fetched resources. Even though sometimes such resources ought not - to cached, or ought to expire quickly, user interface - considerations may force service authors to resort to other means - of preventing caching (e.g. "once-only" URLs) in order not to - suffer the effects of improperly functioning history mechanisms. - -14 Header Field Definitions - - This section defines the syntax and semantics of all standard - HTTP/1.1 header fields. For entity-header fields, both sender and - recipient refer to either the client or the server, depending on who - sends and who receives the entity. - - - - - - - - - - - - - - - - - - - -Fielding, et. al. Standards Track [Page 94] - -RFC 2068 HTTP/1.1 January 1997 - - -14.1 Accept - - The Accept request-header field can be used to specify certain media - types which are acceptable for the response. Accept headers can be - used to indicate that the request is specifically limited to a small - set of desired types, as in the case of a request for an in-line - image. - - Accept = "Accept" ":" - #( media-range [ accept-params ] ) - - media-range = ( "*/*" - | ( type "/" "*" ) - | ( type "/" subtype ) - ) *( ";" parameter ) - - accept-params = ";" "q" "=" qvalue *( accept-extension ) - - accept-extension = ";" token [ "=" ( token | quoted-string ) ] - - The asterisk "*" character is used to group media types into ranges, - with "*/*" indicating all media types and "type/*" indicating all - subtypes of that type. The media-range MAY include media type - parameters that are applicable to that range. - - Each media-range MAY be followed by one or more accept-params, - beginning with the "q" parameter for indicating a relative quality - factor. The first "q" parameter (if any) separates the media-range - parameter(s) from the accept-params. Quality factors allow the user - or user agent to indicate the relative degree of preference for that - media-range, using the qvalue scale from 0 to 1 (section 3.9). The - default value is q=1. - - Note: Use of the "q" parameter name to separate media type - parameters from Accept extension parameters is due to historical - practice. Although this prevents any media type parameter named - "q" from being used with a media range, such an event is believed - to be unlikely given the lack of any "q" parameters in the IANA - media type registry and the rare usage of any media type parameters - in Accept. Future media types should be discouraged from - registering any parameter named "q". - - The example - - Accept: audio/*; q=0.2, audio/basic - - SHOULD be interpreted as "I prefer audio/basic, but send me any audio - type if it is the best available after an 80% mark-down in quality." - - - -Fielding, et. al. Standards Track [Page 95] - -RFC 2068 HTTP/1.1 January 1997 - - - If no Accept header field is present, then it is assumed that the - client accepts all media types. If an Accept header field is present, - and if the server cannot send a response which is acceptable - according to the combined Accept field value, then the server SHOULD - send a 406 (not acceptable) response. - - A more elaborate example is - - Accept: text/plain; q=0.5, text/html, - text/x-dvi; q=0.8, text/x-c - - Verbally, this would be interpreted as "text/html and text/x-c are - the preferred media types, but if they do not exist, then send the - text/x-dvi entity, and if that does not exist, send the text/plain - entity." - - Media ranges can be overridden by more specific media ranges or - specific media types. If more than one media range applies to a given - type, the most specific reference has precedence. For example, - - Accept: text/*, text/html, text/html;level=1, */* - - have the following precedence: - - 1) text/html;level=1 - 2) text/html - 3) text/* - 4) */* - - The media type quality factor associated with a given type is - determined by finding the media range with the highest precedence - which matches that type. For example, - - Accept: text/*;q=0.3, text/html;q=0.7, text/html;level=1, - text/html;level=2;q=0.4, */*;q=0.5 - - would cause the following values to be associated: - - text/html;level=1 = 1 - text/html = 0.7 - text/plain = 0.3 - image/jpeg = 0.5 - text/html;level=2 = 0.4 - text/html;level=3 = 0.7 - - Note: A user agent may be provided with a default set of quality - values for certain media ranges. However, unless the user agent is - a closed system which cannot interact with other rendering agents, - - - -Fielding, et. al. Standards Track [Page 96] - -RFC 2068 HTTP/1.1 January 1997 - - - this default set should be configurable by the user. - -14.2 Accept-Charset - - The Accept-Charset request-header field can be used to indicate what - character sets are acceptable for the response. This field allows - clients capable of understanding more comprehensive or special- - purpose character sets to signal that capability to a server which is - capable of representing documents in those character sets. The ISO- - 8859-1 character set can be assumed to be acceptable to all user - agents. - - Accept-Charset = "Accept-Charset" ":" - 1#( charset [ ";" "q" "=" qvalue ] ) - - Character set values are described in section 3.4. Each charset may - be given an associated quality value which represents the user's - preference for that charset. The default value is q=1. An example is - - Accept-Charset: iso-8859-5, unicode-1-1;q=0.8 - - If no Accept-Charset header is present, the default is that any - character set is acceptable. If an Accept-Charset header is present, - and if the server cannot send a response which is acceptable - according to the Accept-Charset header, then the server SHOULD send - an error response with the 406 (not acceptable) status code, though - the sending of an unacceptable response is also allowed. - -14.3 Accept-Encoding - - The Accept-Encoding request-header field is similar to Accept, but - restricts the content-coding values (section 14.12) which are - acceptable in the response. - - Accept-Encoding = "Accept-Encoding" ":" - #( content-coding ) - - An example of its use is - - Accept-Encoding: compress, gzip - - If no Accept-Encoding header is present in a request, the server MAY - assume that the client will accept any content coding. If an Accept- - Encoding header is present, and if the server cannot send a response - which is acceptable according to the Accept-Encoding header, then the - server SHOULD send an error response with the 406 (Not Acceptable) - status code. - - - - -Fielding, et. al. Standards Track [Page 97] - -RFC 2068 HTTP/1.1 January 1997 - - - An empty Accept-Encoding value indicates none are acceptable. - -14.4 Accept-Language - - The Accept-Language request-header field is similar to Accept, but - restricts the set of natural languages that are preferred as a - response to the request. - - Accept-Language = "Accept-Language" ":" - 1#( language-range [ ";" "q" "=" qvalue ] ) - - language-range = ( ( 1*8ALPHA *( "-" 1*8ALPHA ) ) | "*" ) - - Each language-range MAY be given an associated quality value which - represents an estimate of the user's preference for the languages - specified by that range. The quality value defaults to "q=1". For - example, - - Accept-Language: da, en-gb;q=0.8, en;q=0.7 - - would mean: "I prefer Danish, but will accept British English and - other types of English." A language-range matches a language-tag if - it exactly equals the tag, or if it exactly equals a prefix of the - tag such that the first tag character following the prefix is "-". - The special range "*", if present in the Accept-Language field, - matches every tag not matched by any other range present in the - Accept-Language field. - - Note: This use of a prefix matching rule does not imply that - language tags are assigned to languages in such a way that it is - always true that if a user understands a language with a certain - tag, then this user will also understand all languages with tags - for which this tag is a prefix. The prefix rule simply allows the - use of prefix tags if this is the case. - - The language quality factor assigned to a language-tag by the - Accept-Language field is the quality value of the longest language- - range in the field that matches the language-tag. If no language- - range in the field matches the tag, the language quality factor - assigned is 0. If no Accept-Language header is present in the - request, the server SHOULD assume that all languages are equally - acceptable. If an Accept-Language header is present, then all - languages which are assigned a quality factor greater than 0 are - acceptable. - - It may be contrary to the privacy expectations of the user to send an - Accept-Language header with the complete linguistic preferences of - the user in every request. For a discussion of this issue, see - - - -Fielding, et. al. Standards Track [Page 98] - -RFC 2068 HTTP/1.1 January 1997 - - - section 15.7. - - Note: As intelligibility is highly dependent on the individual - user, it is recommended that client applications make the choice of - linguistic preference available to the user. If the choice is not - made available, then the Accept-Language header field must not be - given in the request. - -14.5 Accept-Ranges - - The Accept-Ranges response-header field allows the server to indicate - its acceptance of range requests for a resource: - - Accept-Ranges = "Accept-Ranges" ":" acceptable-ranges - - acceptable-ranges = 1#range-unit | "none" - - Origin servers that accept byte-range requests MAY send - - Accept-Ranges: bytes - - but are not required to do so. Clients MAY generate byte-range - requests without having received this header for the resource - involved. - - Servers that do not accept any kind of range request for a resource - MAY send - - Accept-Ranges: none - - to advise the client not to attempt a range request. - -14.6 Age - - The Age response-header field conveys the sender's estimate of the - amount of time since the response (or its revalidation) was generated - at the origin server. A cached response is "fresh" if its age does - not exceed its freshness lifetime. Age values are calculated as - specified in section 13.2.3. - - Age = "Age" ":" age-value - - age-value = delta-seconds - - Age values are non-negative decimal integers, representing time in - seconds. - - - - - -Fielding, et. al. Standards Track [Page 99] - -RFC 2068 HTTP/1.1 January 1997 - - - If a cache receives a value larger than the largest positive integer - it can represent, or if any of its age calculations overflows, it - MUST transmit an Age header with a value of 2147483648 (2^31). - HTTP/1.1 caches MUST send an Age header in every response. Caches - SHOULD use an arithmetic type of at least 31 bits of range. - -14.7 Allow - - The Allow entity-header field lists the set of methods supported by - the resource identified by the Request-URI. The purpose of this field - is strictly to inform the recipient of valid methods associated with - the resource. An Allow header field MUST be present in a 405 (Method - Not Allowed) response. - - Allow = "Allow" ":" 1#method - - Example of use: - - Allow: GET, HEAD, PUT - - This field cannot prevent a client from trying other methods. - However, the indications given by the Allow header field value SHOULD - be followed. The actual set of allowed methods is defined by the - origin server at the time of each request. - - The Allow header field MAY be provided with a PUT request to - recommend the methods to be supported by the new or modified - resource. The server is not required to support these methods and - SHOULD include an Allow header in the response giving the actual - supported methods. - - A proxy MUST NOT modify the Allow header field even if it does not - understand all the methods specified, since the user agent MAY have - other means of communicating with the origin server. - - The Allow header field does not indicate what methods are implemented - at the server level. Servers MAY use the Public response-header field - (section 14.35) to describe what methods are implemented on the - server as a whole. - -14.8 Authorization - - A user agent that wishes to authenticate itself with a server-- - usually, but not necessarily, after receiving a 401 response--MAY do - so by including an Authorization request-header field with the - request. The Authorization field value consists of credentials - containing the authentication information of the user agent for the - realm of the resource being requested. - - - -Fielding, et. al. Standards Track [Page 100] - -RFC 2068 HTTP/1.1 January 1997 - - - Authorization = "Authorization" ":" credentials - - HTTP access authentication is described in section 11. If a request - is authenticated and a realm specified, the same credentials SHOULD - be valid for all other requests within this realm. - - When a shared cache (see section 13.7) receives a request containing - an Authorization field, it MUST NOT return the corresponding response - as a reply to any other request, unless one of the following specific - exceptions holds: - - 1. If the response includes the "proxy-revalidate" Cache-Control - directive, the cache MAY use that response in replying to a - subsequent request, but a proxy cache MUST first revalidate it with - the origin server, using the request-headers from the new request - to allow the origin server to authenticate the new request. - 2. If the response includes the "must-revalidate" Cache-Control - directive, the cache MAY use that response in replying to a - subsequent request, but all caches MUST first revalidate it with - the origin server, using the request-headers from the new request - to allow the origin server to authenticate the new request. - 3. If the response includes the "public" Cache-Control directive, it - may be returned in reply to any subsequent request. - -14.9 Cache-Control - - The Cache-Control general-header field is used to specify directives - that MUST be obeyed by all caching mechanisms along the - request/response chain. The directives specify behavior intended to - prevent caches from adversely interfering with the request or - response. These directives typically override the default caching - algorithms. Cache directives are unidirectional in that the presence - of a directive in a request does not imply that the same directive - should be given in the response. - - Note that HTTP/1.0 caches may not implement Cache-Control and may - only implement Pragma: no-cache (see section 14.32). - - Cache directives must be passed through by a proxy or gateway - application, regardless of their significance to that application, - since the directives may be applicable to all recipients along the - request/response chain. It is not possible to specify a cache- - directive for a specific cache. - - Cache-Control = "Cache-Control" ":" 1#cache-directive - - cache-directive = cache-request-directive - | cache-response-directive - - - -Fielding, et. al. Standards Track [Page 101] - -RFC 2068 HTTP/1.1 January 1997 - - - cache-request-directive = - "no-cache" [ "=" <"> 1#field-name <"> ] - | "no-store" - | "max-age" "=" delta-seconds - | "max-stale" [ "=" delta-seconds ] - | "min-fresh" "=" delta-seconds - | "only-if-cached" - | cache-extension - - cache-response-directive = - "public" - | "private" [ "=" <"> 1#field-name <"> ] - | "no-cache" [ "=" <"> 1#field-name <"> ] - | "no-store" - | "no-transform" - | "must-revalidate" - | "proxy-revalidate" - | "max-age" "=" delta-seconds - | cache-extension - - cache-extension = token [ "=" ( token | quoted-string ) ] - - When a directive appears without any 1#field-name parameter, the - directive applies to the entire request or response. When such a - directive appears with a 1#field-name parameter, it applies only to - the named field or fields, and not to the rest of the request or - response. This mechanism supports extensibility; implementations of - future versions of the HTTP protocol may apply these directives to - header fields not defined in HTTP/1.1. - - The cache-control directives can be broken down into these general - categories: - - o Restrictions on what is cachable; these may only be imposed by the - origin server. - o Restrictions on what may be stored by a cache; these may be imposed - by either the origin server or the user agent. - o Modifications of the basic expiration mechanism; these may be - imposed by either the origin server or the user agent. - o Controls over cache revalidation and reload; these may only be - imposed by a user agent. - o Control over transformation of entities. - o Extensions to the caching system. - - - - - - - - -Fielding, et. al. Standards Track [Page 102] - -RFC 2068 HTTP/1.1 January 1997 - - -14.9.1 What is Cachable - - By default, a response is cachable if the requirements of the request - method, request header fields, and the response status indicate that - it is cachable. Section 13.4 summarizes these defaults for - cachability. The following Cache-Control response directives allow an - origin server to override the default cachability of a response: - -public - Indicates that the response is cachable by any cache, even if it - would normally be non-cachable or cachable only within a non-shared - cache. (See also Authorization, section 14.8, for additional - details.) - -private - Indicates that all or part of the response message is intended for a - single user and MUST NOT be cached by a shared cache. This allows an - origin server to state that the specified parts of the response are - intended for only one user and are not a valid response for requests - by other users. A private (non-shared) cache may cache the response. - - Note: This usage of the word private only controls where the - response may be cached, and cannot ensure the privacy of the - message content. - -no-cache - Indicates that all or part of the response message MUST NOT be cached - anywhere. This allows an origin server to prevent caching even by - caches that have been configured to return stale responses to client - requests. - - Note: Most HTTP/1.0 caches will not recognize or obey this - directive. - -14.9.2 What May be Stored by Caches - - The purpose of the no-store directive is to prevent the inadvertent - release or retention of sensitive information (for example, on backup - tapes). The no-store directive applies to the entire message, and may - be sent either in a response or in a request. If sent in a request, a - cache MUST NOT store any part of either this request or any response - to it. If sent in a response, a cache MUST NOT store any part of - either this response or the request that elicited it. This directive - applies to both non-shared and shared caches. "MUST NOT store" in - this context means that the cache MUST NOT intentionally store the - information in non-volatile storage, and MUST make a best-effort - attempt to remove the information from volatile storage as promptly - as possible after forwarding it. - - - -Fielding, et. al. Standards Track [Page 103] - -RFC 2068 HTTP/1.1 January 1997 - - - Even when this directive is associated with a response, users may - explicitly store such a response outside of the caching system (e.g., - with a "Save As" dialog). History buffers may store such responses as - part of their normal operation. - - The purpose of this directive is to meet the stated requirements of - certain users and service authors who are concerned about accidental - releases of information via unanticipated accesses to cache data - structures. While the use of this directive may improve privacy in - some cases, we caution that it is NOT in any way a reliable or - sufficient mechanism for ensuring privacy. In particular, malicious - or compromised caches may not recognize or obey this directive; and - communications networks may be vulnerable to eavesdropping. - -14.9.3 Modifications of the Basic Expiration Mechanism - - The expiration time of an entity may be specified by the origin - server using the Expires header (see section 14.21). Alternatively, - it may be specified using the max-age directive in a response. - - If a response includes both an Expires header and a max-age - directive, the max-age directive overrides the Expires header, even - if the Expires header is more restrictive. This rule allows an origin - server to provide, for a given response, a longer expiration time to - an HTTP/1.1 (or later) cache than to an HTTP/1.0 cache. This may be - useful if certain HTTP/1.0 caches improperly calculate ages or - expiration times, perhaps due to desynchronized clocks. - - Note: most older caches, not compliant with this specification, do - not implement any Cache-Control directives. An origin server - wishing to use a Cache-Control directive that restricts, but does - not prevent, caching by an HTTP/1.1-compliant cache may exploit the - requirement that the max-age directive overrides the Expires - header, and the fact that non-HTTP/1.1-compliant caches do not - observe the max-age directive. - - Other directives allow an user agent to modify the basic expiration - mechanism. These directives may be specified on a request: - - max-age - Indicates that the client is willing to accept a response whose age - is no greater than the specified time in seconds. Unless max-stale - directive is also included, the client is not willing to accept a - stale response. - - min-fresh - Indicates that the client is willing to accept a response whose - freshness lifetime is no less than its current age plus the - - - -Fielding, et. al. Standards Track [Page 104] - -RFC 2068 HTTP/1.1 January 1997 - - - specified time in seconds. That is, the client wants a response - that will still be fresh for at least the specified number of - seconds. - - max-stale - Indicates that the client is willing to accept a response that has - exceeded its expiration time. If max-stale is assigned a value, - then the client is willing to accept a response that has exceeded - its expiration time by no more than the specified number of - seconds. If no value is assigned to max-stale, then the client is - willing to accept a stale response of any age. - - If a cache returns a stale response, either because of a max-stale - directive on a request, or because the cache is configured to - override the expiration time of a response, the cache MUST attach a - Warning header to the stale response, using Warning 10 (Response is - stale). - -14.9.4 Cache Revalidation and Reload Controls - - Sometimes an user agent may want or need to insist that a cache - revalidate its cache entry with the origin server (and not just with - the next cache along the path to the origin server), or to reload its - cache entry from the origin server. End-to-end revalidation may be - necessary if either the cache or the origin server has overestimated - the expiration time of the cached response. End-to-end reload may be - necessary if the cache entry has become corrupted for some reason. - - End-to-end revalidation may be requested either when the client does - not have its own local cached copy, in which case we call it - "unspecified end-to-end revalidation", or when the client does have a - local cached copy, in which case we call it "specific end-to-end - revalidation." - - The client can specify these three kinds of action using Cache- - Control request directives: - - End-to-end reload - The request includes a "no-cache" Cache-Control directive or, for - compatibility with HTTP/1.0 clients, "Pragma: no-cache". No field - names may be included with the no-cache directive in a request. The - server MUST NOT use a cached copy when responding to such a - request. - - Specific end-to-end revalidation - The request includes a "max-age=0" Cache-Control directive, which - forces each cache along the path to the origin server to revalidate - its own entry, if any, with the next cache or server. The initial - - - -Fielding, et. al. Standards Track [Page 105] - -RFC 2068 HTTP/1.1 January 1997 - - - request includes a cache-validating conditional with the client's - current validator. - - Unspecified end-to-end revalidation - The request includes "max-age=0" Cache-Control directive, which - forces each cache along the path to the origin server to revalidate - its own entry, if any, with the next cache or server. The initial - request does not include a cache-validating conditional; the first - cache along the path (if any) that holds a cache entry for this - resource includes a cache-validating conditional with its current - validator. - - When an intermediate cache is forced, by means of a max-age=0 - directive, to revalidate its own cache entry, and the client has - supplied its own validator in the request, the supplied validator may - differ from the validator currently stored with the cache entry. In - this case, the cache may use either validator in making its own - request without affecting semantic transparency. - - However, the choice of validator may affect performance. The best - approach is for the intermediate cache to use its own validator when - making its request. If the server replies with 304 (Not Modified), - then the cache should return its now validated copy to the client - with a 200 (OK) response. If the server replies with a new entity and - cache validator, however, the intermediate cache should compare the - returned validator with the one provided in the client's request, - using the strong comparison function. If the client's validator is - equal to the origin server's, then the intermediate cache simply - returns 304 (Not Modified). Otherwise, it returns the new entity with - a 200 (OK) response. - - If a request includes the no-cache directive, it should not include - min-fresh, max-stale, or max-age. - - In some cases, such as times of extremely poor network connectivity, - a client may want a cache to return only those responses that it - currently has stored, and not to reload or revalidate with the origin - server. To do this, the client may include the only-if-cached - directive in a request. If it receives this directive, a cache SHOULD - either respond using a cached entry that is consistent with the other - constraints of the request, or respond with a 504 (Gateway Timeout) - status. However, if a group of caches is being operated as a unified - system with good internal connectivity, such a request MAY be - forwarded within that group of caches. - - Because a cache may be configured to ignore a server's specified - expiration time, and because a client request may include a max-stale - directive (which has a similar effect), the protocol also includes a - - - -Fielding, et. al. Standards Track [Page 106] - -RFC 2068 HTTP/1.1 January 1997 - - - mechanism for the origin server to require revalidation of a cache - entry on any subsequent use. When the must-revalidate directive is - present in a response received by a cache, that cache MUST NOT use - the entry after it becomes stale to respond to a subsequent request - without first revalidating it with the origin server. (I.e., the - cache must do an end-to-end revalidation every time, if, based solely - on the origin server's Expires or max-age value, the cached response - is stale.) - - The must-revalidate directive is necessary to support reliable - operation for certain protocol features. In all circumstances an - HTTP/1.1 cache MUST obey the must-revalidate directive; in - particular, if the cache cannot reach the origin server for any - reason, it MUST generate a 504 (Gateway Timeout) response. - - Servers should send the must-revalidate directive if and only if - failure to revalidate a request on the entity could result in - incorrect operation, such as a silently unexecuted financial - transaction. Recipients MUST NOT take any automated action that - violates this directive, and MUST NOT automatically provide an - unvalidated copy of the entity if revalidation fails. - - Although this is not recommended, user agents operating under severe - connectivity constraints may violate this directive but, if so, MUST - explicitly warn the user that an unvalidated response has been - provided. The warning MUST be provided on each unvalidated access, - and SHOULD require explicit user confirmation. - - The proxy-revalidate directive has the same meaning as the must- - revalidate directive, except that it does not apply to non-shared - user agent caches. It can be used on a response to an authenticated - request to permit the user's cache to store and later return the - response without needing to revalidate it (since it has already been - authenticated once by that user), while still requiring proxies that - service many users to revalidate each time (in order to make sure - that each user has been authenticated). Note that such authenticated - responses also need the public cache control directive in order to - allow them to be cached at all. - -14.9.5 No-Transform Directive - - Implementers of intermediate caches (proxies) have found it useful to - convert the media type of certain entity bodies. A proxy might, for - example, convert between image formats in order to save cache space - or to reduce the amount of traffic on a slow link. HTTP has to date - been silent on these transformations. - - - - - -Fielding, et. al. Standards Track [Page 107] - -RFC 2068 HTTP/1.1 January 1997 - - - Serious operational problems have already occurred, however, when - these transformations have been applied to entity bodies intended for - certain kinds of applications. For example, applications for medical - imaging, scientific data analysis and those using end-to-end - authentication, all depend on receiving an entity body that is bit - for bit identical to the original entity-body. - - Therefore, if a response includes the no-transform directive, an - intermediate cache or proxy MUST NOT change those headers that are - listed in section 13.5.2 as being subject to the no-transform - directive. This implies that the cache or proxy must not change any - aspect of the entity-body that is specified by these headers. - -14.9.6 Cache Control Extensions - - The Cache-Control header field can be extended through the use of one - or more cache-extension tokens, each with an optional assigned value. - Informational extensions (those which do not require a change in - cache behavior) may be added without changing the semantics of other - directives. Behavioral extensions are designed to work by acting as - modifiers to the existing base of cache directives. Both the new - directive and the standard directive are supplied, such that - applications which do not understand the new directive will default - to the behavior specified by the standard directive, and those that - understand the new directive will recognize it as modifying the - requirements associated with the standard directive. In this way, - extensions to the Cache-Control directives can be made without - requiring changes to the base protocol. - - This extension mechanism depends on a HTTP cache obeying all of the - cache-control directives defined for its native HTTP-version, obeying - certain extensions, and ignoring all directives that it does not - understand. - - For example, consider a hypothetical new response directive called - "community" which acts as a modifier to the "private" directive. We - define this new directive to mean that, in addition to any non-shared - cache, any cache which is shared only by members of the community - named within its value may cache the response. An origin server - wishing to allow the "UCI" community to use an otherwise private - response in their shared cache(s) may do so by including - - Cache-Control: private, community="UCI" - - A cache seeing this header field will act correctly even if the cache - does not understand the "community" cache-extension, since it will - also see and understand the "private" directive and thus default to - the safe behavior. - - - -Fielding, et. al. Standards Track [Page 108] - -RFC 2068 HTTP/1.1 January 1997 - - - Unrecognized cache-directives MUST be ignored; it is assumed that any - cache-directive likely to be unrecognized by an HTTP/1.1 cache will - be combined with standard directives (or the response's default - cachability) such that the cache behavior will remain minimally - correct even if the cache does not understand the extension(s). - -14.10 Connection - - The Connection general-header field allows the sender to specify - options that are desired for that particular connection and MUST NOT - be communicated by proxies over further connections. - - The Connection header has the following grammar: - - Connection-header = "Connection" ":" 1#(connection-token) - connection-token = token - - HTTP/1.1 proxies MUST parse the Connection header field before a - message is forwarded and, for each connection-token in this field, - remove any header field(s) from the message with the same name as the - connection-token. Connection options are signaled by the presence of - a connection-token in the Connection header field, not by any - corresponding additional header field(s), since the additional header - field may not be sent if there are no parameters associated with that - connection option. HTTP/1.1 defines the "close" connection option - for the sender to signal that the connection will be closed after - completion of the response. For example, - - Connection: close - - in either the request or the response header fields indicates that - the connection should not be considered `persistent' (section 8.1) - after the current request/response is complete. - - HTTP/1.1 applications that do not support persistent connections MUST - include the "close" connection option in every message. - -14.11 Content-Base - - The Content-Base entity-header field may be used to specify the base - URI for resolving relative URLs within the entity. This header field - is described as Base in RFC 1808, which is expected to be revised. - - Content-Base = "Content-Base" ":" absoluteURI - - If no Content-Base field is present, the base URI of an entity is - defined either by its Content-Location (if that Content-Location URI - is an absolute URI) or the URI used to initiate the request, in that - - - -Fielding, et. al. Standards Track [Page 109] - -RFC 2068 HTTP/1.1 January 1997 - - - order of precedence. Note, however, that the base URI of the contents - within the entity-body may be redefined within that entity-body. - -14.12 Content-Encoding - - The Content-Encoding entity-header field is used as a modifier to the - media-type. When present, its value indicates what additional content - codings have been applied to the entity-body, and thus what decoding - mechanisms MUST be applied in order to obtain the media-type - referenced by the Content-Type header field. Content-Encoding is - primarily used to allow a document to be compressed without losing - the identity of its underlying media type. - - Content-Encoding = "Content-Encoding" ":" 1#content-coding - - Content codings are defined in section 3.5. An example of its use is - - Content-Encoding: gzip - - The Content-Encoding is a characteristic of the entity identified by - the Request-URI. Typically, the entity-body is stored with this - encoding and is only decoded before rendering or analogous usage. - - If multiple encodings have been applied to an entity, the content - codings MUST be listed in the order in which they were applied. - - Additional information about the encoding parameters MAY be provided - by other entity-header fields not defined by this specification. - -14.13 Content-Language - - The Content-Language entity-header field describes the natural - language(s) of the intended audience for the enclosed entity. Note - that this may not be equivalent to all the languages used within the - entity-body. - - Content-Language = "Content-Language" ":" 1#language-tag - - Language tags are defined in section 3.10. The primary purpose of - Content-Language is to allow a user to identify and differentiate - entities according to the user's own preferred language. Thus, if the - body content is intended only for a Danish-literate audience, the - appropriate field is - - Content-Language: da - - If no Content-Language is specified, the default is that the content - is intended for all language audiences. This may mean that the sender - - - -Fielding, et. al. Standards Track [Page 110] - -RFC 2068 HTTP/1.1 January 1997 - - - does not consider it to be specific to any natural language, or that - the sender does not know for which language it is intended. - - Multiple languages MAY be listed for content that is intended for - multiple audiences. For example, a rendition of the "Treaty of - Waitangi," presented simultaneously in the original Maori and English - versions, would call for - - Content-Language: mi, en - - However, just because multiple languages are present within an entity - does not mean that it is intended for multiple linguistic audiences. - An example would be a beginner's language primer, such as "A First - Lesson in Latin," which is clearly intended to be used by an - English-literate audience. In this case, the Content-Language should - only include "en". - - Content-Language may be applied to any media type -- it is not - limited to textual documents. - -14.14 Content-Length - - The Content-Length entity-header field indicates the size of the - message-body, in decimal number of octets, sent to the recipient or, - in the case of the HEAD method, the size of the entity-body that - would have been sent had the request been a GET. - - Content-Length = "Content-Length" ":" 1*DIGIT - - An example is - - Content-Length: 3495 - - Applications SHOULD use this field to indicate the size of the - message-body to be transferred, regardless of the media type of the - entity. It must be possible for the recipient to reliably determine - the end of HTTP/1.1 requests containing an entity-body, e.g., because - the request has a valid Content-Length field, uses Transfer-Encoding: - chunked or a multipart body. - - Any Content-Length greater than or equal to zero is a valid value. - Section 4.4 describes how to determine the length of a message-body - if a Content-Length is not given. - - - - - - - - -Fielding, et. al. Standards Track [Page 111] - -RFC 2068 HTTP/1.1 January 1997 - - - Note: The meaning of this field is significantly different from the - corresponding definition in MIME, where it is an optional field - used within the "message/external-body" content-type. In HTTP, it - SHOULD be sent whenever the message's length can be determined - prior to being transferred. - -14.15 Content-Location - - The Content-Location entity-header field may be used to supply the - resource location for the entity enclosed in the message. In the case - where a resource has multiple entities associated with it, and those - entities actually have separate locations by which they might be - individually accessed, the server should provide a Content-Location - for the particular variant which is returned. In addition, a server - SHOULD provide a Content-Location for the resource corresponding to - the response entity. - - Content-Location = "Content-Location" ":" - ( absoluteURI | relativeURI ) - - If no Content-Base header field is present, the value of Content- - Location also defines the base URL for the entity (see section - 14.11). - - The Content-Location value is not a replacement for the original - requested URI; it is only a statement of the location of the resource - corresponding to this particular entity at the time of the request. - Future requests MAY use the Content-Location URI if the desire is to - identify the source of that particular entity. - - A cache cannot assume that an entity with a Content-Location - different from the URI used to retrieve it can be used to respond to - later requests on that Content-Location URI. However, the Content- - Location can be used to differentiate between multiple entities - retrieved from a single requested resource, as described in section - 13.6. - - If the Content-Location is a relative URI, the URI is interpreted - relative to any Content-Base URI provided in the response. If no - Content-Base is provided, the relative URI is interpreted relative to - the Request-URI. - - - - - - - - - - -Fielding, et. al. Standards Track [Page 112] - -RFC 2068 HTTP/1.1 January 1997 - - -14.16 Content-MD5 - - The Content-MD5 entity-header field, as defined in RFC 1864 [23], is - an MD5 digest of the entity-body for the purpose of providing an - end-to-end message integrity check (MIC) of the entity-body. (Note: a - MIC is good for detecting accidental modification of the entity-body - in transit, but is not proof against malicious attacks.) - - Content-MD5 = "Content-MD5" ":" md5-digest - - md5-digest = - - The Content-MD5 header field may be generated by an origin server to - function as an integrity check of the entity-body. Only origin - servers may generate the Content-MD5 header field; proxies and - gateways MUST NOT generate it, as this would defeat its value as an - end-to-end integrity check. Any recipient of the entity-body, - including gateways and proxies, MAY check that the digest value in - this header field matches that of the entity-body as received. - - The MD5 digest is computed based on the content of the entity-body, - including any Content-Encoding that has been applied, but not - including any Transfer-Encoding that may have been applied to the - message-body. If the message is received with a Transfer-Encoding, - that encoding must be removed prior to checking the Content-MD5 value - against the received entity. - - This has the result that the digest is computed on the octets of the - entity-body exactly as, and in the order that, they would be sent if - no Transfer-Encoding were being applied. - - HTTP extends RFC 1864 to permit the digest to be computed for MIME - composite media-types (e.g., multipart/* and message/rfc822), but - this does not change how the digest is computed as defined in the - preceding paragraph. - - Note: There are several consequences of this. The entity-body for - composite types may contain many body-parts, each with its own MIME - and HTTP headers (including Content-MD5, Content-Transfer-Encoding, - and Content-Encoding headers). If a body-part has a Content- - Transfer-Encoding or Content-Encoding header, it is assumed that - the content of the body-part has had the encoding applied, and the - body-part is included in the Content-MD5 digest as is -- i.e., - after the application. The Transfer-Encoding header field is not - allowed within body-parts. - - Note: while the definition of Content-MD5 is exactly the same for - HTTP as in RFC 1864 for MIME entity-bodies, there are several ways - - - -Fielding, et. al. Standards Track [Page 113] - -RFC 2068 HTTP/1.1 January 1997 - - - in which the application of Content-MD5 to HTTP entity-bodies - differs from its application to MIME entity-bodies. One is that - HTTP, unlike MIME, does not use Content-Transfer-Encoding, and does - use Transfer-Encoding and Content-Encoding. Another is that HTTP - more frequently uses binary content types than MIME, so it is worth - noting that, in such cases, the byte order used to compute the - digest is the transmission byte order defined for the type. Lastly, - HTTP allows transmission of text types with any of several line - break conventions and not just the canonical form using CRLF. - Conversion of all line breaks to CRLF should not be done before - computing or checking the digest: the line break convention used in - the text actually transmitted should be left unaltered when - computing the digest. - -14.17 Content-Range - - The Content-Range entity-header is sent with a partial entity-body to - specify where in the full entity-body the partial body should be - inserted. It also indicates the total size of the full entity-body. - When a server returns a partial response to a client, it must - describe both the extent of the range covered by the response, and - the length of the entire entity-body. - - Content-Range = "Content-Range" ":" content-range-spec - - content-range-spec = byte-content-range-spec - - byte-content-range-spec = bytes-unit SP first-byte-pos "-" - last-byte-pos "/" entity-length - - entity-length = 1*DIGIT - - Unlike byte-ranges-specifier values, a byte-content-range-spec may - only specify one range, and must contain absolute byte positions for - both the first and last byte of the range. - - A byte-content-range-spec whose last-byte-pos value is less than its - first-byte-pos value, or whose entity-length value is less than or - equal to its last-byte-pos value, is invalid. The recipient of an - invalid byte-content-range-spec MUST ignore it and any content - transferred along with it. - - - - - - - - - - -Fielding, et. al. Standards Track [Page 114] - -RFC 2068 HTTP/1.1 January 1997 - - - Examples of byte-content-range-spec values, assuming that the entity - contains a total of 1234 bytes: - - o The first 500 bytes: - - bytes 0-499/1234 - - o The second 500 bytes: - - bytes 500-999/1234 - - o All except for the first 500 bytes: - - bytes 500-1233/1234 - - o The last 500 bytes: - - bytes 734-1233/1234 - - When an HTTP message includes the content of a single range (for - example, a response to a request for a single range, or to a request - for a set of ranges that overlap without any holes), this content is - transmitted with a Content-Range header, and a Content-Length header - showing the number of bytes actually transferred. For example, - - HTTP/1.1 206 Partial content - Date: Wed, 15 Nov 1995 06:25:24 GMT - Last-modified: Wed, 15 Nov 1995 04:58:08 GMT - Content-Range: bytes 21010-47021/47022 - Content-Length: 26012 - Content-Type: image/gif - - When an HTTP message includes the content of multiple ranges (for - example, a response to a request for multiple non-overlapping - ranges), these are transmitted as a multipart MIME message. The - multipart MIME content-type used for this purpose is defined in this - specification to be "multipart/byteranges". See appendix 19.2 for its - definition. - - A client that cannot decode a MIME multipart/byteranges message - should not ask for multiple byte-ranges in a single request. - - When a client requests multiple byte-ranges in one request, the - server SHOULD return them in the order that they appeared in the - request. - - If the server ignores a byte-range-spec because it is invalid, the - server should treat the request as if the invalid Range header field - - - -Fielding, et. al. Standards Track [Page 115] - -RFC 2068 HTTP/1.1 January 1997 - - - did not exist. (Normally, this means return a 200 response containing - the full entity). The reason is that the only time a client will make - such an invalid request is when the entity is smaller than the entity - retrieved by a prior request. - -14.18 Content-Type - - The Content-Type entity-header field indicates the media type of the - entity-body sent to the recipient or, in the case of the HEAD method, - the media type that would have been sent had the request been a GET. - - Content-Type = "Content-Type" ":" media-type - Media types are defined in section 3.7. An example of the field is - - Content-Type: text/html; charset=ISO-8859-4 - - Further discussion of methods for identifying the media type of an - entity is provided in section 7.2.1. - -14.19 Date - - The Date general-header field represents the date and time at which - the message was originated, having the same semantics as orig-date in - RFC 822. The field value is an HTTP-date, as described in section - 3.3.1. - - Date = "Date" ":" HTTP-date - - An example is - - Date: Tue, 15 Nov 1994 08:12:31 GMT - - If a message is received via direct connection with the user agent - (in the case of requests) or the origin server (in the case of - responses), then the date can be assumed to be the current date at - the receiving end. However, since the date--as it is believed by the - origin--is important for evaluating cached responses, origin servers - MUST include a Date header field in all responses. Clients SHOULD - only send a Date header field in messages that include an entity- - body, as in the case of the PUT and POST requests, and even then it - is optional. A received message which does not have a Date header - field SHOULD be assigned one by the recipient if the message will be - cached by that recipient or gatewayed via a protocol which requires a - Date. - - - - - - - -Fielding, et. al. Standards Track [Page 116] - -RFC 2068 HTTP/1.1 January 1997 - - - In theory, the date SHOULD represent the moment just before the - entity is generated. In practice, the date can be generated at any - time during the message origination without affecting its semantic - value. - - The format of the Date is an absolute date and time as defined by - HTTP-date in section 3.3; it MUST be sent in RFC1123 [8]-date format. - -14.20 ETag - - The ETag entity-header field defines the entity tag for the - associated entity. The headers used with entity tags are described in - sections 14.20, 14.25, 14.26 and 14.43. The entity tag may be used - for comparison with other entities from the same resource (see - section 13.3.2). - - ETag = "ETag" ":" entity-tag - - Examples: - - ETag: "xyzzy" - ETag: W/"xyzzy" - ETag: "" - -14.21 Expires - - The Expires entity-header field gives the date/time after which the - response should be considered stale. A stale cache entry may not - normally be returned by a cache (either a proxy cache or an user - agent cache) unless it is first validated with the origin server (or - with an intermediate cache that has a fresh copy of the entity). See - section 13.2 for further discussion of the expiration model. - - The presence of an Expires field does not imply that the original - resource will change or cease to exist at, before, or after that - time. - - The format is an absolute date and time as defined by HTTP-date in - section 3.3; it MUST be in RFC1123-date format: - - Expires = "Expires" ":" HTTP-date - - - - - - - - - - -Fielding, et. al. Standards Track [Page 117] - -RFC 2068 HTTP/1.1 January 1997 - - - An example of its use is - - Expires: Thu, 01 Dec 1994 16:00:00 GMT - - Note: if a response includes a Cache-Control field with the max-age - directive, that directive overrides the Expires field. - - HTTP/1.1 clients and caches MUST treat other invalid date formats, - especially including the value "0", as in the past (i.e., "already - expired"). - - To mark a response as "already expired," an origin server should use - an Expires date that is equal to the Date header value. (See the - rules for expiration calculations in section 13.2.4.) - - To mark a response as "never expires," an origin server should use an - Expires date approximately one year from the time the response is - sent. HTTP/1.1 servers should not send Expires dates more than one - year in the future. - - The presence of an Expires header field with a date value of some - time in the future on an response that otherwise would by default be - non-cacheable indicates that the response is cachable, unless - indicated otherwise by a Cache-Control header field (section 14.9). - -14.22 From - - The From request-header field, if given, SHOULD contain an Internet - e-mail address for the human user who controls the requesting user - agent. The address SHOULD be machine-usable, as defined by mailbox - in RFC 822 (as updated by RFC 1123 ): - - From = "From" ":" mailbox - - An example is: - - From: webmaster@w3.org - - This header field MAY be used for logging purposes and as a means for - identifying the source of invalid or unwanted requests. It SHOULD NOT - be used as an insecure form of access protection. The interpretation - of this field is that the request is being performed on behalf of the - person given, who accepts responsibility for the method performed. In - particular, robot agents SHOULD include this header so that the - person responsible for running the robot can be contacted if problems - occur on the receiving end. - - - - - -Fielding, et. al. Standards Track [Page 118] - -RFC 2068 HTTP/1.1 January 1997 - - - The Internet e-mail address in this field MAY be separate from the - Internet host which issued the request. For example, when a request - is passed through a proxy the original issuer's address SHOULD be - used. - - Note: The client SHOULD not send the From header field without the - user's approval, as it may conflict with the user's privacy - interests or their site's security policy. It is strongly - recommended that the user be able to disable, enable, and modify - the value of this field at any time prior to a request. - -14.23 Host - - The Host request-header field specifies the Internet host and port - number of the resource being requested, as obtained from the original - URL given by the user or referring resource (generally an HTTP URL, - as described in section 3.2.2). The Host field value MUST represent - the network location of the origin server or gateway given by the - original URL. This allows the origin server or gateway to - differentiate between internally-ambiguous URLs, such as the root "/" - URL of a server for multiple host names on a single IP address. - - Host = "Host" ":" host [ ":" port ] ; Section 3.2.2 - - A "host" without any trailing port information implies the default - port for the service requested (e.g., "80" for an HTTP URL). For - example, a request on the origin server for - MUST include: - - GET /pub/WWW/ HTTP/1.1 - Host: www.w3.org - - A client MUST include a Host header field in all HTTP/1.1 request - messages on the Internet (i.e., on any message corresponding to a - request for a URL which includes an Internet host address for the - service being requested). If the Host field is not already present, - an HTTP/1.1 proxy MUST add a Host field to the request message prior - to forwarding it on the Internet. All Internet-based HTTP/1.1 servers - MUST respond with a 400 status code to any HTTP/1.1 request message - which lacks a Host header field. - - See sections 5.2 and 19.5.1 for other requirements relating to Host. - -14.24 If-Modified-Since - - The If-Modified-Since request-header field is used with the GET - method to make it conditional: if the requested variant has not been - modified since the time specified in this field, an entity will not - - - -Fielding, et. al. Standards Track [Page 119] - -RFC 2068 HTTP/1.1 January 1997 - - - be returned from the server; instead, a 304 (not modified) response - will be returned without any message-body. - - If-Modified-Since = "If-Modified-Since" ":" HTTP-date - - An example of the field is: - - If-Modified-Since: Sat, 29 Oct 1994 19:43:31 GMT - - A GET method with an If-Modified-Since header and no Range header - requests that the identified entity be transferred only if it has - been modified since the date given by the If-Modified-Since header. - The algorithm for determining this includes the following cases: - - a)If the request would normally result in anything other than a 200 - (OK) status, or if the passed If-Modified-Since date is invalid, the - response is exactly the same as for a normal GET. A date which is - later than the server's current time is invalid. - - b)If the variant has been modified since the If-Modified-Since date, - the response is exactly the same as for a normal GET. - - c)If the variant has not been modified since a valid If-Modified-Since - date, the server MUST return a 304 (Not Modified) response. - - The purpose of this feature is to allow efficient updates of cached - information with a minimum amount of transaction overhead. - - Note that the Range request-header field modifies the meaning of - If-Modified-Since; see section 14.36 for full details. - - Note that If-Modified-Since times are interpreted by the server, - whose clock may not be synchronized with the client. - - Note that if a client uses an arbitrary date in the If-Modified-Since - header instead of a date taken from the Last-Modified header for the - same request, the client should be aware of the fact that this date - is interpreted in the server's understanding of time. The client - should consider unsynchronized clocks and rounding problems due to - the different encodings of time between the client and server. This - includes the possibility of race conditions if the document has - changed between the time it was first requested and the If-Modified- - Since date of a subsequent request, and the possibility of clock- - skew-related problems if the If-Modified-Since date is derived from - the client's clock without correction to the server's clock. - Corrections for different time bases between client and server are at - best approximate due to network latency. - - - - -Fielding, et. al. Standards Track [Page 120] - -RFC 2068 HTTP/1.1 January 1997 - - -14.25 If-Match - - The If-Match request-header field is used with a method to make it - conditional. A client that has one or more entities previously - obtained from the resource can verify that one of those entities is - current by including a list of their associated entity tags in the - If-Match header field. The purpose of this feature is to allow - efficient updates of cached information with a minimum amount of - transaction overhead. It is also used, on updating requests, to - prevent inadvertent modification of the wrong version of a resource. - As a special case, the value "*" matches any current entity of the - resource. - - If-Match = "If-Match" ":" ( "*" | 1#entity-tag ) - - If any of the entity tags match the entity tag of the entity that - would have been returned in the response to a similar GET request - (without the If-Match header) on that resource, or if "*" is given - and any current entity exists for that resource, then the server MAY - perform the requested method as if the If-Match header field did not - exist. - - A server MUST use the strong comparison function (see section 3.11) - to compare the entity tags in If-Match. - - If none of the entity tags match, or if "*" is given and no current - entity exists, the server MUST NOT perform the requested method, and - MUST return a 412 (Precondition Failed) response. This behavior is - most useful when the client wants to prevent an updating method, such - as PUT, from modifying a resource that has changed since the client - last retrieved it. - - If the request would, without the If-Match header field, result in - anything other than a 2xx status, then the If-Match header MUST be - ignored. - - The meaning of "If-Match: *" is that the method SHOULD be performed - if the representation selected by the origin server (or by a cache, - possibly using the Vary mechanism, see section 14.43) exists, and - MUST NOT be performed if the representation does not exist. - - - - - - - - - - - -Fielding, et. al. Standards Track [Page 121] - -RFC 2068 HTTP/1.1 January 1997 - - - A request intended to update a resource (e.g., a PUT) MAY include an - If-Match header field to signal that the request method MUST NOT be - applied if the entity corresponding to the If-Match value (a single - entity tag) is no longer a representation of that resource. This - allows the user to indicate that they do not wish the request to be - successful if the resource has been changed without their knowledge. - Examples: - - If-Match: "xyzzy" - If-Match: "xyzzy", "r2d2xxxx", "c3piozzzz" - If-Match: * - -14.26 If-None-Match - - The If-None-Match request-header field is used with a method to make - it conditional. A client that has one or more entities previously - obtained from the resource can verify that none of those entities is - current by including a list of their associated entity tags in the - If-None-Match header field. The purpose of this feature is to allow - efficient updates of cached information with a minimum amount of - transaction overhead. It is also used, on updating requests, to - prevent inadvertent modification of a resource which was not known to - exist. - - As a special case, the value "*" matches any current entity of the - resource. - - If-None-Match = "If-None-Match" ":" ( "*" | 1#entity-tag ) - - If any of the entity tags match the entity tag of the entity that - would have been returned in the response to a similar GET request - (without the If-None-Match header) on that resource, or if "*" is - given and any current entity exists for that resource, then the - server MUST NOT perform the requested method. Instead, if the request - method was GET or HEAD, the server SHOULD respond with a 304 (Not - Modified) response, including the cache-related entity-header fields - (particularly ETag) of one of the entities that matched. For all - other request methods, the server MUST respond with a status of 412 - (Precondition Failed). - - See section 13.3.3 for rules on how to determine if two entity tags - match. The weak comparison function can only be used with GET or HEAD - requests. - - If none of the entity tags match, or if "*" is given and no current - entity exists, then the server MAY perform the requested method as if - the If-None-Match header field did not exist. - - - - -Fielding, et. al. Standards Track [Page 122] - -RFC 2068 HTTP/1.1 January 1997 - - - If the request would, without the If-None-Match header field, result - in anything other than a 2xx status, then the If-None-Match header - MUST be ignored. - - The meaning of "If-None-Match: *" is that the method MUST NOT be - performed if the representation selected by the origin server (or by - a cache, possibly using the Vary mechanism, see section 14.43) - exists, and SHOULD be performed if the representation does not exist. - This feature may be useful in preventing races between PUT - operations. - - Examples: - - If-None-Match: "xyzzy" - If-None-Match: W/"xyzzy" - If-None-Match: "xyzzy", "r2d2xxxx", "c3piozzzz" - If-None-Match: W/"xyzzy", W/"r2d2xxxx", W/"c3piozzzz" - If-None-Match: * - -14.27 If-Range - - If a client has a partial copy of an entity in its cache, and wishes - to have an up-to-date copy of the entire entity in its cache, it - could use the Range request-header with a conditional GET (using - either or both of If-Unmodified-Since and If-Match.) However, if the - condition fails because the entity has been modified, the client - would then have to make a second request to obtain the entire current - entity-body. - - The If-Range header allows a client to "short-circuit" the second - request. Informally, its meaning is `if the entity is unchanged, send - me the part(s) that I am missing; otherwise, send me the entire new - entity.' - - If-Range = "If-Range" ":" ( entity-tag | HTTP-date ) - - If the client has no entity tag for an entity, but does have a Last- - Modified date, it may use that date in a If-Range header. (The server - can distinguish between a valid HTTP-date and any form of entity-tag - by examining no more than two characters.) The If-Range header should - only be used together with a Range header, and must be ignored if the - request does not include a Range header, or if the server does not - support the sub-range operation. - - - - - - - - -Fielding, et. al. Standards Track [Page 123] - -RFC 2068 HTTP/1.1 January 1997 - - - If the entity tag given in the If-Range header matches the current - entity tag for the entity, then the server should provide the - specified sub-range of the entity using a 206 (Partial content) - response. If the entity tag does not match, then the server should - return the entire entity using a 200 (OK) response. - -14.28 If-Unmodified-Since - - The If-Unmodified-Since request-header field is used with a method to - make it conditional. If the requested resource has not been modified - since the time specified in this field, the server should perform the - requested operation as if the If-Unmodified-Since header were not - present. - - If the requested variant has been modified since the specified time, - the server MUST NOT perform the requested operation, and MUST return - a 412 (Precondition Failed). - - If-Unmodified-Since = "If-Unmodified-Since" ":" HTTP-date - - An example of the field is: - - If-Unmodified-Since: Sat, 29 Oct 1994 19:43:31 GMT - - If the request normally (i.e., without the If-Unmodified-Since - header) would result in anything other than a 2xx status, the If- - Unmodified-Since header should be ignored. - - If the specified date is invalid, the header is ignored. - -14.29 Last-Modified - - The Last-Modified entity-header field indicates the date and time at - which the origin server believes the variant was last modified. - - Last-Modified = "Last-Modified" ":" HTTP-date - - An example of its use is - - Last-Modified: Tue, 15 Nov 1994 12:45:26 GMT - - The exact meaning of this header field depends on the implementation - of the origin server and the nature of the original resource. For - files, it may be just the file system last-modified time. For - entities with dynamically included parts, it may be the most recent - of the set of last-modify times for its component parts. For database - gateways, it may be the last-update time stamp of the record. For - virtual objects, it may be the last time the internal state changed. - - - -Fielding, et. al. Standards Track [Page 124] - -RFC 2068 HTTP/1.1 January 1997 - - - An origin server MUST NOT send a Last-Modified date which is later - than the server's time of message origination. In such cases, where - the resource's last modification would indicate some time in the - future, the server MUST replace that date with the message - origination date. - - An origin server should obtain the Last-Modified value of the entity - as close as possible to the time that it generates the Date value of - its response. This allows a recipient to make an accurate assessment - of the entity's modification time, especially if the entity changes - near the time that the response is generated. - - HTTP/1.1 servers SHOULD send Last-Modified whenever feasible. - -14.30 Location - - The Location response-header field is used to redirect the recipient - to a location other than the Request-URI for completion of the - request or identification of a new resource. For 201 (Created) - responses, the Location is that of the new resource which was created - by the request. For 3xx responses, the location SHOULD indicate the - server's preferred URL for automatic redirection to the resource. The - field value consists of a single absolute URL. - - Location = "Location" ":" absoluteURI - - An example is - - Location: http://www.w3.org/pub/WWW/People.html - - Note: The Content-Location header field (section 14.15) differs - from Location in that the Content-Location identifies the original - location of the entity enclosed in the request. It is therefore - possible for a response to contain header fields for both Location - and Content-Location. Also see section 13.10 for cache requirements - of some methods. - -14.31 Max-Forwards - - The Max-Forwards request-header field may be used with the TRACE - method (section 14.31) to limit the number of proxies or gateways - that can forward the request to the next inbound server. This can be - useful when the client is attempting to trace a request chain which - appears to be failing or looping in mid-chain. - - Max-Forwards = "Max-Forwards" ":" 1*DIGIT - - - - - -Fielding, et. al. Standards Track [Page 125] - -RFC 2068 HTTP/1.1 January 1997 - - - The Max-Forwards value is a decimal integer indicating the remaining - number of times this request message may be forwarded. - - Each proxy or gateway recipient of a TRACE request containing a Max- - Forwards header field SHOULD check and update its value prior to - forwarding the request. If the received value is zero (0), the - recipient SHOULD NOT forward the request; instead, it SHOULD respond - as the final recipient with a 200 (OK) response containing the - received request message as the response entity-body (as described in - section 9.8). If the received Max-Forwards value is greater than - zero, then the forwarded message SHOULD contain an updated Max- - Forwards field with a value decremented by one (1). - - The Max-Forwards header field SHOULD be ignored for all other methods - defined by this specification and for any extension methods for which - it is not explicitly referred to as part of that method definition. - -14.32 Pragma - - The Pragma general-header field is used to include implementation- - specific directives that may apply to any recipient along the - request/response chain. All pragma directives specify optional - behavior from the viewpoint of the protocol; however, some systems - MAY require that behavior be consistent with the directives. - - Pragma = "Pragma" ":" 1#pragma-directive - - pragma-directive = "no-cache" | extension-pragma - extension-pragma = token [ "=" ( token | quoted-string ) ] - - When the no-cache directive is present in a request message, an - application SHOULD forward the request toward the origin server even - if it has a cached copy of what is being requested. This pragma - directive has the same semantics as the no-cache cache-directive (see - section 14.9) and is defined here for backwards compatibility with - HTTP/1.0. Clients SHOULD include both header fields when a no-cache - request is sent to a server not known to be HTTP/1.1 compliant. - - Pragma directives MUST be passed through by a proxy or gateway - application, regardless of their significance to that application, - since the directives may be applicable to all recipients along the - request/response chain. It is not possible to specify a pragma for a - specific recipient; however, any pragma directive not relevant to a - recipient SHOULD be ignored by that recipient. - - - - - - - -Fielding, et. al. Standards Track [Page 126] - -RFC 2068 HTTP/1.1 January 1997 - - - HTTP/1.1 clients SHOULD NOT send the Pragma request-header. HTTP/1.1 - caches SHOULD treat "Pragma: no-cache" as if the client had sent - "Cache-Control: no-cache". No new Pragma directives will be defined - in HTTP. - -14.33 Proxy-Authenticate - - The Proxy-Authenticate response-header field MUST be included as part - of a 407 (Proxy Authentication Required) response. The field value - consists of a challenge that indicates the authentication scheme and - parameters applicable to the proxy for this Request-URI. - - Proxy-Authenticate = "Proxy-Authenticate" ":" challenge - - The HTTP access authentication process is described in section 11. - Unlike WWW-Authenticate, the Proxy-Authenticate header field applies - only to the current connection and SHOULD NOT be passed on to - downstream clients. However, an intermediate proxy may need to obtain - its own credentials by requesting them from the downstream client, - which in some circumstances will appear as if the proxy is forwarding - the Proxy-Authenticate header field. - -14.34 Proxy-Authorization - - The Proxy-Authorization request-header field allows the client to - identify itself (or its user) to a proxy which requires - authentication. The Proxy-Authorization field value consists of - credentials containing the authentication information of the user - agent for the proxy and/or realm of the resource being requested. - - Proxy-Authorization = "Proxy-Authorization" ":" credentials - - The HTTP access authentication process is described in section 11. - Unlike Authorization, the Proxy-Authorization header field applies - only to the next outbound proxy that demanded authentication using - the Proxy-Authenticate field. When multiple proxies are used in a - chain, the Proxy-Authorization header field is consumed by the first - outbound proxy that was expecting to receive credentials. A proxy MAY - relay the credentials from the client request to the next proxy if - that is the mechanism by which the proxies cooperatively authenticate - a given request. - -14.35 Public - - The Public response-header field lists the set of methods supported - by the server. The purpose of this field is strictly to inform the - recipient of the capabilities of the server regarding unusual - methods. The methods listed may or may not be applicable to the - - - -Fielding, et. al. Standards Track [Page 127] - -RFC 2068 HTTP/1.1 January 1997 - - - Request-URI; the Allow header field (section 14.7) MAY be used to - indicate methods allowed for a particular URI. - - Public = "Public" ":" 1#method - - Example of use: - - Public: OPTIONS, MGET, MHEAD, GET, HEAD - - This header field applies only to the server directly connected to - the client (i.e., the nearest neighbor in a chain of connections). If - the response passes through a proxy, the proxy MUST either remove the - Public header field or replace it with one applicable to its own - capabilities. - -14.36 Range - -14.36.1 Byte Ranges - - Since all HTTP entities are represented in HTTP messages as sequences - of bytes, the concept of a byte range is meaningful for any HTTP - entity. (However, not all clients and servers need to support byte- - range operations.) - - Byte range specifications in HTTP apply to the sequence of bytes in - the entity-body (not necessarily the same as the message-body). - - A byte range operation may specify a single range of bytes, or a set - of ranges within a single entity. - - ranges-specifier = byte-ranges-specifier - - byte-ranges-specifier = bytes-unit "=" byte-range-set - - byte-range-set = 1#( byte-range-spec | suffix-byte-range-spec ) - - byte-range-spec = first-byte-pos "-" [last-byte-pos] - - first-byte-pos = 1*DIGIT - - last-byte-pos = 1*DIGIT - - The first-byte-pos value in a byte-range-spec gives the byte-offset - of the first byte in a range. The last-byte-pos value gives the - byte-offset of the last byte in the range; that is, the byte - positions specified are inclusive. Byte offsets start at zero. - - - - - -Fielding, et. al. Standards Track [Page 128] - -RFC 2068 HTTP/1.1 January 1997 - - - If the last-byte-pos value is present, it must be greater than or - equal to the first-byte-pos in that byte-range-spec, or the byte- - range-spec is invalid. The recipient of an invalid byte-range-spec - must ignore it. - - If the last-byte-pos value is absent, or if the value is greater than - or equal to the current length of the entity-body, last-byte-pos is - taken to be equal to one less than the current length of the entity- - body in bytes. - - By its choice of last-byte-pos, a client can limit the number of - bytes retrieved without knowing the size of the entity. - - suffix-byte-range-spec = "-" suffix-length - - suffix-length = 1*DIGIT - - A suffix-byte-range-spec is used to specify the suffix of the - entity-body, of a length given by the suffix-length value. (That is, - this form specifies the last N bytes of an entity-body.) If the - entity is shorter than the specified suffix-length, the entire - entity-body is used. - - Examples of byte-ranges-specifier values (assuming an entity-body of - length 10000): - - o The first 500 bytes (byte offsets 0-499, inclusive): - - bytes=0-499 - - o The second 500 bytes (byte offsets 500-999, inclusive): - - bytes=500-999 - - o The final 500 bytes (byte offsets 9500-9999, inclusive): - - bytes=-500 - - o Or - - bytes=9500- - - o The first and last bytes only (bytes 0 and 9999): - - bytes=0-0,-1 - - - - - - -Fielding, et. al. Standards Track [Page 129] - -RFC 2068 HTTP/1.1 January 1997 - - - o Several legal but not canonical specifications of the second - 500 bytes (byte offsets 500-999, inclusive): - - bytes=500-600,601-999 - - bytes=500-700,601-999 - -14.36.2 Range Retrieval Requests - - HTTP retrieval requests using conditional or unconditional GET - methods may request one or more sub-ranges of the entity, instead of - the entire entity, using the Range request header, which applies to - the entity returned as the result of the request: - - Range = "Range" ":" ranges-specifier - - A server MAY ignore the Range header. However, HTTP/1.1 origin - servers and intermediate caches SHOULD support byte ranges when - possible, since Range supports efficient recovery from partially - failed transfers, and supports efficient partial retrieval of large - entities. - - If the server supports the Range header and the specified range or - ranges are appropriate for the entity: - - o The presence of a Range header in an unconditional GET modifies - what is returned if the GET is otherwise successful. In other - words, the response carries a status code of 206 (Partial - Content) instead of 200 (OK). - - o The presence of a Range header in a conditional GET (a request - using one or both of If-Modified-Since and If-None-Match, or - one or both of If-Unmodified-Since and If-Match) modifies what - is returned if the GET is otherwise successful and the condition - is true. It does not affect the 304 (Not Modified) response - returned if the conditional is false. - - In some cases, it may be more appropriate to use the If-Range header - (see section 14.27) in addition to the Range header. - - If a proxy that supports ranges receives a Range request, forwards - the request to an inbound server, and receives an entire entity in - reply, it SHOULD only return the requested range to its client. It - SHOULD store the entire received response in its cache, if that is - consistent with its cache allocation policies. - - - - - - -Fielding, et. al. Standards Track [Page 130] - -RFC 2068 HTTP/1.1 January 1997 - - -14.37 Referer - - The Referer[sic] request-header field allows the client to specify, - for the server's benefit, the address (URI) of the resource from - which the Request-URI was obtained (the "referrer", although the - header field is misspelled.) The Referer request-header allows a - server to generate lists of back-links to resources for interest, - logging, optimized caching, etc. It also allows obsolete or mistyped - links to be traced for maintenance. The Referer field MUST NOT be - sent if the Request-URI was obtained from a source that does not have - its own URI, such as input from the user keyboard. - - Referer = "Referer" ":" ( absoluteURI | relativeURI ) - - Example: - - Referer: http://www.w3.org/hypertext/DataSources/Overview.html - - If the field value is a partial URI, it SHOULD be interpreted - relative to the Request-URI. The URI MUST NOT include a fragment. - - Note: Because the source of a link may be private information or - may reveal an otherwise private information source, it is strongly - recommended that the user be able to select whether or not the - Referer field is sent. For example, a browser client could have a - toggle switch for browsing openly/anonymously, which would - respectively enable/disable the sending of Referer and From - information. - -14.38 Retry-After - - The Retry-After response-header field can be used with a 503 (Service - Unavailable) response to indicate how long the service is expected to - be unavailable to the requesting client. The value of this field can - be either an HTTP-date or an integer number of seconds (in decimal) - after the time of the response. - - Retry-After = "Retry-After" ":" ( HTTP-date | delta-seconds ) - - Two examples of its use are - - Retry-After: Fri, 31 Dec 1999 23:59:59 GMT - Retry-After: 120 - - In the latter example, the delay is 2 minutes. - - - - - - -Fielding, et. al. Standards Track [Page 131] - -RFC 2068 HTTP/1.1 January 1997 - - -14.39 Server - - The Server response-header field contains information about the - software used by the origin server to handle the request. The field - can contain multiple product tokens (section 3.8) and comments - identifying the server and any significant subproducts. The product - tokens are listed in order of their significance for identifying the - application. - - Server = "Server" ":" 1*( product | comment ) - - Example: - - Server: CERN/3.0 libwww/2.17 - - If the response is being forwarded through a proxy, the proxy - application MUST NOT modify the Server response-header. Instead, it - SHOULD include a Via field (as described in section 14.44). - - Note: Revealing the specific software version of the server may - allow the server machine to become more vulnerable to attacks - against software that is known to contain security holes. Server - implementers are encouraged to make this field a configurable - option. - -14.40 Transfer-Encoding - - The Transfer-Encoding general-header field indicates what (if any) - type of transformation has been applied to the message body in order - to safely transfer it between the sender and the recipient. This - differs from the Content-Encoding in that the transfer coding is a - property of the message, not of the entity. - - Transfer-Encoding = "Transfer-Encoding" ":" 1#transfer- - coding - - Transfer codings are defined in section 3.6. An example is: - - Transfer-Encoding: chunked - - Many older HTTP/1.0 applications do not understand the Transfer- - Encoding header. - -14.41 Upgrade - - The Upgrade general-header allows the client to specify what - additional communication protocols it supports and would like to use - if the server finds it appropriate to switch protocols. The server - - - -Fielding, et. al. Standards Track [Page 132] - -RFC 2068 HTTP/1.1 January 1997 - - - MUST use the Upgrade header field within a 101 (Switching Protocols) - response to indicate which protocol(s) are being switched. - - Upgrade = "Upgrade" ":" 1#product - - For example, - - Upgrade: HTTP/2.0, SHTTP/1.3, IRC/6.9, RTA/x11 - - The Upgrade header field is intended to provide a simple mechanism - for transition from HTTP/1.1 to some other, incompatible protocol. It - does so by allowing the client to advertise its desire to use another - protocol, such as a later version of HTTP with a higher major version - number, even though the current request has been made using HTTP/1.1. - This eases the difficult transition between incompatible protocols by - allowing the client to initiate a request in the more commonly - supported protocol while indicating to the server that it would like - to use a "better" protocol if available (where "better" is determined - by the server, possibly according to the nature of the method and/or - resource being requested). - - The Upgrade header field only applies to switching application-layer - protocols upon the existing transport-layer connection. Upgrade - cannot be used to insist on a protocol change; its acceptance and use - by the server is optional. The capabilities and nature of the - application-layer communication after the protocol change is entirely - dependent upon the new protocol chosen, although the first action - after changing the protocol MUST be a response to the initial HTTP - request containing the Upgrade header field. - - The Upgrade header field only applies to the immediate connection. - Therefore, the upgrade keyword MUST be supplied within a Connection - header field (section 14.10) whenever Upgrade is present in an - HTTP/1.1 message. - - The Upgrade header field cannot be used to indicate a switch to a - protocol on a different connection. For that purpose, it is more - appropriate to use a 301, 302, 303, or 305 redirection response. - - This specification only defines the protocol name "HTTP" for use by - the family of Hypertext Transfer Protocols, as defined by the HTTP - version rules of section 3.1 and future updates to this - specification. Any token can be used as a protocol name; however, it - will only be useful if both the client and server associate the name - with the same protocol. - - - - - - -Fielding, et. al. Standards Track [Page 133] - -RFC 2068 HTTP/1.1 January 1997 - - -14.42 User-Agent - - The User-Agent request-header field contains information about the - user agent originating the request. This is for statistical purposes, - the tracing of protocol violations, and automated recognition of user - agents for the sake of tailoring responses to avoid particular user - agent limitations. User agents SHOULD include this field with - requests. The field can contain multiple product tokens (section 3.8) - and comments identifying the agent and any subproducts which form a - significant part of the user agent. By convention, the product tokens - are listed in order of their significance for identifying the - application. - - User-Agent = "User-Agent" ":" 1*( product | comment ) - - Example: - - User-Agent: CERN-LineMode/2.15 libwww/2.17b3 - -14.43 Vary - - The Vary response-header field is used by a server to signal that the - response entity was selected from the available representations of - the response using server-driven negotiation (section 12). Field- - names listed in Vary headers are those of request-headers. The Vary - field value indicates either that the given set of header fields - encompass the dimensions over which the representation might vary, or - that the dimensions of variance are unspecified ("*") and thus may - vary over any aspect of future requests. - - Vary = "Vary" ":" ( "*" | 1#field-name ) - - An HTTP/1.1 server MUST include an appropriate Vary header field with - any cachable response that is subject to server-driven negotiation. - Doing so allows a cache to properly interpret future requests on that - resource and informs the user agent about the presence of negotiation - on that resource. A server SHOULD include an appropriate Vary header - field with a non-cachable response that is subject to server-driven - negotiation, since this might provide the user agent with useful - information about the dimensions over which the response might vary. - - The set of header fields named by the Vary field value is known as - the "selecting" request-headers. - - When the cache receives a subsequent request whose Request-URI - specifies one or more cache entries including a Vary header, the - cache MUST NOT use such a cache entry to construct a response to the - new request unless all of the headers named in the cached Vary header - - - -Fielding, et. al. Standards Track [Page 134] - -RFC 2068 HTTP/1.1 January 1997 - - - are present in the new request, and all of the stored selecting - request-headers from the previous request match the corresponding - headers in the new request. - - The selecting request-headers from two requests are defined to match - if and only if the selecting request-headers in the first request can - be transformed to the selecting request-headers in the second request - by adding or removing linear whitespace (LWS) at places where this is - allowed by the corresponding BNF, and/or combining multiple message- - header fields with the same field name following the rules about - message headers in section 4.2. - - A Vary field value of "*" signals that unspecified parameters, - possibly other than the contents of request-header fields (e.g., the - network address of the client), play a role in the selection of the - response representation. Subsequent requests on that resource can - only be properly interpreted by the origin server, and thus a cache - MUST forward a (possibly conditional) request even when it has a - fresh response cached for the resource. See section 13.6 for use of - the Vary header by caches. - - A Vary field value consisting of a list of field-names signals that - the representation selected for the response is based on a selection - algorithm which considers ONLY the listed request-header field values - in selecting the most appropriate representation. A cache MAY assume - that the same selection will be made for future requests with the - same values for the listed field names, for the duration of time in - which the response is fresh. - - The field-names given are not limited to the set of standard - request-header fields defined by this specification. Field names are - case-insensitive. - -14.44 Via - - The Via general-header field MUST be used by gateways and proxies to - indicate the intermediate protocols and recipients between the user - agent and the server on requests, and between the origin server and - the client on responses. It is analogous to the "Received" field of - RFC 822 and is intended to be used for tracking message forwards, - avoiding request loops, and identifying the protocol capabilities of - all senders along the request/response chain. - - - - - - - - - -Fielding, et. al. Standards Track [Page 135] - -RFC 2068 HTTP/1.1 January 1997 - - - Via = "Via" ":" 1#( received-protocol received-by [ comment ] ) - - received-protocol = [ protocol-name "/" ] protocol-version - protocol-name = token - protocol-version = token - received-by = ( host [ ":" port ] ) | pseudonym - pseudonym = token - - The received-protocol indicates the protocol version of the message - received by the server or client along each segment of the - request/response chain. The received-protocol version is appended to - the Via field value when the message is forwarded so that information - about the protocol capabilities of upstream applications remains - visible to all recipients. - - The protocol-name is optional if and only if it would be "HTTP". The - received-by field is normally the host and optional port number of a - recipient server or client that subsequently forwarded the message. - However, if the real host is considered to be sensitive information, - it MAY be replaced by a pseudonym. If the port is not given, it MAY - be assumed to be the default port of the received-protocol. - - Multiple Via field values represent each proxy or gateway that has - forwarded the message. Each recipient MUST append its information - such that the end result is ordered according to the sequence of - forwarding applications. - - Comments MAY be used in the Via header field to identify the software - of the recipient proxy or gateway, analogous to the User-Agent and - Server header fields. However, all comments in the Via field are - optional and MAY be removed by any recipient prior to forwarding the - message. - - For example, a request message could be sent from an HTTP/1.0 user - agent to an internal proxy code-named "fred", which uses HTTP/1.1 to - forward the request to a public proxy at nowhere.com, which completes - the request by forwarding it to the origin server at www.ics.uci.edu. - The request received by www.ics.uci.edu would then have the following - Via header field: - - Via: 1.0 fred, 1.1 nowhere.com (Apache/1.1) - - Proxies and gateways used as a portal through a network firewall - SHOULD NOT, by default, forward the names and ports of hosts within - the firewall region. This information SHOULD only be propagated if - explicitly enabled. If not enabled, the received-by host of any host - behind the firewall SHOULD be replaced by an appropriate pseudonym - for that host. - - - -Fielding, et. al. Standards Track [Page 136] - -RFC 2068 HTTP/1.1 January 1997 - - - For organizations that have strong privacy requirements for hiding - internal structures, a proxy MAY combine an ordered subsequence of - Via header field entries with identical received-protocol values into - a single such entry. For example, - - Via: 1.0 ricky, 1.1 ethel, 1.1 fred, 1.0 lucy - - could be collapsed to - - Via: 1.0 ricky, 1.1 mertz, 1.0 lucy - - Applications SHOULD NOT combine multiple entries unless they are all - under the same organizational control and the hosts have already been - replaced by pseudonyms. Applications MUST NOT combine entries which - have different received-protocol values. - -14.45 Warning - - The Warning response-header field is used to carry additional - information about the status of a response which may not be reflected - by the response status code. This information is typically, though - not exclusively, used to warn about a possible lack of semantic - transparency from caching operations. - - Warning headers are sent with responses using: - - Warning = "Warning" ":" 1#warning-value - - warning-value = warn-code SP warn-agent SP warn-text - warn-code = 2DIGIT - warn-agent = ( host [ ":" port ] ) | pseudonym - ; the name or pseudonym of the server adding - ; the Warning header, for use in debugging - warn-text = quoted-string - - A response may carry more than one Warning header. - - The warn-text should be in a natural language and character set that - is most likely to be intelligible to the human user receiving the - response. This decision may be based on any available knowledge, - such as the location of the cache or user, the Accept-Language field - in a request, the Content-Language field in a response, etc. The - default language is English and the default character set is ISO- - 8859-1. - - If a character set other than ISO-8859-1 is used, it MUST be encoded - in the warn-text using the method described in RFC 1522 [14]. - - - - -Fielding, et. al. Standards Track [Page 137] - -RFC 2068 HTTP/1.1 January 1997 - - - Any server or cache may add Warning headers to a response. New - Warning headers should be added after any existing Warning headers. A - cache MUST NOT delete any Warning header that it received with a - response. However, if a cache successfully validates a cache entry, - it SHOULD remove any Warning headers previously attached to that - entry except as specified for specific Warning codes. It MUST then - add any Warning headers received in the validating response. In other - words, Warning headers are those that would be attached to the most - recent relevant response. - - When multiple Warning headers are attached to a response, the user - agent SHOULD display as many of them as possible, in the order that - they appear in the response. If it is not possible to display all of - the warnings, the user agent should follow these heuristics: - - o Warnings that appear early in the response take priority over those - appearing later in the response. - o Warnings in the user's preferred character set take priority over - warnings in other character sets but with identical warn-codes and - warn-agents. - - Systems that generate multiple Warning headers should order them with - this user agent behavior in mind. - - This is a list of the currently-defined warn-codes, each with a - recommended warn-text in English, and a description of its meaning. - -10 Response is stale - MUST be included whenever the returned response is stale. A cache may - add this warning to any response, but may never remove it until the - response is known to be fresh. - -11 Revalidation failed - MUST be included if a cache returns a stale response because an - attempt to revalidate the response failed, due to an inability to - reach the server. A cache may add this warning to any response, but - may never remove it until the response is successfully revalidated. - -12 Disconnected operation - SHOULD be included if the cache is intentionally disconnected from - the rest of the network for a period of time. - -13 Heuristic expiration - MUST be included if the cache heuristically chose a freshness - lifetime greater than 24 hours and the response's age is greater than - 24 hours. - - - - - -Fielding, et. al. Standards Track [Page 138] - -RFC 2068 HTTP/1.1 January 1997 - - -14 Transformation applied - MUST be added by an intermediate cache or proxy if it applies any - transformation changing the content-coding (as specified in the - Content-Encoding header) or media-type (as specified in the - Content-Type header) of the response, unless this Warning code - already appears in the response. MUST NOT be deleted from a response - even after revalidation. - -99 Miscellaneous warning - The warning text may include arbitrary information to be presented to - a human user, or logged. A system receiving this warning MUST NOT - take any automated action. - -14.46 WWW-Authenticate - - The WWW-Authenticate response-header field MUST be included in 401 - (Unauthorized) response messages. The field value consists of at - least one challenge that indicates the authentication scheme(s) and - parameters applicable to the Request-URI. - - WWW-Authenticate = "WWW-Authenticate" ":" 1#challenge - - The HTTP access authentication process is described in section 11. - User agents MUST take special care in parsing the WWW-Authenticate - field value if it contains more than one challenge, or if more than - one WWW-Authenticate header field is provided, since the contents of - a challenge may itself contain a comma-separated list of - authentication parameters. - -15 Security Considerations - - This section is meant to inform application developers, information - providers, and users of the security limitations in HTTP/1.1 as - described by this document. The discussion does not include - definitive solutions to the problems revealed, though it does make - some suggestions for reducing security risks. - -15.1 Authentication of Clients - - The Basic authentication scheme is not a secure method of user - authentication, nor does it in any way protect the entity, which is - transmitted in clear text across the physical network used as the - carrier. HTTP does not prevent additional authentication schemes and - encryption mechanisms from being employed to increase security or the - addition of enhancements (such as schemes to use one-time passwords) - to Basic authentication. - - - - - -Fielding, et. al. Standards Track [Page 139] - -RFC 2068 HTTP/1.1 January 1997 - - - The most serious flaw in Basic authentication is that it results in - the essentially clear text transmission of the user's password over - the physical network. It is this problem which Digest Authentication - attempts to address. - - Because Basic authentication involves the clear text transmission of - passwords it SHOULD never be used (without enhancements) to protect - sensitive or valuable information. - - A common use of Basic authentication is for identification purposes - -- requiring the user to provide a user name and password as a means - of identification, for example, for purposes of gathering accurate - usage statistics on a server. When used in this way it is tempting to - think that there is no danger in its use if illicit access to the - protected documents is not a major concern. This is only correct if - the server issues both user name and password to the users and in - particular does not allow the user to choose his or her own password. - The danger arises because naive users frequently reuse a single - password to avoid the task of maintaining multiple passwords. - - If a server permits users to select their own passwords, then the - threat is not only illicit access to documents on the server but also - illicit access to the accounts of all users who have chosen to use - their account password. If users are allowed to choose their own - password that also means the server must maintain files containing - the (presumably encrypted) passwords. Many of these may be the - account passwords of users perhaps at distant sites. The owner or - administrator of such a system could conceivably incur liability if - this information is not maintained in a secure fashion. - - Basic Authentication is also vulnerable to spoofing by counterfeit - servers. If a user can be led to believe that he is connecting to a - host containing information protected by basic authentication when in - fact he is connecting to a hostile server or gateway then the - attacker can request a password, store it for later use, and feign an - error. This type of attack is not possible with Digest Authentication - [32]. Server implementers SHOULD guard against the possibility of - this sort of counterfeiting by gateways or CGI scripts. In particular - it is very dangerous for a server to simply turn over a connection to - a gateway since that gateway can then use the persistent connection - mechanism to engage in multiple transactions with the client while - impersonating the original server in a way that is not detectable by - the client. - -15.2 Offering a Choice of Authentication Schemes - - An HTTP/1.1 server may return multiple challenges with a 401 - (Authenticate) response, and each challenge may use a different - - - -Fielding, et. al. Standards Track [Page 140] - -RFC 2068 HTTP/1.1 January 1997 - - - scheme. The order of the challenges returned to the user agent is in - the order that the server would prefer they be chosen. The server - should order its challenges with the "most secure" authentication - scheme first. A user agent should choose as the challenge to be made - to the user the first one that the user agent understands. - - When the server offers choices of authentication schemes using the - WWW-Authenticate header, the "security" of the authentication is only - as malicious user could capture the set of challenges and try to - authenticate him/herself using the weakest of the authentication - schemes. Thus, the ordering serves more to protect the user's - credentials than the server's information. - - A possible man-in-the-middle (MITM) attack would be to add a weak - authentication scheme to the set of choices, hoping that the client - will use one that exposes the user's credentials (e.g. password). For - this reason, the client should always use the strongest scheme that - it understands from the choices accepted. - - An even better MITM attack would be to remove all offered choices, - and to insert a challenge that requests Basic authentication. For - this reason, user agents that are concerned about this kind of attack - could remember the strongest authentication scheme ever requested by - a server and produce a warning message that requires user - confirmation before using a weaker one. A particularly insidious way - to mount such a MITM attack would be to offer a "free" proxy caching - service to gullible users. - -15.3 Abuse of Server Log Information - - A server is in the position to save personal data about a user's - requests which may identify their reading patterns or subjects of - interest. This information is clearly confidential in nature and its - handling may be constrained by law in certain countries. People using - the HTTP protocol to provide data are responsible for ensuring that - such material is not distributed without the permission of any - individuals that are identifiable by the published results. - -15.4 Transfer of Sensitive Information - - Like any generic data transfer protocol, HTTP cannot regulate the - content of the data that is transferred, nor is there any a priori - method of determining the sensitivity of any particular piece of - information within the context of any given request. Therefore, - applications SHOULD supply as much control over this information as - possible to the provider of that information. Four header fields are - worth special mention in this context: Server, Via, Referer and From. - - - - -Fielding, et. al. Standards Track [Page 141] - -RFC 2068 HTTP/1.1 January 1997 - - - Revealing the specific software version of the server may allow the - server machine to become more vulnerable to attacks against software - that is known to contain security holes. Implementers SHOULD make the - Server header field a configurable option. - - Proxies which serve as a portal through a network firewall SHOULD - take special precautions regarding the transfer of header information - that identifies the hosts behind the firewall. In particular, they - SHOULD remove, or replace with sanitized versions, any Via fields - generated behind the firewall. - - The Referer field allows reading patterns to be studied and reverse - links drawn. Although it can be very useful, its power can be abused - if user details are not separated from the information contained in - the Referer. Even when the personal information has been removed, the - Referer field may indicate a private document's URI whose publication - would be inappropriate. - - The information sent in the From field might conflict with the user's - privacy interests or their site's security policy, and hence it - SHOULD NOT be transmitted without the user being able to disable, - enable, and modify the contents of the field. The user MUST be able - to set the contents of this field within a user preference or - application defaults configuration. - - We suggest, though do not require, that a convenient toggle interface - be provided for the user to enable or disable the sending of From and - Referer information. - -15.5 Attacks Based On File and Path Names - - Implementations of HTTP origin servers SHOULD be careful to restrict - the documents returned by HTTP requests to be only those that were - intended by the server administrators. If an HTTP server translates - HTTP URIs directly into file system calls, the server MUST take - special care not to serve files that were not intended to be - delivered to HTTP clients. For example, UNIX, Microsoft Windows, and - other operating systems use ".." as a path component to indicate a - directory level above the current one. On such a system, an HTTP - server MUST disallow any such construct in the Request-URI if it - would otherwise allow access to a resource outside those intended to - be accessible via the HTTP server. Similarly, files intended for - reference only internally to the server (such as access control - files, configuration files, and script code) MUST be protected from - inappropriate retrieval, since they might contain sensitive - information. Experience has shown that minor bugs in such HTTP server - implementations have turned into security risks. - - - - -Fielding, et. al. Standards Track [Page 142] - -RFC 2068 HTTP/1.1 January 1997 - - -15.6 Personal Information - - HTTP clients are often privy to large amounts of personal information - (e.g. the user's name, location, mail address, passwords, encryption - keys, etc.), and SHOULD be very careful to prevent unintentional - leakage of this information via the HTTP protocol to other sources. - We very strongly recommend that a convenient interface be provided - for the user to control dissemination of such information, and that - designers and implementers be particularly careful in this area. - History shows that errors in this area are often both serious - security and/or privacy problems, and often generate highly adverse - publicity for the implementer's company. - -15.7 Privacy Issues Connected to Accept Headers - - Accept request-headers can reveal information about the user to all - servers which are accessed. The Accept-Language header in particular - can reveal information the user would consider to be of a private - nature, because the understanding of particular languages is often - strongly correlated to the membership of a particular ethnic group. - User agents which offer the option to configure the contents of an - Accept-Language header to be sent in every request are strongly - encouraged to let the configuration process include a message which - makes the user aware of the loss of privacy involved. - - An approach that limits the loss of privacy would be for a user agent - to omit the sending of Accept-Language headers by default, and to ask - the user whether it should start sending Accept-Language headers to a - server if it detects, by looking for any Vary response-header fields - generated by the server, that such sending could improve the quality - of service. - - Elaborate user-customized accept header fields sent in every request, - in particular if these include quality values, can be used by servers - as relatively reliable and long-lived user identifiers. Such user - identifiers would allow content providers to do click-trail tracking, - and would allow collaborating content providers to match cross-server - click-trails or form submissions of individual users. Note that for - many users not behind a proxy, the network address of the host - running the user agent will also serve as a long-lived user - identifier. In environments where proxies are used to enhance - privacy, user agents should be conservative in offering accept header - configuration options to end users. As an extreme privacy measure, - proxies could filter the accept headers in relayed requests. General - purpose user agents which provide a high degree of header - configurability should warn users about the loss of privacy which can - be involved. - - - - -Fielding, et. al. Standards Track [Page 143] - -RFC 2068 HTTP/1.1 January 1997 - - -15.8 DNS Spoofing - - Clients using HTTP rely heavily on the Domain Name Service, and are - thus generally prone to security attacks based on the deliberate - mis-association of IP addresses and DNS names. Clients need to be - cautious in assuming the continuing validity of an IP number/DNS name - association. - - In particular, HTTP clients SHOULD rely on their name resolver for - confirmation of an IP number/DNS name association, rather than - caching the result of previous host name lookups. Many platforms - already can cache host name lookups locally when appropriate, and - they SHOULD be configured to do so. These lookups should be cached, - however, only when the TTL (Time To Live) information reported by the - name server makes it likely that the cached information will remain - useful. - - If HTTP clients cache the results of host name lookups in order to - achieve a performance improvement, they MUST observe the TTL - information reported by DNS. - - If HTTP clients do not observe this rule, they could be spoofed when - a previously-accessed server's IP address changes. As network - renumbering is expected to become increasingly common, the - possibility of this form of attack will grow. Observing this - requirement thus reduces this potential security vulnerability. - - This requirement also improves the load-balancing behavior of clients - for replicated servers using the same DNS name and reduces the - likelihood of a user's experiencing failure in accessing sites which - use that strategy. - -15.9 Location Headers and Spoofing - - If a single server supports multiple organizations that do not trust - one another, then it must check the values of Location and Content- - Location headers in responses that are generated under control of - said organizations to make sure that they do not attempt to - invalidate resources over which they have no authority. - -16 Acknowledgments - - This specification makes heavy use of the augmented BNF and generic - constructs defined by David H. Crocker for RFC 822. Similarly, it - reuses many of the definitions provided by Nathaniel Borenstein and - Ned Freed for MIME. We hope that their inclusion in this - specification will help reduce past confusion over the relationship - between HTTP and Internet mail message formats. - - - -Fielding, et. al. Standards Track [Page 144] - -RFC 2068 HTTP/1.1 January 1997 - - - The HTTP protocol has evolved considerably over the past four years. - It has benefited from a large and active developer community--the - many people who have participated on the www-talk mailing list--and - it is that community which has been most responsible for the success - of HTTP and of the World-Wide Web in general. Marc Andreessen, Robert - Cailliau, Daniel W. Connolly, Bob Denny, John Franks, Jean-Francois - Groff, Phillip M. Hallam-Baker, Hakon W. Lie, Ari Luotonen, Rob - McCool, Lou Montulli, Dave Raggett, Tony Sanders, and Marc - VanHeyningen deserve special recognition for their efforts in - defining early aspects of the protocol. - - This document has benefited greatly from the comments of all those - participating in the HTTP-WG. In addition to those already mentioned, - the following individuals have contributed to this specification: - - Gary Adams Albert Lunde - Harald Tveit Alvestrand John C. Mallery - Keith Ball Jean-Philippe Martin-Flatin - Brian Behlendorf Larry Masinter - Paul Burchard Mitra - Maurizio Codogno David Morris - Mike Cowlishaw Gavin Nicol - Roman Czyborra Bill Perry - Michael A. Dolan Jeffrey Perry - David J. Fiander Scott Powers - Alan Freier Owen Rees - Marc Hedlund Luigi Rizzo - Greg Herlihy David Robinson - Koen Holtman Marc Salomon - Alex Hopmann Rich Salz - Bob Jernigan Allan M. Schiffman - Shel Kaphan Jim Seidman - Rohit Khare Chuck Shotton - John Klensin Eric W. Sink - Martijn Koster Simon E. Spero - Alexei Kosut Richard N. Taylor - David M. Kristol Robert S. Thau - Daniel LaLiberte Bill (BearHeart) Weinman - Ben Laurie Francois Yergeau - Paul J. Leach Mary Ellen Zurko - Daniel DuBois - - Much of the content and presentation of the caching design is due to - suggestions and comments from individuals including: Shel Kaphan, - Paul Leach, Koen Holtman, David Morris, and Larry Masinter. - - - - - - -Fielding, et. al. Standards Track [Page 145] - -RFC 2068 HTTP/1.1 January 1997 - - - Most of the specification of ranges is based on work originally done - by Ari Luotonen and John Franks, with additional input from Steve - Zilles. - - Thanks to the "cave men" of Palo Alto. You know who you are. - - Jim Gettys (the current editor of this document) wishes particularly - to thank Roy Fielding, the previous editor of this document, along - with John Klensin, Jeff Mogul, Paul Leach, Dave Kristol, Koen - Holtman, John Franks, Alex Hopmann, and Larry Masinter for their - help. - -17 References - - [1] Alvestrand, H., "Tags for the identification of languages", RFC - 1766, UNINETT, March 1995. - - [2] Anklesaria, F., McCahill, M., Lindner, P., Johnson, D., Torrey, - D., and B. Alberti. "The Internet Gopher Protocol: (a distributed - document search and retrieval protocol)", RFC 1436, University of - Minnesota, March 1993. - - [3] Berners-Lee, T., "Universal Resource Identifiers in WWW", A - Unifying Syntax for the Expression of Names and Addresses of Objects - on the Network as used in the World-Wide Web", RFC 1630, CERN, June - 1994. - - [4] Berners-Lee, T., Masinter, L., and M. McCahill, "Uniform Resource - Locators (URL)", RFC 1738, CERN, Xerox PARC, University of Minnesota, - December 1994. - - [5] Berners-Lee, T., and D. Connolly, "HyperText Markup Language - Specification - 2.0", RFC 1866, MIT/LCS, November 1995. - - [6] Berners-Lee, T., Fielding, R., and H. Frystyk, "Hypertext - Transfer Protocol -- HTTP/1.0.", RFC 1945 MIT/LCS, UC Irvine, May - 1996. - - [7] Freed, N., and N. Borenstein, "Multipurpose Internet Mail - Extensions (MIME) Part One: Format of Internet Message Bodies", RFC - 2045, Innosoft, First Virtual, November 1996. - - [8] Braden, R., "Requirements for Internet hosts - application and - support", STD 3, RFC 1123, IETF, October 1989. - - [9] Crocker, D., "Standard for the Format of ARPA Internet Text - Messages", STD 11, RFC 822, UDEL, August 1982. - - - - -Fielding, et. al. Standards Track [Page 146] - -RFC 2068 HTTP/1.1 January 1997 - - - [10] Davis, F., Kahle, B., Morris, H., Salem, J., Shen, T., Wang, R., - Sui, J., and M. Grinbaum. "WAIS Interface Protocol Prototype - Functional Specification", (v1.5), Thinking Machines Corporation, - April 1990. - - [11] Fielding, R., "Relative Uniform Resource Locators", RFC 1808, UC - Irvine, June 1995. - - [12] Horton, M., and R. Adams. "Standard for interchange of USENET - messages", RFC 1036, AT&T Bell Laboratories, Center for Seismic - Studies, December 1987. - - [13] Kantor, B., and P. Lapsley. "Network News Transfer Protocol." A - Proposed Standard for the Stream-Based Transmission of News", RFC - 977, UC San Diego, UC Berkeley, February 1986. - - [14] Moore, K., "MIME (Multipurpose Internet Mail Extensions) Part - Three: Message Header Extensions for Non-ASCII Text", RFC 2047, - University of Tennessee, November 1996. - - [15] Nebel, E., and L. Masinter. "Form-based File Upload in HTML", - RFC 1867, Xerox Corporation, November 1995. - - [16] Postel, J., "Simple Mail Transfer Protocol", STD 10, RFC 821, - USC/ISI, August 1982. - - [17] Postel, J., "Media Type Registration Procedure", RFC 2048, - USC/ISI, November 1996. - - [18] Postel, J., and J. Reynolds, "File Transfer Protocol (FTP)", STD - 9, RFC 959, USC/ISI, October 1985. - - [19] Reynolds, J., and J. Postel, "Assigned Numbers", STD 2, RFC - 1700, USC/ISI, October 1994. - - [20] Sollins, K., and L. Masinter, "Functional Requirements for - Uniform Resource Names", RFC 1737, MIT/LCS, Xerox Corporation, - December 1994. - - [21] US-ASCII. Coded Character Set - 7-Bit American Standard Code for - Information Interchange. Standard ANSI X3.4-1986, ANSI, 1986. - - [22] ISO-8859. International Standard -- Information Processing -- - 8-bit Single-Byte Coded Graphic Character Sets -- - Part 1: Latin alphabet No. 1, ISO 8859-1:1987. - Part 2: Latin alphabet No. 2, ISO 8859-2, 1987. - Part 3: Latin alphabet No. 3, ISO 8859-3, 1988. - Part 4: Latin alphabet No. 4, ISO 8859-4, 1988. - - - -Fielding, et. al. Standards Track [Page 147] - -RFC 2068 HTTP/1.1 January 1997 - - - Part 5: Latin/Cyrillic alphabet, ISO 8859-5, 1988. - Part 6: Latin/Arabic alphabet, ISO 8859-6, 1987. - Part 7: Latin/Greek alphabet, ISO 8859-7, 1987. - Part 8: Latin/Hebrew alphabet, ISO 8859-8, 1988. - Part 9: Latin alphabet No. 5, ISO 8859-9, 1990. - - [23] Meyers, J., and M. Rose "The Content-MD5 Header Field", RFC - 1864, Carnegie Mellon, Dover Beach Consulting, October, 1995. - - [24] Carpenter, B., and Y. Rekhter, "Renumbering Needs Work", RFC - 1900, IAB, February 1996. - - [25] Deutsch, P., "GZIP file format specification version 4.3." RFC - 1952, Aladdin Enterprises, May 1996. - - [26] Venkata N. Padmanabhan and Jeffrey C. Mogul. Improving HTTP - Latency. Computer Networks and ISDN Systems, v. 28, pp. 25-35, Dec. - 1995. Slightly revised version of paper in Proc. 2nd International - WWW Conf. '94: Mosaic and the Web, Oct. 1994, which is available at - http://www.ncsa.uiuc.edu/SDG/IT94/Proceedings/DDay/mogul/ - HTTPLatency.html. - - [27] Joe Touch, John Heidemann, and Katia Obraczka, "Analysis of HTTP - Performance", , - USC/Information Sciences Institute, June 1996 - - [28] Mills, D., "Network Time Protocol, Version 3, Specification, - Implementation and Analysis", RFC 1305, University of Delaware, March - 1992. - - [29] Deutsch, P., "DEFLATE Compressed Data Format Specification - version 1.3." RFC 1951, Aladdin Enterprises, May 1996. - - [30] Spero, S., "Analysis of HTTP Performance Problems" - . - - [31] Deutsch, P., and J-L. Gailly, "ZLIB Compressed Data Format - Specification version 3.3", RFC 1950, Aladdin Enterprises, Info-ZIP, - May 1996. - - [32] Franks, J., Hallam-Baker, P., Hostetler, J., Leach, P., - Luotonen, A., Sink, E., and L. Stewart, "An Extension to HTTP : - Digest Access Authentication", RFC 2069, January 1997. - - - - - - - - -Fielding, et. al. Standards Track [Page 148] - -RFC 2068 HTTP/1.1 January 1997 - - -18 Authors' Addresses - - Roy T. Fielding - Department of Information and Computer Science - University of California - Irvine, CA 92717-3425, USA - - Fax: +1 (714) 824-4056 - EMail: fielding@ics.uci.edu - - - Jim Gettys - MIT Laboratory for Computer Science - 545 Technology Square - Cambridge, MA 02139, USA - - Fax: +1 (617) 258 8682 - EMail: jg@w3.org - - - Jeffrey C. Mogul - Western Research Laboratory - Digital Equipment Corporation - 250 University Avenue - Palo Alto, California, 94305, USA - - EMail: mogul@wrl.dec.com - - - Henrik Frystyk Nielsen - W3 Consortium - MIT Laboratory for Computer Science - 545 Technology Square - Cambridge, MA 02139, USA - - Fax: +1 (617) 258 8682 - EMail: frystyk@w3.org - - - Tim Berners-Lee - Director, W3 Consortium - MIT Laboratory for Computer Science - 545 Technology Square - Cambridge, MA 02139, USA - - Fax: +1 (617) 258 8682 - EMail: timbl@w3.org - - - - -Fielding, et. al. Standards Track [Page 149] - -RFC 2068 HTTP/1.1 January 1997 - - -19 Appendices - -19.1 Internet Media Type message/http - - In addition to defining the HTTP/1.1 protocol, this document serves - as the specification for the Internet media type "message/http". The - following is to be registered with IANA. - - Media Type name: message - Media subtype name: http - Required parameters: none - Optional parameters: version, msgtype - - version: The HTTP-Version number of the enclosed message - (e.g., "1.1"). If not present, the version can be - determined from the first line of the body. - - msgtype: The message type -- "request" or "response". If not - present, the type can be determined from the first - line of the body. - - Encoding considerations: only "7bit", "8bit", or "binary" are - permitted - - Security considerations: none - -19.2 Internet Media Type multipart/byteranges - - When an HTTP message includes the content of multiple ranges (for - example, a response to a request for multiple non-overlapping - ranges), these are transmitted as a multipart MIME message. The - multipart media type for this purpose is called - "multipart/byteranges". - - The multipart/byteranges media type includes two or more parts, each - with its own Content-Type and Content-Range fields. The parts are - separated using a MIME boundary parameter. - - Media Type name: multipart - Media subtype name: byteranges - Required parameters: boundary - Optional parameters: none - - Encoding considerations: only "7bit", "8bit", or "binary" are - permitted - - Security considerations: none - - - - -Fielding, et. al. Standards Track [Page 150] - -RFC 2068 HTTP/1.1 January 1997 - - -For example: - - HTTP/1.1 206 Partial content - Date: Wed, 15 Nov 1995 06:25:24 GMT - Last-modified: Wed, 15 Nov 1995 04:58:08 GMT - Content-type: multipart/byteranges; boundary=THIS_STRING_SEPARATES - - --THIS_STRING_SEPARATES - Content-type: application/pdf - Content-range: bytes 500-999/8000 - - ...the first range... - --THIS_STRING_SEPARATES - Content-type: application/pdf - Content-range: bytes 7000-7999/8000 - - ...the second range - --THIS_STRING_SEPARATES-- - -19.3 Tolerant Applications - - Although this document specifies the requirements for the generation - of HTTP/1.1 messages, not all applications will be correct in their - implementation. We therefore recommend that operational applications - be tolerant of deviations whenever those deviations can be - interpreted unambiguously. - - Clients SHOULD be tolerant in parsing the Status-Line and servers - tolerant when parsing the Request-Line. In particular, they SHOULD - accept any amount of SP or HT characters between fields, even though - only a single SP is required. - - The line terminator for message-header fields is the sequence CRLF. - However, we recommend that applications, when parsing such headers, - recognize a single LF as a line terminator and ignore the leading CR. - - The character set of an entity-body should be labeled as the lowest - common denominator of the character codes used within that body, with - the exception that no label is preferred over the labels US-ASCII or - ISO-8859-1. - - Additional rules for requirements on parsing and encoding of dates - and other potential problems with date encodings include: - - o HTTP/1.1 clients and caches should assume that an RFC-850 date - which appears to be more than 50 years in the future is in fact - in the past (this helps solve the "year 2000" problem). - - - - -Fielding, et. al. Standards Track [Page 151] - -RFC 2068 HTTP/1.1 January 1997 - - - o An HTTP/1.1 implementation may internally represent a parsed - Expires date as earlier than the proper value, but MUST NOT - internally represent a parsed Expires date as later than the - proper value. - - o All expiration-related calculations must be done in GMT. The - local time zone MUST NOT influence the calculation or comparison - of an age or expiration time. - - o If an HTTP header incorrectly carries a date value with a time - zone other than GMT, it must be converted into GMT using the most - conservative possible conversion. - -19.4 Differences Between HTTP Entities and MIME Entities - - HTTP/1.1 uses many of the constructs defined for Internet Mail (RFC - 822) and the Multipurpose Internet Mail Extensions (MIME ) to allow - entities to be transmitted in an open variety of representations and - with extensible mechanisms. However, MIME [7] discusses mail, and - HTTP has a few features that are different from those described in - MIME. These differences were carefully chosen to optimize - performance over binary connections, to allow greater freedom in the - use of new media types, to make date comparisons easier, and to - acknowledge the practice of some early HTTP servers and clients. - - This appendix describes specific areas where HTTP differs from MIME. - Proxies and gateways to strict MIME environments SHOULD be aware of - these differences and provide the appropriate conversions where - necessary. Proxies and gateways from MIME environments to HTTP also - need to be aware of the differences because some conversions may be - required. - -19.4.1 Conversion to Canonical Form - - MIME requires that an Internet mail entity be converted to canonical - form prior to being transferred. Section 3.7.1 of this document - describes the forms allowed for subtypes of the "text" media type - when transmitted over HTTP. MIME requires that content with a type of - "text" represent line breaks as CRLF and forbids the use of CR or LF - outside of line break sequences. HTTP allows CRLF, bare CR, and bare - LF to indicate a line break within text content when a message is - transmitted over HTTP. - - Where it is possible, a proxy or gateway from HTTP to a strict MIME - environment SHOULD translate all line breaks within the text media - types described in section 3.7.1 of this document to the MIME - canonical form of CRLF. Note, however, that this may be complicated - by the presence of a Content-Encoding and by the fact that HTTP - - - -Fielding, et. al. Standards Track [Page 152] - -RFC 2068 HTTP/1.1 January 1997 - - - allows the use of some character sets which do not use octets 13 and - 10 to represent CR and LF, as is the case for some multi-byte - character sets. - -19.4.2 Conversion of Date Formats - - HTTP/1.1 uses a restricted set of date formats (section 3.3.1) to - simplify the process of date comparison. Proxies and gateways from - other protocols SHOULD ensure that any Date header field present in a - message conforms to one of the HTTP/1.1 formats and rewrite the date - if necessary. - -19.4.3 Introduction of Content-Encoding - - MIME does not include any concept equivalent to HTTP/1.1's Content- - Encoding header field. Since this acts as a modifier on the media - type, proxies and gateways from HTTP to MIME-compliant protocols MUST - either change the value of the Content-Type header field or decode - the entity-body before forwarding the message. (Some experimental - applications of Content-Type for Internet mail have used a media-type - parameter of ";conversions=" to perform an equivalent - function as Content-Encoding. However, this parameter is not part of - MIME.) - -19.4.4 No Content-Transfer-Encoding - - HTTP does not use the Content-Transfer-Encoding (CTE) field of MIME. - Proxies and gateways from MIME-compliant protocols to HTTP MUST - remove any non-identity CTE ("quoted-printable" or "base64") encoding - prior to delivering the response message to an HTTP client. - - Proxies and gateways from HTTP to MIME-compliant protocols are - responsible for ensuring that the message is in the correct format - and encoding for safe transport on that protocol, where "safe - transport" is defined by the limitations of the protocol being used. - Such a proxy or gateway SHOULD label the data with an appropriate - Content-Transfer-Encoding if doing so will improve the likelihood of - safe transport over the destination protocol. - -19.4.5 HTTP Header Fields in Multipart Body-Parts - - In MIME, most header fields in multipart body-parts are generally - ignored unless the field name begins with "Content-". In HTTP/1.1, - multipart body-parts may contain any HTTP header fields which are - significant to the meaning of that part. - - - - - - -Fielding, et. al. Standards Track [Page 153] - -RFC 2068 HTTP/1.1 January 1997 - - -19.4.6 Introduction of Transfer-Encoding - - HTTP/1.1 introduces the Transfer-Encoding header field (section - 14.40). Proxies/gateways MUST remove any transfer coding prior to - forwarding a message via a MIME-compliant protocol. - - A process for decoding the "chunked" transfer coding (section 3.6) - can be represented in pseudo-code as: - - length := 0 - read chunk-size, chunk-ext (if any) and CRLF - while (chunk-size > 0) { - read chunk-data and CRLF - append chunk-data to entity-body - length := length + chunk-size - read chunk-size and CRLF - } - read entity-header - while (entity-header not empty) { - append entity-header to existing header fields - read entity-header - } - Content-Length := length - Remove "chunked" from Transfer-Encoding - -19.4.7 MIME-Version - - HTTP is not a MIME-compliant protocol (see appendix 19.4). However, - HTTP/1.1 messages may include a single MIME-Version general-header - field to indicate what version of the MIME protocol was used to - construct the message. Use of the MIME-Version header field indicates - that the message is in full compliance with the MIME protocol. - Proxies/gateways are responsible for ensuring full compliance (where - possible) when exporting HTTP messages to strict MIME environments. - - MIME-Version = "MIME-Version" ":" 1*DIGIT "." 1*DIGIT - - MIME version "1.0" is the default for use in HTTP/1.1. However, - HTTP/1.1 message parsing and semantics are defined by this document - and not the MIME specification. - -19.5 Changes from HTTP/1.0 - - This section summarizes major differences between versions HTTP/1.0 - and HTTP/1.1. - - - - - - -Fielding, et. al. Standards Track [Page 154] - -RFC 2068 HTTP/1.1 January 1997 - - -19.5.1 Changes to Simplify Multi-homed Web Servers and Conserve IP - Addresses - - The requirements that clients and servers support the Host request- - header, report an error if the Host request-header (section 14.23) is - missing from an HTTP/1.1 request, and accept absolute URIs (section - 5.1.2) are among the most important changes defined by this - specification. - - Older HTTP/1.0 clients assumed a one-to-one relationship of IP - addresses and servers; there was no other established mechanism for - distinguishing the intended server of a request than the IP address - to which that request was directed. The changes outlined above will - allow the Internet, once older HTTP clients are no longer common, to - support multiple Web sites from a single IP address, greatly - simplifying large operational Web servers, where allocation of many - IP addresses to a single host has created serious problems. The - Internet will also be able to recover the IP addresses that have been - allocated for the sole purpose of allowing special-purpose domain - names to be used in root-level HTTP URLs. Given the rate of growth of - the Web, and the number of servers already deployed, it is extremely - important that all implementations of HTTP (including updates to - existing HTTP/1.0 applications) correctly implement these - requirements: - - o Both clients and servers MUST support the Host request-header. - - o Host request-headers are required in HTTP/1.1 requests. - - o Servers MUST report a 400 (Bad Request) error if an HTTP/1.1 - request does not include a Host request-header. - - o Servers MUST accept absolute URIs. - - - - - - - - - - - - - - - - - - -Fielding, et. al. Standards Track [Page 155] - -RFC 2068 HTTP/1.1 January 1997 - - -19.6 Additional Features - - This appendix documents protocol elements used by some existing HTTP - implementations, but not consistently and correctly across most - HTTP/1.1 applications. Implementers should be aware of these - features, but cannot rely upon their presence in, or interoperability - with, other HTTP/1.1 applications. Some of these describe proposed - experimental features, and some describe features that experimental - deployment found lacking that are now addressed in the base HTTP/1.1 - specification. - -19.6.1 Additional Request Methods - -19.6.1.1 PATCH - - The PATCH method is similar to PUT except that the entity contains a - list of differences between the original version of the resource - identified by the Request-URI and the desired content of the resource - after the PATCH action has been applied. The list of differences is - in a format defined by the media type of the entity (e.g., - "application/diff") and MUST include sufficient information to allow - the server to recreate the changes necessary to convert the original - version of the resource to the desired version. - - If the request passes through a cache and the Request-URI identifies - a currently cached entity, that entity MUST be removed from the - cache. Responses to this method are not cachable. - - The actual method for determining how the patched resource is placed, - and what happens to its predecessor, is defined entirely by the - origin server. If the original version of the resource being patched - included a Content-Version header field, the request entity MUST - include a Derived-From header field corresponding to the value of the - original Content-Version header field. Applications are encouraged to - use these fields for constructing versioning relationships and - resolving version conflicts. - - PATCH requests must obey the message transmission requirements set - out in section 8.2. - - Caches that implement PATCH should invalidate cached responses as - defined in section 13.10 for PUT. - -19.6.1.2 LINK - - The LINK method establishes one or more Link relationships between - the existing resource identified by the Request-URI and other - existing resources. The difference between LINK and other methods - - - -Fielding, et. al. Standards Track [Page 156] - -RFC 2068 HTTP/1.1 January 1997 - - - allowing links to be established between resources is that the LINK - method does not allow any message-body to be sent in the request and - does not directly result in the creation of new resources. - - If the request passes through a cache and the Request-URI identifies - a currently cached entity, that entity MUST be removed from the - cache. Responses to this method are not cachable. - - Caches that implement LINK should invalidate cached responses as - defined in section 13.10 for PUT. - -19.6.1.3 UNLINK - - The UNLINK method removes one or more Link relationships from the - existing resource identified by the Request-URI. These relationships - may have been established using the LINK method or by any other - method supporting the Link header. The removal of a link to a - resource does not imply that the resource ceases to exist or becomes - inaccessible for future references. - - If the request passes through a cache and the Request-URI identifies - a currently cached entity, that entity MUST be removed from the - cache. Responses to this method are not cachable. - - Caches that implement UNLINK should invalidate cached responses as - defined in section 13.10 for PUT. - -19.6.2 Additional Header Field Definitions - -19.6.2.1 Alternates - - The Alternates response-header field has been proposed as a means for - the origin server to inform the client about other available - representations of the requested resource, along with their - distinguishing attributes, and thus providing a more reliable means - for a user agent to perform subsequent selection of another - representation which better fits the desires of its user (described - as agent-driven negotiation in section 12). - - - - - - - - - - - - - -Fielding, et. al. Standards Track [Page 157] - -RFC 2068 HTTP/1.1 January 1997 - - - The Alternates header field is orthogonal to the Vary header field in - that both may coexist in a message without affecting the - interpretation of the response or the available representations. It - is expected that Alternates will provide a significant improvement - over the server-driven negotiation provided by the Vary field for - those resources that vary over common dimensions like type and - language. - - The Alternates header field will be defined in a future - specification. - -19.6.2.2 Content-Version - - The Content-Version entity-header field defines the version tag - associated with a rendition of an evolving entity. Together with the - Derived-From field described in section 19.6.2.3, it allows a group - of people to work simultaneously on the creation of a work as an - iterative process. The field should be used to allow evolution of a - particular work along a single path rather than derived works or - renditions in different representations. - - Content-Version = "Content-Version" ":" quoted-string - - Examples of the Content-Version field include: - - Content-Version: "2.1.2" - Content-Version: "Fred 19950116-12:26:48" - Content-Version: "2.5a4-omega7" - -19.6.2.3 Derived-From - - The Derived-From entity-header field can be used to indicate the - version tag of the resource from which the enclosed entity was - derived before modifications were made by the sender. This field is - used to help manage the process of merging successive changes to a - resource, particularly when such changes are being made in parallel - and from multiple sources. - - Derived-From = "Derived-From" ":" quoted-string - - An example use of the field is: - - Derived-From: "2.1.1" - - The Derived-From field is required for PUT and PATCH requests if the - entity being sent was previously retrieved from the same URI and a - Content-Version header was included with the entity when it was last - retrieved. - - - -Fielding, et. al. Standards Track [Page 158] - -RFC 2068 HTTP/1.1 January 1997 - - -19.6.2.4 Link - - The Link entity-header field provides a means for describing a - relationship between two resources, generally between the requested - resource and some other resource. An entity MAY include multiple Link - values. Links at the metainformation level typically indicate - relationships like hierarchical structure and navigation paths. The - Link field is semantically equivalent to the element in - HTML.[5] - - Link = "Link" ":" #("<" URI ">" *( ";" link-param ) - - link-param = ( ( "rel" "=" relationship ) - | ( "rev" "=" relationship ) - | ( "title" "=" quoted-string ) - | ( "anchor" "=" <"> URI <"> ) - | ( link-extension ) ) - - link-extension = token [ "=" ( token | quoted-string ) ] - - relationship = sgml-name - | ( <"> sgml-name *( SP sgml-name) <"> ) - - sgml-name = ALPHA *( ALPHA | DIGIT | "." | "-" ) - - Relationship values are case-insensitive and MAY be extended within - the constraints of the sgml-name syntax. The title parameter MAY be - used to label the destination of a link such that it can be used as - identification within a human-readable menu. The anchor parameter MAY - be used to indicate a source anchor other than the entire current - resource, such as a fragment of this resource or a third resource. - - Examples of usage include: - - Link: ; rel="Previous" - - Link: ; rev="Made"; title="Tim Berners-Lee" - - The first example indicates that chapter2 is previous to this - resource in a logical navigation path. The second indicates that the - person responsible for making the resource available is identified by - the given e-mail address. - -19.6.2.5 URI - - The URI header field has, in past versions of this specification, - been used as a combination of the existing Location, Content- - Location, and Vary header fields as well as the future Alternates - - - -Fielding, et. al. Standards Track [Page 159] - -RFC 2068 HTTP/1.1 January 1997 - - - field (above). Its primary purpose has been to include a list of - additional URIs for the resource, including names and mirror - locations. However, it has become clear that the combination of many - different functions within this single field has been a barrier to - consistently and correctly implementing any of those functions. - Furthermore, we believe that the identification of names and mirror - locations would be better performed via the Link header field. The - URI header field is therefore deprecated in favor of those other - fields. - - URI-header = "URI" ":" 1#( "<" URI ">" ) - -19.7 Compatibility with Previous Versions - - It is beyond the scope of a protocol specification to mandate - compliance with previous versions. HTTP/1.1 was deliberately - designed, however, to make supporting previous versions easy. It is - worth noting that at the time of composing this specification, we - would expect commercial HTTP/1.1 servers to: - - o recognize the format of the Request-Line for HTTP/0.9, 1.0, and 1.1 - requests; - - o understand any valid request in the format of HTTP/0.9, 1.0, or - 1.1; - - o respond appropriately with a message in the same major version used - by the client. - - And we would expect HTTP/1.1 clients to: - - o recognize the format of the Status-Line for HTTP/1.0 and 1.1 - responses; - - o understand any valid response in the format of HTTP/0.9, 1.0, or - 1.1. - - For most implementations of HTTP/1.0, each connection is established - by the client prior to the request and closed by the server after - sending the response. A few implementations implement the Keep-Alive - version of persistent connections described in section 19.7.1.1. - - - - - - - - - - -Fielding, et. al. Standards Track [Page 160] - -RFC 2068 HTTP/1.1 January 1997 - - -19.7.1 Compatibility with HTTP/1.0 Persistent Connections - - Some clients and servers may wish to be compatible with some previous - implementations of persistent connections in HTTP/1.0 clients and - servers. Persistent connections in HTTP/1.0 must be explicitly - negotiated as they are not the default behavior. HTTP/1.0 - experimental implementations of persistent connections are faulty, - and the new facilities in HTTP/1.1 are designed to rectify these - problems. The problem was that some existing 1.0 clients may be - sending Keep-Alive to a proxy server that doesn't understand - Connection, which would then erroneously forward it to the next - inbound server, which would establish the Keep-Alive connection and - result in a hung HTTP/1.0 proxy waiting for the close on the - response. The result is that HTTP/1.0 clients must be prevented from - using Keep-Alive when talking to proxies. - - However, talking to proxies is the most important use of persistent - connections, so that prohibition is clearly unacceptable. Therefore, - we need some other mechanism for indicating a persistent connection - is desired, which is safe to use even when talking to an old proxy - that ignores Connection. Persistent connections are the default for - HTTP/1.1 messages; we introduce a new keyword (Connection: close) for - declaring non-persistence. - - The following describes the original HTTP/1.0 form of persistent - connections. - - When it connects to an origin server, an HTTP client MAY send the - Keep-Alive connection-token in addition to the Persist connection- - token: - - Connection: Keep-Alive - - An HTTP/1.0 server would then respond with the Keep-Alive connection - token and the client may proceed with an HTTP/1.0 (or Keep-Alive) - persistent connection. - - An HTTP/1.1 server may also establish persistent connections with - HTTP/1.0 clients upon receipt of a Keep-Alive connection token. - However, a persistent connection with an HTTP/1.0 client cannot make - use of the chunked transfer-coding, and therefore MUST use a - Content-Length for marking the ending boundary of each message. - - A client MUST NOT send the Keep-Alive connection token to a proxy - server as HTTP/1.0 proxy servers do not obey the rules of HTTP/1.1 - for parsing the Connection header field. - - - - - -Fielding, et. al. Standards Track [Page 161] - -RFC 2068 HTTP/1.1 January 1997 - - -19.7.1.1 The Keep-Alive Header - - When the Keep-Alive connection-token has been transmitted with a - request or a response, a Keep-Alive header field MAY also be - included. The Keep-Alive header field takes the following form: - - Keep-Alive-header = "Keep-Alive" ":" 0# keepalive-param - - keepalive-param = param-name "=" value - - The Keep-Alive header itself is optional, and is used only if a - parameter is being sent. HTTP/1.1 does not define any parameters. - - If the Keep-Alive header is sent, the corresponding connection token - MUST be transmitted. The Keep-Alive header MUST be ignored if - received without the connection token. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Fielding, et. al. Standards Track [Page 162] - diff --git a/net/http/rfc2396 b/net/http/rfc2396 deleted file mode 100644 index 5bd52110a..000000000 --- a/net/http/rfc2396 +++ /dev/null @@ -1,2243 +0,0 @@ - - - - - - -Network Working Group T. Berners-Lee -Request for Comments: 2396 MIT/LCS -Updates: 1808, 1738 R. Fielding -Category: Standards Track U.C. Irvine - L. Masinter - Xerox Corporation - August 1998 - - - Uniform Resource Identifiers (URI): Generic Syntax - -Status of this Memo - - This document specifies an Internet standards track protocol for the - Internet community, and requests discussion and suggestions for - improvements. Please refer to the current edition of the "Internet - Official Protocol Standards" (STD 1) for the standardization state - and status of this protocol. Distribution of this memo is unlimited. - -Copyright Notice - - Copyright (C) The Internet Society (1998). All Rights Reserved. - -IESG Note - - This paper describes a "superset" of operations that can be applied - to URI. It consists of both a grammar and a description of basic - functionality for URI. To understand what is a valid URI, both the - grammar and the associated description have to be studied. Some of - the functionality described is not applicable to all URI schemes, and - some operations are only possible when certain media types are - retrieved using the URI, regardless of the scheme used. - -Abstract - - A Uniform Resource Identifier (URI) is a compact string of characters - for identifying an abstract or physical resource. This document - defines the generic syntax of URI, including both absolute and - relative forms, and guidelines for their use; it revises and replaces - the generic definitions in RFC 1738 and RFC 1808. - - This document defines a grammar that is a superset of all valid URI, - such that an implementation can parse the common components of a URI - reference without knowing the scheme-specific requirements of every - possible identifier type. This document does not define a generative - grammar for URI; that task will be performed by the individual - specifications of each URI scheme. - - - - -Berners-Lee, et. al. Standards Track [Page 1] - -RFC 2396 URI Generic Syntax August 1998 - - -1. Introduction - - Uniform Resource Identifiers (URI) provide a simple and extensible - means for identifying a resource. This specification of URI syntax - and semantics is derived from concepts introduced by the World Wide - Web global information initiative, whose use of such objects dates - from 1990 and is described in "Universal Resource Identifiers in WWW" - [RFC1630]. The specification of URI is designed to meet the - recommendations laid out in "Functional Recommendations for Internet - Resource Locators" [RFC1736] and "Functional Requirements for Uniform - Resource Names" [RFC1737]. - - This document updates and merges "Uniform Resource Locators" - [RFC1738] and "Relative Uniform Resource Locators" [RFC1808] in order - to define a single, generic syntax for all URI. It excludes those - portions of RFC 1738 that defined the specific syntax of individual - URL schemes; those portions will be updated as separate documents, as - will the process for registration of new URI schemes. This document - does not discuss the issues and recommendation for dealing with - characters outside of the US-ASCII character set [ASCII]; those - recommendations are discussed in a separate document. - - All significant changes from the prior RFCs are noted in Appendix G. - -1.1 Overview of URI - - URI are characterized by the following definitions: - - Uniform - Uniformity provides several benefits: it allows different types - of resource identifiers to be used in the same context, even - when the mechanisms used to access those resources may differ; - it allows uniform semantic interpretation of common syntactic - conventions across different types of resource identifiers; it - allows introduction of new types of resource identifiers - without interfering with the way that existing identifiers are - used; and, it allows the identifiers to be reused in many - different contexts, thus permitting new applications or - protocols to leverage a pre-existing, large, and widely-used - set of resource identifiers. - - Resource - A resource can be anything that has identity. Familiar - examples include an electronic document, an image, a service - (e.g., "today's weather report for Los Angeles"), and a - collection of other resources. Not all resources are network - "retrievable"; e.g., human beings, corporations, and bound - books in a library can also be considered resources. - - - -Berners-Lee, et. al. Standards Track [Page 2] - -RFC 2396 URI Generic Syntax August 1998 - - - The resource is the conceptual mapping to an entity or set of - entities, not necessarily the entity which corresponds to that - mapping at any particular instance in time. Thus, a resource - can remain constant even when its content---the entities to - which it currently corresponds---changes over time, provided - that the conceptual mapping is not changed in the process. - - Identifier - An identifier is an object that can act as a reference to - something that has identity. In the case of URI, the object is - a sequence of characters with a restricted syntax. - - Having identified a resource, a system may perform a variety of - operations on the resource, as might be characterized by such words - as `access', `update', `replace', or `find attributes'. - -1.2. URI, URL, and URN - - A URI can be further classified as a locator, a name, or both. The - term "Uniform Resource Locator" (URL) refers to the subset of URI - that identify resources via a representation of their primary access - mechanism (e.g., their network "location"), rather than identifying - the resource by name or by some other attribute(s) of that resource. - The term "Uniform Resource Name" (URN) refers to the subset of URI - that are required to remain globally unique and persistent even when - the resource ceases to exist or becomes unavailable. - - The URI scheme (Section 3.1) defines the namespace of the URI, and - thus may further restrict the syntax and semantics of identifiers - using that scheme. This specification defines those elements of the - URI syntax that are either required of all URI schemes or are common - to many URI schemes. It thus defines the syntax and semantics that - are needed to implement a scheme-independent parsing mechanism for - URI references, such that the scheme-dependent handling of a URI can - be postponed until the scheme-dependent semantics are needed. We use - the term URL below when describing syntax or semantics that only - apply to locators. - - Although many URL schemes are named after protocols, this does not - imply that the only way to access the URL's resource is via the named - protocol. Gateways, proxies, caches, and name resolution services - might be used to access some resources, independent of the protocol - of their origin, and the resolution of some URL may require the use - of more than one protocol (e.g., both DNS and HTTP are typically used - to access an "http" URL's resource when it can't be found in a local - cache). - - - - - -Berners-Lee, et. al. Standards Track [Page 3] - -RFC 2396 URI Generic Syntax August 1998 - - - A URN differs from a URL in that it's primary purpose is persistent - labeling of a resource with an identifier. That identifier is drawn - from one of a set of defined namespaces, each of which has its own - set name structure and assignment procedures. The "urn" scheme has - been reserved to establish the requirements for a standardized URN - namespace, as defined in "URN Syntax" [RFC2141] and its related - specifications. - - Most of the examples in this specification demonstrate URL, since - they allow the most varied use of the syntax and often have a - hierarchical namespace. A parser of the URI syntax is capable of - parsing both URL and URN references as a generic URI; once the scheme - is determined, the scheme-specific parsing can be performed on the - generic URI components. In other words, the URI syntax is a superset - of the syntax of all URI schemes. - -1.3. Example URI - - The following examples illustrate URI that are in common use. - - ftp://ftp.is.co.za/rfc/rfc1808.txt - -- ftp scheme for File Transfer Protocol services - - gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles - -- gopher scheme for Gopher and Gopher+ Protocol services - - http://www.math.uio.no/faq/compression-faq/part1.html - -- http scheme for Hypertext Transfer Protocol services - - mailto:mduerst@ifi.unizh.ch - -- mailto scheme for electronic mail addresses - - news:comp.infosystems.www.servers.unix - -- news scheme for USENET news groups and articles - - telnet://melvyl.ucop.edu/ - -- telnet scheme for interactive services via the TELNET Protocol - -1.4. Hierarchical URI and Relative Forms - - An absolute identifier refers to a resource independent of the - context in which the identifier is used. In contrast, a relative - identifier refers to a resource by describing the difference within a - hierarchical namespace between the current context and an absolute - identifier of the resource. - - - - - - -Berners-Lee, et. al. Standards Track [Page 4] - -RFC 2396 URI Generic Syntax August 1998 - - - Some URI schemes support a hierarchical naming system, where the - hierarchy of the name is denoted by a "/" delimiter separating the - components in the scheme. This document defines a scheme-independent - `relative' form of URI reference that can be used in conjunction with - a `base' URI (of a hierarchical scheme) to produce another URI. The - syntax of hierarchical URI is described in Section 3; the relative - URI calculation is described in Section 5. - -1.5. URI Transcribability - - The URI syntax was designed with global transcribability as one of - its main concerns. A URI is a sequence of characters from a very - limited set, i.e. the letters of the basic Latin alphabet, digits, - and a few special characters. A URI may be represented in a variety - of ways: e.g., ink on paper, pixels on a screen, or a sequence of - octets in a coded character set. The interpretation of a URI depends - only on the characters used and not how those characters are - represented in a network protocol. - - The goal of transcribability can be described by a simple scenario. - Imagine two colleagues, Sam and Kim, sitting in a pub at an - international conference and exchanging research ideas. Sam asks Kim - for a location to get more information, so Kim writes the URI for the - research site on a napkin. Upon returning home, Sam takes out the - napkin and types the URI into a computer, which then retrieves the - information to which Kim referred. - - There are several design concerns revealed by the scenario: - - o A URI is a sequence of characters, which is not always - represented as a sequence of octets. - - o A URI may be transcribed from a non-network source, and thus - should consist of characters that are most likely to be able to - be typed into a computer, within the constraints imposed by - keyboards (and related input devices) across languages and - locales. - - o A URI often needs to be remembered by people, and it is easier - for people to remember a URI when it consists of meaningful - components. - - These design concerns are not always in alignment. For example, it - is often the case that the most meaningful name for a URI component - would require characters that cannot be typed into some systems. The - ability to transcribe the resource identifier from one medium to - another was considered more important than having its URI consist of - the most meaningful of components. In local and regional contexts - - - -Berners-Lee, et. al. Standards Track [Page 5] - -RFC 2396 URI Generic Syntax August 1998 - - - and with improving technology, users might benefit from being able to - use a wider range of characters; such use is not defined in this - document. - -1.6. Syntax Notation and Common Elements - - This document uses two conventions to describe and define the syntax - for URI. The first, called the layout form, is a general description - of the order of components and component separators, as in - - /;? - - The component names are enclosed in angle-brackets and any characters - outside angle-brackets are literal separators. Whitespace should be - ignored. These descriptions are used informally and do not define - the syntax requirements. - - The second convention is a BNF-like grammar, used to define the - formal URI syntax. The grammar is that of [RFC822], except that "|" - is used to designate alternatives. Briefly, rules are separated from - definitions by an equal "=", indentation is used to continue a rule - definition over more than one line, literals are quoted with "", - parentheses "(" and ")" are used to group elements, optional elements - are enclosed in "[" and "]" brackets, and elements may be preceded - with * to designate n or more repetitions of the following - element; n defaults to 0. - - Unlike many specifications that use a BNF-like grammar to define the - bytes (octets) allowed by a protocol, the URI grammar is defined in - terms of characters. Each literal in the grammar corresponds to the - character it represents, rather than to the octet encoding of that - character in any particular coded character set. How a URI is - represented in terms of bits and bytes on the wire is dependent upon - the character encoding of the protocol used to transport it, or the - charset of the document which contains it. - - The following definitions are common to many elements: - - alpha = lowalpha | upalpha - - lowalpha = "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | "i" | - "j" | "k" | "l" | "m" | "n" | "o" | "p" | "q" | "r" | - "s" | "t" | "u" | "v" | "w" | "x" | "y" | "z" - - upalpha = "A" | "B" | "C" | "D" | "E" | "F" | "G" | "H" | "I" | - "J" | "K" | "L" | "M" | "N" | "O" | "P" | "Q" | "R" | - "S" | "T" | "U" | "V" | "W" | "X" | "Y" | "Z" - - - - -Berners-Lee, et. al. Standards Track [Page 6] - -RFC 2396 URI Generic Syntax August 1998 - - - digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | - "8" | "9" - - alphanum = alpha | digit - - The complete URI syntax is collected in Appendix A. - -2. URI Characters and Escape Sequences - - URI consist of a restricted set of characters, primarily chosen to - aid transcribability and usability both in computer systems and in - non-computer communications. Characters used conventionally as - delimiters around URI were excluded. The restricted set of - characters consists of digits, letters, and a few graphic symbols - were chosen from those common to most of the character encodings and - input facilities available to Internet users. - - uric = reserved | unreserved | escaped - - Within a URI, characters are either used as delimiters, or to - represent strings of data (octets) within the delimited portions. - Octets are either represented directly by a character (using the US- - ASCII character for that octet [ASCII]) or by an escape encoding. - This representation is elaborated below. - -2.1 URI and non-ASCII characters - - The relationship between URI and characters has been a source of - confusion for characters that are not part of US-ASCII. To describe - the relationship, it is useful to distinguish between a "character" - (as a distinguishable semantic entity) and an "octet" (an 8-bit - byte). There are two mappings, one from URI characters to octets, and - a second from octets to original characters: - - URI character sequence->octet sequence->original character sequence - - A URI is represented as a sequence of characters, not as a sequence - of octets. That is because URI might be "transported" by means that - are not through a computer network, e.g., printed on paper, read over - the radio, etc. - - A URI scheme may define a mapping from URI characters to octets; - whether this is done depends on the scheme. Commonly, within a - delimited component of a URI, a sequence of characters may be used to - represent a sequence of octets. For example, the character "a" - represents the octet 97 (decimal), while the character sequence "%", - "0", "a" represents the octet 10 (decimal). - - - - -Berners-Lee, et. al. Standards Track [Page 7] - -RFC 2396 URI Generic Syntax August 1998 - - - There is a second translation for some resources: the sequence of - octets defined by a component of the URI is subsequently used to - represent a sequence of characters. A 'charset' defines this mapping. - There are many charsets in use in Internet protocols. For example, - UTF-8 [UTF-8] defines a mapping from sequences of octets to sequences - of characters in the repertoire of ISO 10646. - - In the simplest case, the original character sequence contains only - characters that are defined in US-ASCII, and the two levels of - mapping are simple and easily invertible: each 'original character' - is represented as the octet for the US-ASCII code for it, which is, - in turn, represented as either the US-ASCII character, or else the - "%" escape sequence for that octet. - - For original character sequences that contain non-ASCII characters, - however, the situation is more difficult. Internet protocols that - transmit octet sequences intended to represent character sequences - are expected to provide some way of identifying the charset used, if - there might be more than one [RFC2277]. However, there is currently - no provision within the generic URI syntax to accomplish this - identification. An individual URI scheme may require a single - charset, define a default charset, or provide a way to indicate the - charset used. - - It is expected that a systematic treatment of character encoding - within URI will be developed as a future modification of this - specification. - -2.2. Reserved Characters - - Many URI include components consisting of or delimited by, certain - special characters. These characters are called "reserved", since - their usage within the URI component is limited to their reserved - purpose. If the data for a URI component would conflict with the - reserved purpose, then the conflicting data must be escaped before - forming the URI. - - reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | - "$" | "," - - The "reserved" syntax class above refers to those characters that are - allowed within a URI, but which may not be allowed within a - particular component of the generic URI syntax; they are used as - delimiters of the components described in Section 3. - - - - - - - -Berners-Lee, et. al. Standards Track [Page 8] - -RFC 2396 URI Generic Syntax August 1998 - - - Characters in the "reserved" set are not reserved in all contexts. - The set of characters actually reserved within any given URI - component is defined by that component. In general, a character is - reserved if the semantics of the URI changes if the character is - replaced with its escaped US-ASCII encoding. - -2.3. Unreserved Characters - - Data characters that are allowed in a URI but do not have a reserved - purpose are called unreserved. These include upper and lower case - letters, decimal digits, and a limited set of punctuation marks and - symbols. - - unreserved = alphanum | mark - - mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")" - - Unreserved characters can be escaped without changing the semantics - of the URI, but this should not be done unless the URI is being used - in a context that does not allow the unescaped character to appear. - -2.4. Escape Sequences - - Data must be escaped if it does not have a representation using an - unreserved character; this includes data that does not correspond to - a printable character of the US-ASCII coded character set, or that - corresponds to any US-ASCII character that is disallowed, as - explained below. - -2.4.1. Escaped Encoding - - An escaped octet is encoded as a character triplet, consisting of the - percent character "%" followed by the two hexadecimal digits - representing the octet code. For example, "%20" is the escaped - encoding for the US-ASCII space character. - - escaped = "%" hex hex - hex = digit | "A" | "B" | "C" | "D" | "E" | "F" | - "a" | "b" | "c" | "d" | "e" | "f" - -2.4.2. When to Escape and Unescape - - A URI is always in an "escaped" form, since escaping or unescaping a - completed URI might change its semantics. Normally, the only time - escape encodings can safely be made is when the URI is being created - from its component parts; each component may have its own set of - characters that are reserved, so only the mechanism responsible for - generating or interpreting that component can determine whether or - - - -Berners-Lee, et. al. Standards Track [Page 9] - -RFC 2396 URI Generic Syntax August 1998 - - - not escaping a character will change its semantics. Likewise, a URI - must be separated into its components before the escaped characters - within those components can be safely decoded. - - In some cases, data that could be represented by an unreserved - character may appear escaped; for example, some of the unreserved - "mark" characters are automatically escaped by some systems. If the - given URI scheme defines a canonicalization algorithm, then - unreserved characters may be unescaped according to that algorithm. - For example, "%7e" is sometimes used instead of "~" in an http URL - path, but the two are equivalent for an http URL. - - Because the percent "%" character always has the reserved purpose of - being the escape indicator, it must be escaped as "%25" in order to - be used as data within a URI. Implementers should be careful not to - escape or unescape the same string more than once, since unescaping - an already unescaped string might lead to misinterpreting a percent - data character as another escaped character, or vice versa in the - case of escaping an already escaped string. - -2.4.3. Excluded US-ASCII Characters - - Although they are disallowed within the URI syntax, we include here a - description of those US-ASCII characters that have been excluded and - the reasons for their exclusion. - - The control characters in the US-ASCII coded character set are not - used within a URI, both because they are non-printable and because - they are likely to be misinterpreted by some control mechanisms. - - control = - - The space character is excluded because significant spaces may - disappear and insignificant spaces may be introduced when URI are - transcribed or typeset or subjected to the treatment of word- - processing programs. Whitespace is also used to delimit URI in many - contexts. - - space = - - The angle-bracket "<" and ">" and double-quote (") characters are - excluded because they are often used as the delimiters around URI in - text documents and protocol fields. The character "#" is excluded - because it is used to delimit a URI from a fragment identifier in URI - references (Section 4). The percent character "%" is excluded because - it is used for the encoding of escaped characters. - - delims = "<" | ">" | "#" | "%" | <"> - - - -Berners-Lee, et. al. Standards Track [Page 10] - -RFC 2396 URI Generic Syntax August 1998 - - - Other characters are excluded because gateways and other transport - agents are known to sometimes modify such characters, or they are - used as delimiters. - - unwise = "{" | "}" | "|" | "\" | "^" | "[" | "]" | "`" - - Data corresponding to excluded characters must be escaped in order to - be properly represented within a URI. - -3. URI Syntactic Components - - The URI syntax is dependent upon the scheme. In general, absolute - URI are written as follows: - - : - - An absolute URI contains the name of the scheme being used () - followed by a colon (":") and then a string (the ) whose interpretation depends on the scheme. - - The URI syntax does not require that the scheme-specific-part have - any general structure or set of semantics which is common among all - URI. However, a subset of URI do share a common syntax for - representing hierarchical relationships within the namespace. This - "generic URI" syntax consists of a sequence of four main components: - - ://? - - each of which, except , may be absent from a particular URI. - For example, some URI schemes do not allow an component, - and others do not use a component. - - absoluteURI = scheme ":" ( hier_part | opaque_part ) - - URI that are hierarchical in nature use the slash "/" character for - separating hierarchical components. For some file systems, a "/" - character (used to denote the hierarchical structure of a URI) is the - delimiter used to construct a file name hierarchy, and thus the URI - path will look similar to a file pathname. This does NOT imply that - the resource is a file or that the URI maps to an actual filesystem - pathname. - - hier_part = ( net_path | abs_path ) [ "?" query ] - - net_path = "//" authority [ abs_path ] - - abs_path = "/" path_segments - - - - -Berners-Lee, et. al. Standards Track [Page 11] - -RFC 2396 URI Generic Syntax August 1998 - - - URI that do not make use of the slash "/" character for separating - hierarchical components are considered opaque by the generic URI - parser. - - opaque_part = uric_no_slash *uric - - uric_no_slash = unreserved | escaped | ";" | "?" | ":" | "@" | - "&" | "=" | "+" | "$" | "," - - We use the term to refer to both the and - constructs, since they are mutually exclusive for any - given URI and can be parsed as a single component. - -3.1. Scheme Component - - Just as there are many different methods of access to resources, - there are a variety of schemes for identifying such resources. The - URI syntax consists of a sequence of components separated by reserved - characters, with the first component defining the semantics for the - remainder of the URI string. - - Scheme names consist of a sequence of characters beginning with a - lower case letter and followed by any combination of lower case - letters, digits, plus ("+"), period ("."), or hyphen ("-"). For - resiliency, programs interpreting URI should treat upper case letters - as equivalent to lower case in scheme names (e.g., allow "HTTP" as - well as "http"). - - scheme = alpha *( alpha | digit | "+" | "-" | "." ) - - Relative URI references are distinguished from absolute URI in that - they do not begin with a scheme name. Instead, the scheme is - inherited from the base URI, as described in Section 5.2. - -3.2. Authority Component - - Many URI schemes include a top hierarchical element for a naming - authority, such that the namespace defined by the remainder of the - URI is governed by that authority. This authority component is - typically defined by an Internet-based server or a scheme-specific - registry of naming authorities. - - authority = server | reg_name - - The authority component is preceded by a double slash "//" and is - terminated by the next slash "/", question-mark "?", or by the end of - the URI. Within the authority component, the characters ";", ":", - "@", "?", and "/" are reserved. - - - -Berners-Lee, et. al. Standards Track [Page 12] - -RFC 2396 URI Generic Syntax August 1998 - - - An authority component is not required for a URI scheme to make use - of relative references. A base URI without an authority component - implies that any relative reference will also be without an authority - component. - -3.2.1. Registry-based Naming Authority - - The structure of a registry-based naming authority is specific to the - URI scheme, but constrained to the allowed characters for an - authority component. - - reg_name = 1*( unreserved | escaped | "$" | "," | - ";" | ":" | "@" | "&" | "=" | "+" ) - -3.2.2. Server-based Naming Authority - - URL schemes that involve the direct use of an IP-based protocol to a - specified server on the Internet use a common syntax for the server - component of the URI's scheme-specific data: - - @: - - where may consist of a user name and, optionally, scheme- - specific information about how to gain authorization to access the - server. The parts "@" and ":" may be omitted. - - server = [ [ userinfo "@" ] hostport ] - - The user information, if present, is followed by a commercial at-sign - "@". - - userinfo = *( unreserved | escaped | - ";" | ":" | "&" | "=" | "+" | "$" | "," ) - - Some URL schemes use the format "user:password" in the userinfo - field. This practice is NOT RECOMMENDED, because the passing of - authentication information in clear text (such as URI) has proven to - be a security risk in almost every case where it has been used. - - The host is a domain name of a network host, or its IPv4 address as a - set of four decimal digit groups separated by ".". Literal IPv6 - addresses are not supported. - - hostport = host [ ":" port ] - host = hostname | IPv4address - hostname = *( domainlabel "." ) toplabel [ "." ] - domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum - toplabel = alpha | alpha *( alphanum | "-" ) alphanum - - - -Berners-Lee, et. al. Standards Track [Page 13] - -RFC 2396 URI Generic Syntax August 1998 - - - IPv4address = 1*digit "." 1*digit "." 1*digit "." 1*digit - port = *digit - - Hostnames take the form described in Section 3 of [RFC1034] and - Section 2.1 of [RFC1123]: a sequence of domain labels separated by - ".", each domain label starting and ending with an alphanumeric - character and possibly also containing "-" characters. The rightmost - domain label of a fully qualified domain name will never start with a - digit, thus syntactically distinguishing domain names from IPv4 - addresses, and may be followed by a single "." if it is necessary to - distinguish between the complete domain name and any local domain. - To actually be "Uniform" as a resource locator, a URL hostname should - be a fully qualified domain name. In practice, however, the host - component may be a local domain literal. - - Note: A suitable representation for including a literal IPv6 - address as the host part of a URL is desired, but has not yet been - determined or implemented in practice. - - The port is the network port number for the server. Most schemes - designate protocols that have a default port number. Another port - number may optionally be supplied, in decimal, separated from the - host by a colon. If the port is omitted, the default port number is - assumed. - -3.3. Path Component - - The path component contains data, specific to the authority (or the - scheme if there is no authority component), identifying the resource - within the scope of that scheme and authority. - - path = [ abs_path | opaque_part ] - - path_segments = segment *( "/" segment ) - segment = *pchar *( ";" param ) - param = *pchar - - pchar = unreserved | escaped | - ":" | "@" | "&" | "=" | "+" | "$" | "," - - The path may consist of a sequence of path segments separated by a - single slash "/" character. Within a path segment, the characters - "/", ";", "=", and "?" are reserved. Each path segment may include a - sequence of parameters, indicated by the semicolon ";" character. - The parameters are not significant to the parsing of relative - references. - - - - - -Berners-Lee, et. al. Standards Track [Page 14] - -RFC 2396 URI Generic Syntax August 1998 - - -3.4. Query Component - - The query component is a string of information to be interpreted by - the resource. - - query = *uric - - Within a query component, the characters ";", "/", "?", ":", "@", - "&", "=", "+", ",", and "$" are reserved. - -4. URI References - - The term "URI-reference" is used here to denote the common usage of a - resource identifier. A URI reference may be absolute or relative, - and may have additional information attached in the form of a - fragment identifier. However, "the URI" that results from such a - reference includes only the absolute URI after the fragment - identifier (if any) is removed and after any relative URI is resolved - to its absolute form. Although it is possible to limit the - discussion of URI syntax and semantics to that of the absolute - result, most usage of URI is within general URI references, and it is - impossible to obtain the URI from such a reference without also - parsing the fragment and resolving the relative form. - - URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ] - - The syntax for relative URI is a shortened form of that for absolute - URI, where some prefix of the URI is missing and certain path - components ("." and "..") have a special meaning when, and only when, - interpreting a relative path. The relative URI syntax is defined in - Section 5. - -4.1. Fragment Identifier - - When a URI reference is used to perform a retrieval action on the - identified resource, the optional fragment identifier, separated from - the URI by a crosshatch ("#") character, consists of additional - reference information to be interpreted by the user agent after the - retrieval action has been successfully completed. As such, it is not - part of a URI, but is often used in conjunction with a URI. - - fragment = *uric - - The semantics of a fragment identifier is a property of the data - resulting from a retrieval action, regardless of the type of URI used - in the reference. Therefore, the format and interpretation of - fragment identifiers is dependent on the media type [RFC2046] of the - retrieval result. The character restrictions described in Section 2 - - - -Berners-Lee, et. al. Standards Track [Page 15] - -RFC 2396 URI Generic Syntax August 1998 - - - for URI also apply to the fragment in a URI-reference. Individual - media types may define additional restrictions or structure within - the fragment for specifying different types of "partial views" that - can be identified within that media type. - - A fragment identifier is only meaningful when a URI reference is - intended for retrieval and the result of that retrieval is a document - for which the identified fragment is consistently defined. - -4.2. Same-document References - - A URI reference that does not contain a URI is a reference to the - current document. In other words, an empty URI reference within a - document is interpreted as a reference to the start of that document, - and a reference containing only a fragment identifier is a reference - to the identified fragment of that document. Traversal of such a - reference should not result in an additional retrieval action. - However, if the URI reference occurs in a context that is always - intended to result in a new request, as in the case of HTML's FORM - element, then an empty URI reference represents the base URI of the - current document and should be replaced by that URI when transformed - into a request. - -4.3. Parsing a URI Reference - - A URI reference is typically parsed according to the four main - components and fragment identifier in order to determine what - components are present and whether the reference is relative or - absolute. The individual components are then parsed for their - subparts and, if not opaque, to verify their validity. - - Although the BNF defines what is allowed in each component, it is - ambiguous in terms of differentiating between an authority component - and a path component that begins with two slash characters. The - greedy algorithm is used for disambiguation: the left-most matching - rule soaks up as much of the URI reference string as it is capable of - matching. In other words, the authority component wins. - - Readers familiar with regular expressions should see Appendix B for a - concrete parsing example and test oracle. - -5. Relative URI References - - It is often the case that a group or "tree" of documents has been - constructed to serve a common purpose; the vast majority of URI in - these documents point to resources within the tree rather than - - - - - -Berners-Lee, et. al. Standards Track [Page 16] - -RFC 2396 URI Generic Syntax August 1998 - - - outside of it. Similarly, documents located at a particular site are - much more likely to refer to other resources at that site than to - resources at remote sites. - - Relative addressing of URI allows document trees to be partially - independent of their location and access scheme. For instance, it is - possible for a single set of hypertext documents to be simultaneously - accessible and traversable via each of the "file", "http", and "ftp" - schemes if the documents refer to each other using relative URI. - Furthermore, such document trees can be moved, as a whole, without - changing any of the relative references. Experience within the WWW - has demonstrated that the ability to perform relative referencing is - necessary for the long-term usability of embedded URI. - - The syntax for relative URI takes advantage of the syntax - of (Section 3) in order to express a reference that is - relative to the namespace of another hierarchical URI. - - relativeURI = ( net_path | abs_path | rel_path ) [ "?" query ] - - A relative reference beginning with two slash characters is termed a - network-path reference, as defined by in Section 3. Such - references are rarely used. - - A relative reference beginning with a single slash character is - termed an absolute-path reference, as defined by in - Section 3. - - A relative reference that does not begin with a scheme name or a - slash character is termed a relative-path reference. - - rel_path = rel_segment [ abs_path ] - - rel_segment = 1*( unreserved | escaped | - ";" | "@" | "&" | "=" | "+" | "$" | "," ) - - Within a relative-path reference, the complete path segments "." and - ".." have special meanings: "the current hierarchy level" and "the - level above this hierarchy level", respectively. Although this is - very similar to their use within Unix-based filesystems to indicate - directory levels, these path components are only considered special - when resolving a relative-path reference to its absolute form - (Section 5.2). - - Authors should be aware that a path segment which contains a colon - character cannot be used as the first segment of a relative URI path - (e.g., "this:that"), because it would be mistaken for a scheme name. - - - - -Berners-Lee, et. al. Standards Track [Page 17] - -RFC 2396 URI Generic Syntax August 1998 - - - It is therefore necessary to precede such segments with other - segments (e.g., "./this:that") in order for them to be referenced as - a relative path. - - It is not necessary for all URI within a given scheme to be - restricted to the syntax, since the hierarchical - properties of that syntax are only necessary when relative URI are - used within a particular document. Documents can only make use of - relative URI when their base URI fits within the syntax. - It is assumed that any document which contains a relative reference - will also have a base URI that obeys the syntax. In other words, - relative URI cannot be used within a document that has an unsuitable - base URI. - - Some URI schemes do not allow a hierarchical syntax matching the - syntax, and thus cannot use relative references. - -5.1. Establishing a Base URI - - The term "relative URI" implies that there exists some absolute "base - URI" against which the relative reference is applied. Indeed, the - base URI is necessary to define the semantics of any relative URI - reference; without it, a relative reference is meaningless. In order - for relative URI to be usable within a document, the base URI of that - document must be known to the parser. - - The base URI of a document can be established in one of four ways, - listed below in order of precedence. The order of precedence can be - thought of in terms of layers, where the innermost defined base URI - has the highest precedence. This can be visualized graphically as: - - .----------------------------------------------------------. - | .----------------------------------------------------. | - | | .----------------------------------------------. | | - | | | .----------------------------------------. | | | - | | | | .----------------------------------. | | | | - | | | | | | | | | | - | | | | `----------------------------------' | | | | - | | | | (5.1.1) Base URI embedded in the | | | | - | | | | document's content | | | | - | | | `----------------------------------------' | | | - | | | (5.1.2) Base URI of the encapsulating entity | | | - | | | (message, document, or none). | | | - | | `----------------------------------------------' | | - | | (5.1.3) URI used to retrieve the entity | | - | `----------------------------------------------------' | - | (5.1.4) Default Base URI is application-dependent | - `----------------------------------------------------------' - - - -Berners-Lee, et. al. Standards Track [Page 18] - -RFC 2396 URI Generic Syntax August 1998 - - -5.1.1. Base URI within Document Content - - Within certain document media types, the base URI of the document can - be embedded within the content itself such that it can be readily - obtained by a parser. This can be useful for descriptive documents, - such as tables of content, which may be transmitted to others through - protocols other than their usual retrieval context (e.g., E-Mail or - USENET news). - - It is beyond the scope of this document to specify how, for each - media type, the base URI can be embedded. It is assumed that user - agents manipulating such media types will be able to obtain the - appropriate syntax from that media type's specification. An example - of how the base URI can be embedded in the Hypertext Markup Language - (HTML) [RFC1866] is provided in Appendix D. - - A mechanism for embedding the base URI within MIME container types - (e.g., the message and multipart types) is defined by MHTML - [RFC2110]. Protocols that do not use the MIME message header syntax, - but which do allow some form of tagged metainformation to be included - within messages, may define their own syntax for defining the base - URI as part of a message. - -5.1.2. Base URI from the Encapsulating Entity - - If no base URI is embedded, the base URI of a document is defined by - the document's retrieval context. For a document that is enclosed - within another entity (such as a message or another document), the - retrieval context is that entity; thus, the default base URI of the - document is the base URI of the entity in which the document is - encapsulated. - -5.1.3. Base URI from the Retrieval URI - - If no base URI is embedded and the document is not encapsulated - within some other entity (e.g., the top level of a composite entity), - then, if a URI was used to retrieve the base document, that URI shall - be considered the base URI. Note that if the retrieval was the - result of a redirected request, the last URI used (i.e., that which - resulted in the actual retrieval of the document) is the base URI. - -5.1.4. Default Base URI - - If none of the conditions described in Sections 5.1.1--5.1.3 apply, - then the base URI is defined by the context of the application. - Since this definition is necessarily application-dependent, failing - - - - - -Berners-Lee, et. al. Standards Track [Page 19] - -RFC 2396 URI Generic Syntax August 1998 - - - to define the base URI using one of the other methods may result in - the same content being interpreted differently by different types of - application. - - It is the responsibility of the distributor(s) of a document - containing relative URI to ensure that the base URI for that document - can be established. It must be emphasized that relative URI cannot - be used reliably in situations where the document's base URI is not - well-defined. - -5.2. Resolving Relative References to Absolute Form - - This section describes an example algorithm for resolving URI - references that might be relative to a given base URI. - - The base URI is established according to the rules of Section 5.1 and - parsed into the four main components as described in Section 3. Note - that only the scheme component is required to be present in the base - URI; the other components may be empty or undefined. A component is - undefined if its preceding separator does not appear in the URI - reference; the path component is never undefined, though it may be - empty. The base URI's query component is not used by the resolution - algorithm and may be discarded. - - For each URI reference, the following steps are performed in order: - - 1) The URI reference is parsed into the potential four components and - fragment identifier, as described in Section 4.3. - - 2) If the path component is empty and the scheme, authority, and - query components are undefined, then it is a reference to the - current document and we are done. Otherwise, the reference URI's - query and fragment components are defined as found (or not found) - within the URI reference and not inherited from the base URI. - - 3) If the scheme component is defined, indicating that the reference - starts with a scheme name, then the reference is interpreted as an - absolute URI and we are done. Otherwise, the reference URI's - scheme is inherited from the base URI's scheme component. - - Due to a loophole in prior specifications [RFC1630], some parsers - allow the scheme name to be present in a relative URI if it is the - same as the base URI scheme. Unfortunately, this can conflict - with the correct parsing of non-hierarchical URI. For backwards - compatibility, an implementation may work around such references - by removing the scheme if it matches that of the base URI and the - scheme is known to always use the syntax. The parser - - - - -Berners-Lee, et. al. Standards Track [Page 20] - -RFC 2396 URI Generic Syntax August 1998 - - - can then continue with the steps below for the remainder of the - reference components. Validating parsers should mark such a - misformed relative reference as an error. - - 4) If the authority component is defined, then the reference is a - network-path and we skip to step 7. Otherwise, the reference - URI's authority is inherited from the base URI's authority - component, which will also be undefined if the URI scheme does not - use an authority component. - - 5) If the path component begins with a slash character ("/"), then - the reference is an absolute-path and we skip to step 7. - - 6) If this step is reached, then we are resolving a relative-path - reference. The relative path needs to be merged with the base - URI's path. Although there are many ways to do this, we will - describe a simple method using a separate string buffer. - - a) All but the last segment of the base URI's path component is - copied to the buffer. In other words, any characters after the - last (right-most) slash character, if any, are excluded. - - b) The reference's path component is appended to the buffer - string. - - c) All occurrences of "./", where "." is a complete path segment, - are removed from the buffer string. - - d) If the buffer string ends with "." as a complete path segment, - that "." is removed. - - e) All occurrences of "/../", where is a - complete path segment not equal to "..", are removed from the - buffer string. Removal of these path segments is performed - iteratively, removing the leftmost matching pattern on each - iteration, until no matching pattern remains. - - f) If the buffer string ends with "/..", where - is a complete path segment not equal to "..", that - "/.." is removed. - - g) If the resulting buffer string still begins with one or more - complete path segments of "..", then the reference is - considered to be in error. Implementations may handle this - error by retaining these components in the resolved path (i.e., - treating them as part of the final URI), by removing them from - the resolved path (i.e., discarding relative levels above the - root), or by avoiding traversal of the reference. - - - -Berners-Lee, et. al. Standards Track [Page 21] - -RFC 2396 URI Generic Syntax August 1998 - - - h) The remaining buffer string is the reference URI's new path - component. - - 7) The resulting URI components, including any inherited from the - base URI, are recombined to give the absolute form of the URI - reference. Using pseudocode, this would be - - result = "" - - if scheme is defined then - append scheme to result - append ":" to result - - if authority is defined then - append "//" to result - append authority to result - - append path to result - - if query is defined then - append "?" to result - append query to result - - if fragment is defined then - append "#" to result - append fragment to result - - return result - - Note that we must be careful to preserve the distinction between a - component that is undefined, meaning that its separator was not - present in the reference, and a component that is empty, meaning - that the separator was present and was immediately followed by the - next component separator or the end of the reference. - - The above algorithm is intended to provide an example by which the - output of implementations can be tested -- implementation of the - algorithm itself is not required. For example, some systems may find - it more efficient to implement step 6 as a pair of segment stacks - being merged, rather than as a series of string pattern replacements. - - Note: Some WWW client applications will fail to separate the - reference's query component from its path component before merging - the base and reference paths in step 6 above. This may result in - a loss of information if the query component contains the strings - "/../" or "/./". - - Resolution examples are provided in Appendix C. - - - -Berners-Lee, et. al. Standards Track [Page 22] - -RFC 2396 URI Generic Syntax August 1998 - - -6. URI Normalization and Equivalence - - In many cases, different URI strings may actually identify the - identical resource. For example, the host names used in URL are - actually case insensitive, and the URL is - equivalent to . In general, the rules for - equivalence and definition of a normal form, if any, are scheme - dependent. When a scheme uses elements of the common syntax, it will - also use the common syntax equivalence rules, namely that the scheme - and hostname are case insensitive and a URL with an explicit ":port", - where the port is the default for the scheme, is equivalent to one - where the port is elided. - -7. Security Considerations - - A URI does not in itself pose a security threat. Users should beware - that there is no general guarantee that a URL, which at one time - located a given resource, will continue to do so. Nor is there any - guarantee that a URL will not locate a different resource at some - later point in time, due to the lack of any constraint on how a given - authority apportions its namespace. Such a guarantee can only be - obtained from the person(s) controlling that namespace and the - resource in question. A specific URI scheme may include additional - semantics, such as name persistence, if those semantics are required - of all naming authorities for that scheme. - - It is sometimes possible to construct a URL such that an attempt to - perform a seemingly harmless, idempotent operation, such as the - retrieval of an entity associated with the resource, will in fact - cause a possibly damaging remote operation to occur. The unsafe URL - is typically constructed by specifying a port number other than that - reserved for the network protocol in question. The client - unwittingly contacts a site that is in fact running a different - protocol. The content of the URL contains instructions that, when - interpreted according to this other protocol, cause an unexpected - operation. An example has been the use of a gopher URL to cause an - unintended or impersonating message to be sent via a SMTP server. - - Caution should be used when using any URL that specifies a port - number other than the default for the protocol, especially when it is - a number within the reserved space. - - Care should be taken when a URL contains escaped delimiters for a - given protocol (for example, CR and LF characters for telnet - protocols) that these are not unescaped before transmission. This - might violate the protocol, but avoids the potential for such - - - - - -Berners-Lee, et. al. Standards Track [Page 23] - -RFC 2396 URI Generic Syntax August 1998 - - - characters to be used to simulate an extra operation or parameter in - that protocol, which might lead to an unexpected and possibly harmful - remote operation to be performed. - - It is clearly unwise to use a URL that contains a password which is - intended to be secret. In particular, the use of a password within - the 'userinfo' component of a URL is strongly disrecommended except - in those rare cases where the 'password' parameter is intended to be - public. - -8. Acknowledgements - - This document was derived from RFC 1738 [RFC1738] and RFC 1808 - [RFC1808]; the acknowledgements in those specifications still apply. - In addition, contributions by Gisle Aas, Martin Beet, Martin Duerst, - Jim Gettys, Martijn Koster, Dave Kristol, Daniel LaLiberte, Foteos - Macrides, James Marshall, Ryan Moats, Keith Moore, and Lauren Wood - are gratefully acknowledged. - -9. References - - [RFC2277] Alvestrand, H., "IETF Policy on Character Sets and - Languages", BCP 18, RFC 2277, January 1998. - - [RFC1630] Berners-Lee, T., "Universal Resource Identifiers in WWW: A - Unifying Syntax for the Expression of Names and Addresses - of Objects on the Network as used in the World-Wide Web", - RFC 1630, June 1994. - - [RFC1738] Berners-Lee, T., Masinter, L., and M. McCahill, Editors, - "Uniform Resource Locators (URL)", RFC 1738, December 1994. - - [RFC1866] Berners-Lee T., and D. Connolly, "HyperText Markup Language - Specification -- 2.0", RFC 1866, November 1995. - - [RFC1123] Braden, R., Editor, "Requirements for Internet Hosts -- - Application and Support", STD 3, RFC 1123, October 1989. - - [RFC822] Crocker, D., "Standard for the Format of ARPA Internet Text - Messages", STD 11, RFC 822, August 1982. - - [RFC1808] Fielding, R., "Relative Uniform Resource Locators", RFC - 1808, June 1995. - - [RFC2046] Freed, N., and N. Borenstein, "Multipurpose Internet Mail - Extensions (MIME) Part Two: Media Types", RFC 2046, - November 1996. - - - - -Berners-Lee, et. al. Standards Track [Page 24] - -RFC 2396 URI Generic Syntax August 1998 - - - [RFC1736] Kunze, J., "Functional Recommendations for Internet - Resource Locators", RFC 1736, February 1995. - - [RFC2141] Moats, R., "URN Syntax", RFC 2141, May 1997. - - [RFC1034] Mockapetris, P., "Domain Names - Concepts and Facilities", - STD 13, RFC 1034, November 1987. - - [RFC2110] Palme, J., and A. Hopmann, "MIME E-mail Encapsulation of - Aggregate Documents, such as HTML (MHTML)", RFC 2110, March - 1997. - - [RFC1737] Sollins, K., and L. Masinter, "Functional Requirements for - Uniform Resource Names", RFC 1737, December 1994. - - [ASCII] US-ASCII. "Coded Character Set -- 7-bit American Standard - Code for Information Interchange", ANSI X3.4-1986. - - [UTF-8] Yergeau, F., "UTF-8, a transformation format of ISO 10646", - RFC 2279, January 1998. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Berners-Lee, et. al. Standards Track [Page 25] - -RFC 2396 URI Generic Syntax August 1998 - - -10. Authors' Addresses - - Tim Berners-Lee - World Wide Web Consortium - MIT Laboratory for Computer Science, NE43-356 - 545 Technology Square - Cambridge, MA 02139 - - Fax: +1(617)258-8682 - EMail: timbl@w3.org - - - Roy T. Fielding - Department of Information and Computer Science - University of California, Irvine - Irvine, CA 92697-3425 - - Fax: +1(949)824-1715 - EMail: fielding@ics.uci.edu - - - Larry Masinter - Xerox PARC - 3333 Coyote Hill Road - Palo Alto, CA 94034 - - Fax: +1(415)812-4333 - EMail: masinter@parc.xerox.com - - - - - - - - - - - - - - - - - - - - - - - -Berners-Lee, et. al. Standards Track [Page 26] - -RFC 2396 URI Generic Syntax August 1998 - - -A. Collected BNF for URI - - URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ] - absoluteURI = scheme ":" ( hier_part | opaque_part ) - relativeURI = ( net_path | abs_path | rel_path ) [ "?" query ] - - hier_part = ( net_path | abs_path ) [ "?" query ] - opaque_part = uric_no_slash *uric - - uric_no_slash = unreserved | escaped | ";" | "?" | ":" | "@" | - "&" | "=" | "+" | "$" | "," - - net_path = "//" authority [ abs_path ] - abs_path = "/" path_segments - rel_path = rel_segment [ abs_path ] - - rel_segment = 1*( unreserved | escaped | - ";" | "@" | "&" | "=" | "+" | "$" | "," ) - - scheme = alpha *( alpha | digit | "+" | "-" | "." ) - - authority = server | reg_name - - reg_name = 1*( unreserved | escaped | "$" | "," | - ";" | ":" | "@" | "&" | "=" | "+" ) - - server = [ [ userinfo "@" ] hostport ] - userinfo = *( unreserved | escaped | - ";" | ":" | "&" | "=" | "+" | "$" | "," ) - - hostport = host [ ":" port ] - host = hostname | IPv4address - hostname = *( domainlabel "." ) toplabel [ "." ] - domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum - toplabel = alpha | alpha *( alphanum | "-" ) alphanum - IPv4address = 1*digit "." 1*digit "." 1*digit "." 1*digit - port = *digit - - path = [ abs_path | opaque_part ] - path_segments = segment *( "/" segment ) - segment = *pchar *( ";" param ) - param = *pchar - pchar = unreserved | escaped | - ":" | "@" | "&" | "=" | "+" | "$" | "," - - query = *uric - - fragment = *uric - - - -Berners-Lee, et. al. Standards Track [Page 27] - -RFC 2396 URI Generic Syntax August 1998 - - - uric = reserved | unreserved | escaped - reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | - "$" | "," - unreserved = alphanum | mark - mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | - "(" | ")" - - escaped = "%" hex hex - hex = digit | "A" | "B" | "C" | "D" | "E" | "F" | - "a" | "b" | "c" | "d" | "e" | "f" - - alphanum = alpha | digit - alpha = lowalpha | upalpha - - lowalpha = "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | "i" | - "j" | "k" | "l" | "m" | "n" | "o" | "p" | "q" | "r" | - "s" | "t" | "u" | "v" | "w" | "x" | "y" | "z" - upalpha = "A" | "B" | "C" | "D" | "E" | "F" | "G" | "H" | "I" | - "J" | "K" | "L" | "M" | "N" | "O" | "P" | "Q" | "R" | - "S" | "T" | "U" | "V" | "W" | "X" | "Y" | "Z" - digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | - "8" | "9" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Berners-Lee, et. al. Standards Track [Page 28] - -RFC 2396 URI Generic Syntax August 1998 - - -B. Parsing a URI Reference with a Regular Expression - - As described in Section 4.3, the generic URI syntax is not sufficient - to disambiguate the components of some forms of URI. Since the - "greedy algorithm" described in that section is identical to the - disambiguation method used by POSIX regular expressions, it is - natural and commonplace to use a regular expression for parsing the - potential four components and fragment identifier of a URI reference. - - The following line is the regular expression for breaking-down a URI - reference into its components. - - ^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))? - 12 3 4 5 6 7 8 9 - - The numbers in the second line above are only to assist readability; - they indicate the reference points for each subexpression (i.e., each - paired parenthesis). We refer to the value matched for subexpression - as $. For example, matching the above expression to - - http://www.ics.uci.edu/pub/ietf/uri/#Related - - results in the following subexpression matches: - - $1 = http: - $2 = http - $3 = //www.ics.uci.edu - $4 = www.ics.uci.edu - $5 = /pub/ietf/uri/ - $6 = - $7 = - $8 = #Related - $9 = Related - - where indicates that the component is not present, as is - the case for the query component in the above example. Therefore, we - can determine the value of the four components and fragment as - - scheme = $2 - authority = $4 - path = $5 - query = $7 - fragment = $9 - - and, going in the opposite direction, we can recreate a URI reference - from its components using the algorithm in step 7 of Section 5.2. - - - - - -Berners-Lee, et. al. Standards Track [Page 29] - -RFC 2396 URI Generic Syntax August 1998 - - -C. Examples of Resolving Relative URI References - - Within an object with a well-defined base URI of - - http://a/b/c/d;p?q - - the relative URI would be resolved as follows: - -C.1. Normal Examples - - g:h = g:h - g = http://a/b/c/g - ./g = http://a/b/c/g - g/ = http://a/b/c/g/ - /g = http://a/g - //g = http://g - ?y = http://a/b/c/?y - g?y = http://a/b/c/g?y - #s = (current document)#s - g#s = http://a/b/c/g#s - g?y#s = http://a/b/c/g?y#s - ;x = http://a/b/c/;x - g;x = http://a/b/c/g;x - g;x?y#s = http://a/b/c/g;x?y#s - . = http://a/b/c/ - ./ = http://a/b/c/ - .. = http://a/b/ - ../ = http://a/b/ - ../g = http://a/b/g - ../.. = http://a/ - ../../ = http://a/ - ../../g = http://a/g - -C.2. Abnormal Examples - - Although the following abnormal examples are unlikely to occur in - normal practice, all URI parsers should be capable of resolving them - consistently. Each example uses the same base as above. - - An empty reference refers to the start of the current document. - - <> = (current document) - - Parsers must be careful in handling the case where there are more - relative path ".." segments than there are hierarchical levels in the - base URI's path. Note that the ".." syntax cannot be used to change - the authority component of a URI. - - - - -Berners-Lee, et. al. Standards Track [Page 30] - -RFC 2396 URI Generic Syntax August 1998 - - - ../../../g = http://a/../g - ../../../../g = http://a/../../g - - In practice, some implementations strip leading relative symbolic - elements (".", "..") after applying a relative URI calculation, based - on the theory that compensating for obvious author errors is better - than allowing the request to fail. Thus, the above two references - will be interpreted as "http://a/g" by some implementations. - - Similarly, parsers must avoid treating "." and ".." as special when - they are not complete components of a relative path. - - /./g = http://a/./g - /../g = http://a/../g - g. = http://a/b/c/g. - .g = http://a/b/c/.g - g.. = http://a/b/c/g.. - ..g = http://a/b/c/..g - - Less likely are cases where the relative URI uses unnecessary or - nonsensical forms of the "." and ".." complete path segments. - - ./../g = http://a/b/g - ./g/. = http://a/b/c/g/ - g/./h = http://a/b/c/g/h - g/../h = http://a/b/c/h - g;x=1/./y = http://a/b/c/g;x=1/y - g;x=1/../y = http://a/b/c/y - - All client applications remove the query component from the base URI - before resolving relative URI. However, some applications fail to - separate the reference's query and/or fragment components from a - relative path before merging it with the base path. This error is - rarely noticed, since typical usage of a fragment never includes the - hierarchy ("/") character, and the query component is not normally - used within relative references. - - g?y/./x = http://a/b/c/g?y/./x - g?y/../x = http://a/b/c/g?y/../x - g#s/./x = http://a/b/c/g#s/./x - g#s/../x = http://a/b/c/g#s/../x - - - - - - - - - - -Berners-Lee, et. al. Standards Track [Page 31] - -RFC 2396 URI Generic Syntax August 1998 - - - Some parsers allow the scheme name to be present in a relative URI if - it is the same as the base URI scheme. This is considered to be a - loophole in prior specifications of partial URI [RFC1630]. Its use - should be avoided. - - http:g = http:g ; for validating parsers - | http://a/b/c/g ; for backwards compatibility - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Berners-Lee, et. al. Standards Track [Page 32] - -RFC 2396 URI Generic Syntax August 1998 - - -D. Embedding the Base URI in HTML documents - - It is useful to consider an example of how the base URI of a document - can be embedded within the document's content. In this appendix, we - describe how documents written in the Hypertext Markup Language - (HTML) [RFC1866] can include an embedded base URI. This appendix - does not form a part of the URI specification and should not be - considered as anything more than a descriptive example. - - HTML defines a special element "BASE" which, when present in the - "HEAD" portion of a document, signals that the parser should use the - BASE element's "HREF" attribute as the base URI for resolving any - relative URI. The "HREF" attribute must be an absolute URI. Note - that, in HTML, element and attribute names are case-insensitive. For - example: - - - - An example HTML document - - - ... a hypertext anchor ... - - - A parser reading the example document should interpret the given - relative URI "../x" as representing the absolute URI - - - - regardless of the context in which the example document was obtained. - - - - - - - - - - - - - - - - - - - - - -Berners-Lee, et. al. Standards Track [Page 33] - -RFC 2396 URI Generic Syntax August 1998 - - -E. Recommendations for Delimiting URI in Context - - URI are often transmitted through formats that do not provide a clear - context for their interpretation. For example, there are many - occasions when URI are included in plain text; examples include text - sent in electronic mail, USENET news messages, and, most importantly, - printed on paper. In such cases, it is important to be able to - delimit the URI from the rest of the text, and in particular from - punctuation marks that might be mistaken for part of the URI. - - In practice, URI are delimited in a variety of ways, but usually - within double-quotes "http://test.com/", angle brackets - , or just using whitespace - - http://test.com/ - - These wrappers do not form part of the URI. - - In the case where a fragment identifier is associated with a URI - reference, the fragment would be placed within the brackets as well - (separated from the URI with a "#" character). - - In some cases, extra whitespace (spaces, linebreaks, tabs, etc.) may - need to be added to break long URI across lines. The whitespace - should be ignored when extracting the URI. - - No whitespace should be introduced after a hyphen ("-") character. - Because some typesetters and printers may (erroneously) introduce a - hyphen at the end of line when breaking a line, the interpreter of a - URI containing a line break immediately after a hyphen should ignore - all unescaped whitespace around the line break, and should be aware - that the hyphen may or may not actually be part of the URI. - - Using <> angle brackets around each URI is especially recommended as - a delimiting style for URI that contain whitespace. - - The prefix "URL:" (with or without a trailing space) was recommended - as a way to used to help distinguish a URL from other bracketed - designators, although this is not common in practice. - - For robustness, software that accepts user-typed URI should attempt - to recognize and strip both delimiters and embedded whitespace. - - For example, the text: - - - - - - - -Berners-Lee, et. al. Standards Track [Page 34] - -RFC 2396 URI Generic Syntax August 1998 - - - Yes, Jim, I found it under "http://www.w3.org/Addressing/", - but you can probably pick it up from . Note the warning in . - - contains the URI references - - http://www.w3.org/Addressing/ - ftp://ds.internic.net/rfc/ - http://www.ics.uci.edu/pub/ietf/uri/historical.html#WARNING - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Berners-Lee, et. al. Standards Track [Page 35] - -RFC 2396 URI Generic Syntax August 1998 - - -F. Abbreviated URLs - - The URL syntax was designed for unambiguous reference to network - resources and extensibility via the URL scheme. However, as URL - identification and usage have become commonplace, traditional media - (television, radio, newspapers, billboards, etc.) have increasingly - used abbreviated URL references. That is, a reference consisting of - only the authority and path portions of the identified resource, such - as - - www.w3.org/Addressing/ - - or simply the DNS hostname on its own. Such references are primarily - intended for human interpretation rather than machine, with the - assumption that context-based heuristics are sufficient to complete - the URL (e.g., most hostnames beginning with "www" are likely to have - a URL prefix of "http://"). Although there is no standard set of - heuristics for disambiguating abbreviated URL references, many client - implementations allow them to be entered by the user and - heuristically resolved. It should be noted that such heuristics may - change over time, particularly when new URL schemes are introduced. - - Since an abbreviated URL has the same syntax as a relative URL path, - abbreviated URL references cannot be used in contexts where relative - URLs are expected. This limits the use of abbreviated URLs to places - where there is no defined base URL, such as dialog boxes and off-line - advertisements. - - - - - - - - - - - - - - - - - - - - - - - - -Berners-Lee, et. al. Standards Track [Page 36] - -RFC 2396 URI Generic Syntax August 1998 - - -G. Summary of Non-editorial Changes - -G.1. Additions - - Section 4 (URI References) was added to stem the confusion regarding - "what is a URI" and how to describe fragment identifiers given that - they are not part of the URI, but are part of the URI syntax and - parsing concerns. In addition, it provides a reference definition - for use by other IETF specifications (HTML, HTTP, etc.) that have - previously attempted to redefine the URI syntax in order to account - for the presence of fragment identifiers in URI references. - - Section 2.4 was rewritten to clarify a number of misinterpretations - and to leave room for fully internationalized URI. - - Appendix F on abbreviated URLs was added to describe the shortened - references often seen on television and magazine advertisements and - explain why they are not used in other contexts. - -G.2. Modifications from both RFC 1738 and RFC 1808 - - Changed to URI syntax instead of just URL. - - Confusion regarding the terms "character encoding", the URI - "character set", and the escaping of characters with % - equivalents has (hopefully) been reduced. Many of the BNF rule names - regarding the character sets have been changed to more accurately - describe their purpose and to encompass all "characters" rather than - just US-ASCII octets. Unless otherwise noted here, these - modifications do not affect the URI syntax. - - Both RFC 1738 and RFC 1808 refer to the "reserved" set of characters - as if URI-interpreting software were limited to a single set of - characters with a reserved purpose (i.e., as meaning something other - than the data to which the characters correspond), and that this set - was fixed by the URI scheme. However, this has not been true in - practice; any character that is interpreted differently when it is - escaped is, in effect, reserved. Furthermore, the interpreting - engine on a HTTP server is often dependent on the resource, not just - the URI scheme. The description of reserved characters has been - changed accordingly. - - The plus "+", dollar "$", and comma "," characters have been added to - those in the "reserved" set, since they are treated as reserved - within the query component. - - - - - - -Berners-Lee, et. al. Standards Track [Page 37] - -RFC 2396 URI Generic Syntax August 1998 - - - The tilde "~" character was added to those in the "unreserved" set, - since it is extensively used on the Internet in spite of the - difficulty to transcribe it with some keyboards. - - The syntax for URI scheme has been changed to require that all - schemes begin with an alpha character. - - The "user:password" form in the previous BNF was changed to a - "userinfo" token, and the possibility that it might be - "user:password" made scheme specific. In particular, the use of - passwords in the clear is not even suggested by the syntax. - - The question-mark "?" character was removed from the set of allowed - characters for the userinfo in the authority component, since testing - showed that many applications treat it as reserved for separating the - query component from the rest of the URI. - - The semicolon ";" character was added to those stated as being - reserved within the authority component, since several new schemes - are using it as a separator within userinfo to indicate the type of - user authentication. - - RFC 1738 specified that the path was separated from the authority - portion of a URI by a slash. RFC 1808 followed suit, but with a - fudge of carrying around the separator as a "prefix" in order to - describe the parsing algorithm. RFC 1630 never had this problem, - since it considered the slash to be part of the path. In writing - this specification, it was found to be impossible to accurately - describe and retain the difference between the two URI - and - without either considering the slash to be part of the path (as - corresponds to actual practice) or creating a separate component just - to hold that slash. We chose the former. - -G.3. Modifications from RFC 1738 - - The definition of specific URL schemes and their scheme-specific - syntax and semantics has been moved to separate documents. - - The URL host was defined as a fully-qualified domain name. However, - many URLs are used without fully-qualified domain names (in contexts - for which the full qualification is not necessary), without any host - (as in some file URLs), or with a host of "localhost". - - The URL port is now *digit instead of 1*digit, since systems are - expected to handle the case where the ":" separator between host and - port is supplied without a port. - - - - -Berners-Lee, et. al. Standards Track [Page 38] - -RFC 2396 URI Generic Syntax August 1998 - - - The recommendations for delimiting URI in context (Appendix E) have - been adjusted to reflect current practice. - -G.4. Modifications from RFC 1808 - - RFC 1808 (Section 4) defined an empty URL reference (a reference - containing nothing aside from the fragment identifier) as being a - reference to the base URL. Unfortunately, that definition could be - interpreted, upon selection of such a reference, as a new retrieval - action on that resource. Since the normal intent of such references - is for the user agent to change its view of the current document to - the beginning of the specified fragment within that document, not to - make an additional request of the resource, a description of how to - correctly interpret an empty reference has been added in Section 4. - - The description of the mythical Base header field has been replaced - with a reference to the Content-Location header field defined by - MHTML [RFC2110]. - - RFC 1808 described various schemes as either having or not having the - properties of the generic URI syntax. However, the only requirement - is that the particular document containing the relative references - have a base URI that abides by the generic URI syntax, regardless of - the URI scheme, so the associated description has been updated to - reflect that. - - The BNF term has been replaced with , since the - latter more accurately describes its use and purpose. Likewise, the - authority is no longer restricted to the IP server syntax. - - Extensive testing of current client applications demonstrated that - the majority of deployed systems do not use the ";" character to - indicate trailing parameter information, and that the presence of a - semicolon in a path segment does not affect the relative parsing of - that segment. Therefore, parameters have been removed as a separate - component and may now appear in any path segment. Their influence - has been removed from the algorithm for resolving a relative URI - reference. The resolution examples in Appendix C have been modified - to reflect this change. - - Implementations are now allowed to work around misformed relative - references that are prefixed by the same scheme as the base URI, but - only for schemes known to use the syntax. - - - - - - - - -Berners-Lee, et. al. Standards Track [Page 39] - -RFC 2396 URI Generic Syntax August 1998 - - -H. Full Copyright Statement - - Copyright (C) The Internet Society (1998). All Rights Reserved. - - This document and translations of it may be copied and furnished to - others, and derivative works that comment on or otherwise explain it - or assist in its implementation may be prepared, copied, published - and distributed, in whole or in part, without restriction of any - kind, provided that the above copyright notice and this paragraph are - included on all such copies and derivative works. However, this - document itself may not be modified in any way, such as by removing - the copyright notice or references to the Internet Society or other - Internet organizations, except as needed for the purpose of - developing Internet standards in which case the procedures for - copyrights defined in the Internet Standards process must be - followed, or as required to translate it into languages other than - English. - - The limited permissions granted above are perpetual and will not be - revoked by the Internet Society or its successors or assigns. - - This document and the information contained herein is provided on an - "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING - TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING - BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION - HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF - MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - - - - - - - - - - - - - - - - - - - - - - - - -Berners-Lee, et. al. Standards Track [Page 40] - diff --git a/net/http/underlong.c b/net/http/underlong.c new file mode 100644 index 000000000..0d924dbfb --- /dev/null +++ b/net/http/underlong.c @@ -0,0 +1,85 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/intrin/pcmpgtb.h" +#include "libc/intrin/pmovmskb.h" +#include "libc/mem/mem.h" +#include "libc/str/str.h" +#include "libc/str/thompike.h" +#include "libc/str/tpenc.h" +#include "net/http/escape.h" + +/** + * Canonicalizes overlong Thompson-Pike encodings. + * + * Please note that the IETF banned these numbers, so if you want to + * enforce their ban you can simply strcmp() the result to check for + * the existence of banned numbers. + * + * @param p is input value + * @param n if -1 implies strlen + * @param z if non-NULL receives output length + * @return allocated NUL-terminated buffer, or NULL w/ errno + */ +char *Underlong(const char *p, size_t n, size_t *z) { + uint64_t w; + char *r, *q; + size_t i, j, m; + wint_t x, a, b; + int8_t v1[16], v2[16], vz[16]; + if (z) *z = 0; + if (n == -1) n = p ? strlen(p) : 0; + if ((q = r = malloc(n + 1))) { + for (i = 0; i < n;) { + memset(vz, 0, 16); /* 50x speedup for ASCII */ + while (i + 16 < n) { + memcpy(v1, p + i, 16); + pcmpgtb(v2, v1, vz); + if (pmovmskb((void *)v2) != 0xFFFF) break; + memcpy(q, v1, 16); + q += 16; + i += 16; + } + x = p[i++] & 0xff; + if (x >= 0300) { + a = ThomPikeByte(x); + m = ThomPikeLen(x) - 1; + if (i + m <= n) { + for (j = 0;;) { + b = p[i + j] & 0xff; + if (!ThomPikeCont(b)) break; + a = ThomPikeMerge(a, b); + if (++j == m) { + x = a; + i += j; + break; + } + } + } + } + w = tpenc(x); + do { + *q++ = w; + } while ((w >>= 8)); + } + if (z) *z = q - r; + *q++ = '\0'; + if ((q = realloc(r, q - r))) r = q; + } + return r; +} diff --git a/net/http/uri.h b/net/http/uri.h deleted file mode 100644 index 9cb4e224e..000000000 --- a/net/http/uri.h +++ /dev/null @@ -1,118 +0,0 @@ -#ifndef COSMOPOLITAN_NET_HTTP_URI_H_ -#define COSMOPOLITAN_NET_HTTP_URI_H_ -#include "libc/dns/dns.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) -COSMOPOLITAN_C_START_ - -enum UriScheme { - kUriSchemeHttp = 1, - kUriSchemeHttps, - kUriSchemeFile, - kUriSchemeData, - kUriSchemeZip, - kUriSchemeSip, - kUriSchemeSips, - kUriSchemeTel, - kUriSchemeSsh, - kUriSchemeGs, - kUriSchemeS3 -}; - -struct UriSlice { - /* - * !i && !n means absent - * i && !n means empty - */ - unsigned i, n; -}; - -struct UriSlices { - unsigned i, n; - struct UriSlice *p; -}; - -struct UriKeyval { - struct UriSlice k, v; -}; - -struct UriKeyvals { - unsigned i, n; - struct UriKeyval * p; -}; - -struct UriRef { - unsigned r; -}; - -struct UriRefs { - unsigned i, n; - struct UriRef * p; -}; - -struct Uri { - /* - * e.g. "", "http", "sip", "http", "dns+http", etc. - */ - struct UriSlice scheme; - - /* - * Holds remainder for exotic URI schemes, e.g. data. - */ - struct UriSlice opaque; - - /* - * e.g. sip:user@host, //user:pass@host - */ - struct UriSlice userinfo; - - /* - * e.g. "", "example.com", "1.2.3.4", "::1", etc. - */ - struct UriSlice host; - - /* - * e.g. "", "5060", "80", etc. - */ - struct UriSlice port; - - /* - * e.g. /dir/index.html means - * - memcmp("/dir/index.html", - * p + segs.p[0].i, - * (segs.p[segs.i - 1].n + - * (segs.p[segs.i - 1].i - - * segs.p[0].i))) == 0 - * - memcmp("/dir", p + segs.p[0].i, segs.p[0].n) == 0 - * - memcmp("/index.html", p + segs.p[1].i, segs.p[1].n) == 0 - */ - struct UriSlices segs; - - /* e.g. ;lr;isup-oli=00;day=tuesday */ - struct UriKeyvals params; - - /* - * e.g. /dir;super=rare/index.html - * - * let 𝑖 ∈ [0,params.i) - * paramsegs.p[𝑖].r ∈ [0,segs.i] - */ - struct UriRefs paramsegs; - - /* e.g. ?boop&subject=project%20x&lol=cat */ - struct UriKeyvals queries; - - /* e.g. #anchor */ - struct UriSlice fragment; -}; - -int uricspn(const char *data, size_t size); -int uriparse(struct Uri *, const char *, size_t) paramsnonnull((1)); -enum UriScheme urischeme(struct UriSlice, const char *) - paramsnonnull() nosideeffect; -struct UriSlice uripath(const struct Uri *) paramsnonnull() nosideeffect; -char *urislice2cstr(char *, size_t, struct UriSlice, const char *, const char *) - paramsnonnull((1, 4)); - -COSMOPOLITAN_C_END_ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ -#endif /* COSMOPOLITAN_NET_HTTP_URI_H_ */ diff --git a/net/http/uricspn-avx.S b/net/http/uricspn-avx.S deleted file mode 100644 index e03f71a9f..000000000 --- a/net/http/uricspn-avx.S +++ /dev/null @@ -1,61 +0,0 @@ -/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8 -*-│ -│vi: set et ft=asm ts=8 tw=8 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" - -// Verifies buffer contains only URI characters. -// -// @param %rdi is data which should be 32-byte aligned -// @param %rsi is byte length of data -// @return number of kosher bytes -// @cost 10x faster than fastest Ragel code -uricspn$avx: - .leafprologue - .profilable - vmovaps .Luric(%rip),%xmm0 - mov $14,%eax - mov %rsi,%rdx - xor %esi,%esi -0: vmovdqu (%rdi,%rsi),%xmm1 - vmovdqu 16(%rdi,%rsi),%xmm2 - vpcmpestri $0b00010100,%xmm1,%xmm0 - jc 1f - jo 1f - add $16,%rsi - sub $16,%rdx - vpcmpestri $0b00010100,%xmm2,%xmm0 - jc 1f - jo 1f - add $16,%rsi - sub $16,%rdx - jmp 0b -1: lea (%rsi,%rcx),%rax - .leafepilogue - .endfn uricspn$avx,globl,hidden - - .rodata.cst16 -.Luric: .byte '!','!' - .byte '$',';' - .byte '=','=' - .byte '?','Z' - .byte '_','_' - .byte 'a','z' - .byte '~','~' - .byte 0,0 - .endobj .Luric - .previous diff --git a/net/http/uricspn.c b/net/http/uricspn.c deleted file mode 100644 index 502b5e894..000000000 --- a/net/http/uricspn.c +++ /dev/null @@ -1,185 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2021 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/assert.h" -#include "libc/nexgen32e/x86feature.h" -#include "libc/sysv/errfuns.h" -#include "net/http/uri.h" - -/* - * GENERATED BY - * - * ragel -o net/http/uricspn.c net/http/uricspn.rl - * - * TODO(jart): Rewrite in normal C. - */ - -#define static - -/* clang-format off */ - -#line 29 "net/http/uricspn.rl" - -#line 34 "build/bootstrap/net/http/uricspn.c" -static const char _uricspn_key_offsets[] = { - 0, 0 -}; - -static const char _uricspn_trans_keys[] = { - 33, 61, 95, 126, 36, 59, 63, 90, - 97, 122, 0 -}; - -static const char _uricspn_single_lengths[] = { - 0, 4 -}; - -static const char _uricspn_range_lengths[] = { - 0, 3 -}; - -static const char _uricspn_index_offsets[] = { - 0, 0 -}; - -static const char _uricspn_trans_targs[] = { - 1, 1, 1, 1, 1, 1, 1, 0, - 0 -}; - -static const int uricspn_start = 1; -static const int uricspn_first_final = 1; -static const int uricspn_error = 0; - -static const int uricspn_en_machina = 1; - - -#line 30 "net/http/uricspn.rl" -/* clang-format on */ - -int uricspn(const char *data, size_t size) { - int uricspn$avx(const char *, size_t) hidden; - const char *p, *pe; - int cs; - - assert(data || !size); - assert(size <= 0x7ffff000); - assert(size <= 0x7ffff000); - - if (X86_HAVE(AVX)) { - return uricspn$avx(data, size); - } - - p = data; - pe = data + size; - - /* clang-format off */ - - -#line 56 "net/http/uricspn.rl" - - - -#line 94 "build/bootstrap/net/http/uricspn.c" - { - cs = uricspn_start; - } - -#line 59 "net/http/uricspn.rl" - cs = uricspn_en_machina; - -#line 102 "build/bootstrap/net/http/uricspn.c" - { - int _klen; - unsigned int _trans; - const char *_keys; - - if ( p == pe ) - goto _test_eof; - if ( cs == 0 ) - goto _out; -_resume: - _keys = _uricspn_trans_keys + _uricspn_key_offsets[cs]; - _trans = _uricspn_index_offsets[cs]; - - _klen = _uricspn_single_lengths[cs]; - if ( _klen > 0 ) { - const char *_lower = _keys; - const char *_mid; - const char *_upper = _keys + _klen - 1; - while (1) { - if ( _upper < _lower ) - break; - - _mid = _lower + ((_upper-_lower) >> 1); - if ( (*p) < *_mid ) - _upper = _mid - 1; - else if ( (*p) > *_mid ) - _lower = _mid + 1; - else { - _trans += (unsigned int)(_mid - _keys); - goto _match; - } - } - _keys += _klen; - _trans += _klen; - } - - _klen = _uricspn_range_lengths[cs]; - if ( _klen > 0 ) { - const char *_lower = _keys; - const char *_mid; - const char *_upper = _keys + (_klen<<1) - 2; - while (1) { - if ( _upper < _lower ) - break; - - _mid = _lower + (((_upper-_lower) >> 1) & ~1); - if ( (*p) < _mid[0] ) - _upper = _mid - 2; - else if ( (*p) > _mid[1] ) - _lower = _mid + 2; - else { - _trans += (unsigned int)((_mid - _keys)>>1); - goto _match; - } - } - _trans += _klen; - } - -_match: - cs = _uricspn_trans_targs[_trans]; - - if ( cs == 0 ) - goto _out; - if ( ++p != pe ) - goto _resume; - _test_eof: {} - _out: {} - } - -#line 61 "net/http/uricspn.rl" - - /* clang-format on */ - - if (cs >= uricspn_first_final) { - return p - data; - } else { - return einval(); - } -} diff --git a/net/http/uricspn.svgz b/net/http/uricspn.svgz deleted file mode 100644 index f6ab643b4..000000000 Binary files a/net/http/uricspn.svgz and /dev/null differ diff --git a/net/http/uriparse.c b/net/http/uriparse.c deleted file mode 100644 index f3ea440a2..000000000 --- a/net/http/uriparse.c +++ /dev/null @@ -1,724 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2021 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/assert.h" -#include "libc/dce.h" -#include "libc/dns/dns.h" -#include "libc/log/log.h" -#include "libc/str/str.h" -#include "libc/sysv/errfuns.h" -#include "net/http/uri.h" - -/* - * GENERATED BY - * - * ragel -o net/http/uriparse.c net/http/uriparse.rl - * - * TODO(jart): Rewrite in normal C. - */ - -#define static - -/* clang-format off */ - -#line 32 "net/http/uriparse.rl" - -#line 37 "build/bootstrap/net/http/uriparse.c" -static const char _uriparse_actions[] = { - 0, 1, 0, 1, 1, 1, 2, 1, - 3, 1, 4, 1, 5, 1, 6, 1, - 8, 1, 11, 1, 12, 2, 0, 2, - 2, 4, 8, 2, 5, 8, 2, 6, - 9, 2, 6, 10, 2, 7, 9, 2, - 7, 10, 2, 8, 0, 2, 11, 0, - 3, 4, 8, 0, 3, 5, 8, 0, - 3, 6, 9, 0, 3, 7, 9, 0 - -}; - -static const short _uriparse_key_offsets[] = { - 0, 0, 6, 12, 18, 24, 37, 43, - 49, 64, 70, 76, 91, 97, 103, 118, - 124, 130, 145, 151, 157, 169, 188, 202, - 208, 214, 224, 226, 233, 241, 256, 273, - 279, 285, 302, 308, 314, 326, 332, 338, - 357, 371, 377, 383, 393, 395, 410, 416, - 422, 437, 443, 449, 456, 464, 479, 494, - 509, 520, 531, 546, 564, 581, 598, 614, - 625, 630, 634, 653, 671, 689, 707, 727, - 728, 739, 742, 759, 775, 777, 797 -}; - -static const char _uriparse_trans_keys[] = { - 48, 57, 65, 70, 97, 102, 48, 57, - 65, 70, 97, 102, 48, 57, 65, 70, - 97, 102, 48, 57, 65, 70, 97, 102, - 33, 37, 61, 95, 126, 36, 46, 48, - 58, 64, 90, 97, 122, 48, 57, 65, - 70, 97, 102, 48, 57, 65, 70, 97, - 102, 33, 37, 93, 95, 126, 36, 43, - 45, 46, 48, 58, 65, 91, 97, 122, - 48, 57, 65, 70, 97, 102, 48, 57, - 65, 70, 97, 102, 33, 37, 93, 95, - 126, 36, 43, 45, 46, 48, 58, 65, - 91, 97, 122, 48, 57, 65, 70, 97, - 102, 48, 57, 65, 70, 97, 102, 33, - 36, 37, 63, 93, 95, 126, 39, 43, - 45, 58, 65, 91, 97, 122, 48, 57, - 65, 70, 97, 102, 48, 57, 65, 70, - 97, 102, 33, 36, 37, 63, 93, 95, - 126, 39, 43, 45, 58, 65, 91, 97, - 122, 48, 57, 65, 70, 97, 102, 48, - 57, 65, 70, 97, 102, 33, 37, 47, - 61, 95, 126, 36, 58, 64, 90, 97, - 122, 33, 37, 43, 58, 61, 63, 91, - 95, 126, 36, 44, 45, 46, 48, 57, - 65, 90, 97, 122, 33, 37, 61, 64, - 95, 126, 36, 46, 48, 58, 63, 90, - 97, 122, 48, 57, 65, 70, 97, 102, - 48, 57, 65, 70, 97, 102, 43, 91, - 45, 46, 48, 57, 65, 90, 97, 122, - 48, 57, 46, 48, 58, 65, 70, 97, - 102, 46, 93, 48, 58, 65, 70, 97, - 102, 33, 37, 58, 61, 64, 95, 126, - 36, 46, 48, 57, 63, 90, 97, 122, - 33, 37, 38, 44, 47, 61, 64, 91, - 93, 95, 126, 36, 58, 63, 90, 97, - 122, 48, 57, 65, 70, 97, 102, 48, - 57, 65, 70, 97, 102, 33, 37, 38, - 44, 47, 61, 64, 91, 93, 95, 126, - 36, 58, 63, 90, 97, 122, 48, 57, - 65, 70, 97, 102, 48, 57, 65, 70, - 97, 102, 33, 37, 47, 61, 95, 126, - 36, 59, 63, 90, 97, 122, 48, 57, - 65, 70, 97, 102, 48, 57, 65, 70, - 97, 102, 33, 37, 43, 58, 61, 63, - 91, 95, 126, 36, 44, 45, 46, 48, - 57, 65, 90, 97, 122, 33, 37, 61, - 64, 95, 126, 36, 46, 48, 58, 63, - 90, 97, 122, 48, 57, 65, 70, 97, - 102, 48, 57, 65, 70, 97, 102, 43, - 91, 45, 46, 48, 57, 65, 90, 97, - 122, 48, 57, 33, 37, 93, 95, 126, - 36, 43, 45, 46, 48, 58, 65, 91, - 97, 122, 48, 57, 65, 70, 97, 102, - 48, 57, 65, 70, 97, 102, 33, 37, - 93, 95, 126, 36, 43, 45, 46, 48, - 58, 65, 91, 97, 122, 48, 57, 65, - 70, 97, 102, 48, 57, 65, 70, 97, - 102, 46, 48, 58, 65, 70, 97, 102, - 46, 93, 48, 58, 65, 70, 97, 102, - 33, 37, 58, 61, 64, 95, 126, 36, - 46, 48, 57, 63, 90, 97, 122, 33, - 35, 37, 47, 59, 61, 64, 95, 126, - 36, 57, 65, 90, 97, 122, 33, 35, - 37, 47, 59, 61, 63, 95, 126, 36, - 57, 64, 90, 97, 122, 33, 37, 61, - 95, 126, 36, 59, 63, 90, 97, 122, - 33, 37, 61, 95, 126, 36, 59, 63, - 90, 97, 122, 33, 35, 37, 47, 59, - 61, 63, 95, 126, 36, 58, 64, 90, - 97, 122, 33, 35, 37, 47, 59, 61, - 63, 93, 95, 126, 36, 43, 45, 58, - 65, 91, 97, 122, 33, 35, 37, 47, - 59, 63, 93, 95, 126, 36, 43, 45, - 58, 65, 91, 97, 122, 33, 35, 37, - 38, 61, 63, 93, 95, 126, 36, 43, - 45, 58, 65, 91, 97, 122, 33, 35, - 37, 38, 63, 93, 95, 126, 36, 43, - 45, 58, 65, 91, 97, 122, 35, 43, - 47, 58, 63, 45, 57, 65, 90, 97, - 122, 35, 47, 63, 48, 57, 35, 47, - 58, 63, 33, 35, 37, 43, 47, 58, - 61, 63, 64, 95, 126, 36, 44, 45, - 57, 65, 90, 97, 122, 33, 35, 37, - 47, 58, 61, 63, 64, 95, 126, 36, - 46, 48, 57, 65, 90, 97, 122, 33, - 35, 37, 38, 44, 47, 61, 64, 91, - 93, 95, 126, 36, 58, 63, 90, 97, - 122, 33, 35, 37, 38, 44, 47, 61, - 64, 91, 93, 95, 126, 36, 58, 63, - 90, 97, 122, 33, 35, 37, 43, 47, - 58, 59, 61, 63, 64, 95, 126, 36, - 44, 45, 57, 65, 90, 97, 122, 35, - 43, 58, 59, 45, 46, 48, 57, 65, - 90, 97, 122, 59, 48, 57, 33, 37, - 59, 61, 93, 95, 126, 36, 43, 45, - 46, 48, 58, 65, 91, 97, 122, 33, - 37, 59, 93, 95, 126, 36, 43, 45, - 46, 48, 58, 65, 91, 97, 122, 58, - 59, 33, 37, 43, 58, 59, 61, 63, - 64, 95, 126, 36, 44, 45, 46, 48, - 57, 65, 90, 97, 122, 33, 37, 58, - 59, 61, 64, 95, 126, 36, 46, 48, - 57, 63, 90, 97, 122, 0 -}; - -static const char _uriparse_single_lengths[] = { - 0, 0, 0, 0, 0, 5, 0, 0, - 5, 0, 0, 5, 0, 0, 7, 0, - 0, 7, 0, 0, 6, 9, 6, 0, - 0, 2, 0, 1, 2, 7, 11, 0, - 0, 11, 0, 0, 6, 0, 0, 9, - 6, 0, 0, 2, 0, 5, 0, 0, - 5, 0, 0, 1, 2, 7, 9, 9, - 5, 5, 9, 10, 9, 9, 8, 5, - 3, 4, 11, 10, 12, 12, 12, 1, - 3, 1, 7, 6, 2, 10, 8 -}; - -static const char _uriparse_range_lengths[] = { - 0, 3, 3, 3, 3, 4, 3, 3, - 5, 3, 3, 5, 3, 3, 4, 3, - 3, 4, 3, 3, 3, 5, 4, 3, - 3, 4, 1, 3, 3, 4, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 5, - 4, 3, 3, 4, 1, 5, 3, 3, - 5, 3, 3, 3, 3, 4, 3, 3, - 3, 3, 3, 4, 4, 4, 4, 3, - 1, 0, 4, 4, 3, 3, 4, 0, - 4, 1, 5, 5, 0, 5, 4 -}; - -static const short _uriparse_index_offsets[] = { - 0, 0, 4, 8, 12, 16, 26, 30, - 34, 45, 49, 53, 64, 68, 72, 84, - 88, 92, 104, 108, 112, 122, 137, 148, - 152, 156, 163, 165, 170, 176, 188, 203, - 207, 211, 226, 230, 234, 244, 248, 252, - 267, 278, 282, 286, 293, 295, 306, 310, - 314, 325, 329, 333, 338, 344, 356, 369, - 382, 391, 400, 413, 428, 442, 456, 469, - 478, 483, 488, 504, 519, 535, 551, 568, - 570, 578, 581, 594, 606, 609, 625 -}; - -static const unsigned char _uriparse_indicies[] = { - 0, 0, 0, 1, 2, 2, 2, 1, - 3, 3, 3, 1, 4, 4, 4, 1, - 5, 6, 5, 5, 5, 5, 5, 5, - 5, 1, 7, 7, 7, 1, 5, 5, - 5, 1, 8, 9, 8, 8, 8, 8, - 8, 8, 8, 8, 1, 10, 10, 10, - 1, 11, 11, 11, 1, 12, 13, 12, - 12, 12, 12, 12, 12, 12, 12, 1, - 14, 14, 14, 1, 15, 15, 15, 1, - 16, 16, 17, 16, 16, 16, 16, 16, - 16, 16, 16, 1, 18, 18, 18, 1, - 19, 19, 19, 1, 20, 20, 21, 20, - 20, 20, 20, 20, 20, 20, 20, 1, - 22, 22, 22, 1, 23, 23, 23, 1, - 5, 6, 24, 5, 5, 5, 5, 5, - 5, 1, 25, 26, 27, 25, 25, 25, - 28, 25, 25, 25, 27, 27, 27, 27, - 1, 29, 30, 29, 31, 29, 29, 29, - 29, 29, 29, 1, 32, 32, 32, 1, - 29, 29, 29, 1, 33, 28, 33, 33, - 33, 33, 1, 34, 1, 35, 35, 35, - 35, 1, 36, 37, 36, 36, 36, 1, - 29, 30, 29, 29, 31, 29, 29, 29, - 38, 29, 29, 1, 39, 40, 29, 29, - 16, 29, 31, 16, 16, 39, 39, 39, - 39, 39, 1, 41, 41, 41, 1, 42, - 42, 42, 1, 43, 44, 29, 29, 20, - 29, 31, 20, 20, 43, 43, 43, 43, - 43, 1, 45, 45, 45, 1, 46, 46, - 46, 1, 47, 48, 49, 47, 47, 47, - 47, 47, 47, 1, 50, 50, 50, 1, - 47, 47, 47, 1, 51, 52, 53, 51, - 51, 51, 54, 51, 51, 51, 53, 53, - 53, 53, 1, 55, 56, 55, 57, 55, - 55, 55, 55, 55, 55, 1, 58, 58, - 58, 1, 55, 55, 55, 1, 59, 60, - 59, 59, 59, 59, 1, 61, 1, 62, - 63, 62, 62, 62, 62, 62, 62, 62, - 62, 1, 64, 64, 64, 1, 65, 65, - 65, 1, 66, 67, 66, 66, 66, 66, - 66, 66, 66, 66, 1, 68, 68, 68, - 1, 69, 69, 69, 1, 70, 70, 70, - 70, 1, 71, 72, 71, 71, 71, 1, - 55, 56, 55, 55, 57, 55, 55, 55, - 73, 55, 55, 1, 74, 75, 76, 49, - 74, 74, 74, 74, 74, 74, 77, 77, - 1, 4, 78, 79, 80, 4, 4, 81, - 4, 4, 4, 4, 4, 1, 82, 83, - 82, 82, 82, 82, 82, 82, 1, 2, - 84, 2, 2, 2, 2, 2, 2, 1, - 5, 78, 6, 80, 85, 5, 81, 5, - 5, 5, 5, 5, 1, 11, 86, 87, - 88, 89, 90, 91, 11, 11, 11, 11, - 11, 11, 11, 1, 15, 92, 93, 94, - 95, 96, 15, 15, 15, 15, 15, 15, - 15, 1, 19, 97, 98, 99, 100, 19, - 19, 19, 19, 19, 19, 19, 19, 1, - 23, 101, 102, 103, 23, 23, 23, 23, - 23, 23, 23, 23, 1, 104, 105, 106, - 107, 108, 105, 105, 105, 1, 109, 110, - 112, 111, 1, 113, 114, 115, 116, 1, - 29, 104, 30, 117, 106, 118, 29, 119, - 31, 29, 29, 29, 117, 117, 117, 1, - 29, 109, 30, 110, 29, 29, 121, 31, - 29, 29, 29, 120, 29, 29, 1, 42, - 97, 122, 123, 29, 19, 124, 31, 19, - 19, 42, 42, 42, 42, 42, 1, 46, - 101, 125, 126, 29, 23, 29, 31, 23, - 23, 46, 46, 46, 46, 46, 1, 4, - 78, 79, 127, 80, 128, 4, 4, 81, - 4, 4, 4, 4, 127, 127, 127, 1, - 75, 1, 129, 130, 131, 129, 129, 129, - 129, 1, 133, 132, 1, 65, 134, 135, - 136, 65, 65, 65, 65, 65, 65, 65, - 65, 1, 69, 137, 138, 69, 69, 69, - 69, 69, 69, 69, 69, 1, 139, 140, - 1, 55, 56, 141, 142, 131, 55, 55, - 57, 55, 55, 55, 141, 141, 141, 141, - 1, 55, 56, 55, 133, 55, 57, 55, - 55, 55, 143, 55, 55, 1, 0 -}; - -static const char _uriparse_trans_targs[] = { - 2, 0, 57, 4, 55, 58, 6, 7, - 59, 9, 10, 59, 60, 12, 13, 60, - 61, 15, 16, 61, 62, 18, 19, 62, - 21, 22, 23, 66, 27, 22, 23, 25, - 24, 63, 64, 28, 28, 65, 67, 68, - 31, 32, 68, 69, 34, 35, 69, 71, - 37, 20, 38, 40, 41, 77, 51, 40, - 41, 43, 42, 72, 51, 73, 74, 46, - 47, 74, 75, 49, 50, 75, 52, 52, - 76, 78, 55, 56, 3, 70, 56, 3, - 5, 14, 57, 1, 1, 8, 56, 9, - 5, 8, 11, 14, 56, 12, 5, 8, - 14, 56, 15, 14, 17, 56, 18, 14, - 56, 63, 5, 26, 14, 56, 5, 64, - 14, 56, 5, 26, 14, 66, 29, 30, - 67, 30, 31, 30, 33, 34, 30, 70, - 36, 72, 44, 45, 73, 45, 46, 45, - 48, 49, 45, 44, 45, 77, 53, 78 -}; - -static const char _uriparse_trans_actions[] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 1, 1, 0, 0, 1, 1, 0, 0, - 1, 1, 0, 0, 1, 1, 0, 0, - 0, 1, 1, 1, 0, 0, 0, 7, - 0, 1, 1, 1, 0, 9, 1, 1, - 1, 0, 0, 1, 1, 0, 0, 19, - 0, 1, 0, 1, 1, 1, 1, 0, - 0, 7, 0, 1, 0, 1, 1, 1, - 0, 0, 1, 1, 0, 0, 1, 0, - 9, 1, 1, 0, 1, 1, 17, 0, - 45, 17, 1, 1, 0, 17, 30, 0, - 56, 30, 13, 30, 36, 0, 60, 36, - 36, 33, 0, 33, 13, 39, 0, 39, - 24, 0, 48, 9, 24, 27, 52, 0, - 27, 15, 42, 0, 15, 0, 9, 24, - 0, 27, 0, 33, 13, 0, 39, 0, - 3, 0, 9, 9, 0, 11, 0, 30, - 13, 0, 36, 0, 0, 0, 9, 0 -}; - -static const char _uriparse_eof_actions[] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 17, - 21, 5, 17, 30, 36, 33, 39, 24, - 27, 15, 24, 27, 33, 39, 17, 0, - 9, 11, 30, 36, 0, 9, 11 -}; - -static const int uriparse_start = 54; -static const int uriparse_first_final = 54; -static const int uriparse_error = 0; - -static const int uriparse_en_sip = 39; -static const int uriparse_en_uri = 54; - - -#line 33 "net/http/uriparse.rl" -/* clang-format on */ - -/** - * Parses URI. - * - * This is a general URL parser. It's typically used for HTTP. Support - * for the bonus syntax needed by SIP is provided. The whirlwhind tour - * of the URI rabbit hole is as follows: - * - * /foo.html - * //justine.local/foo.html - * http://justine.local/foo.html - * http://bettersearchengine.local/search.cgi?q=my%20query - * file:///etc/passwd - * gs://bucket/object.txt - * zip:///usr/share/zoneinfo/GMT - * sip:127.0.0.1:5060;lr - * sip:+12125650666@gateway.example - * sip:bob%20barker:priceisright@[dead:beef::666]:5060;isup-oli=00 - * data:video/mpeg;base64,gigabytesofhex - * - * This parser operates on slices rather than C strings. It performs - * slicing and validation only. Operations like turning "%20"→" " or - * "80"→80 and perfect hashing can be done later, if needed. - * - * The Uri object is owned by the caller; it has a lifecycle like the - * following: - * - * struct Uri uri; - * memset(&uri, 0, sizeof(uri)); - * - * uriparse(&uri, s1, strlen(s1)); - * CHECK_EQ(kUriSchemeHttp, urischeme(uri->scheme, s1)); - * - * uriparse(&uri, s2, strlen(s2)); - * printf("host = %`.*s\n", uri->host.n, s2 + uri->host.i); - * - * Inner arrays may be granted memory by the caller. The uri->𝐴.i field - * is cleared at the mark of this function. No more than uri->𝐴.n items - * can be inserted. If we need more than that, then ENOMEM is returned - * rather than dynamically extending uri->𝐴.p. However, if uri->𝐴.n==0, - * we assume caller doesn't care about uri->𝐴 and its data is discarded. - * - * @param uri is owned by caller - * @param p is caller-owned uri string; won't copy/alias/mutate - * @return 0 on success, or -1 w/ errno - * @see RFC2396: Uniform Resource Identifiers (URI): Generic Syntax - * @see RFC3261: SIP: Session Initiation Protocol - */ -int uriparse(struct Uri *uri, const char *p, size_t size) { - unsigned zero, cs; - struct UriKeyval kv; - const char *pe, *eof, *buf, *mark; - - assert(p || !size); - assert(size <= 0x7ffff000); - -#define ABSENT ((struct UriSlice){zero, zero}) -#define SLICE ((struct UriSlice){mark - buf, p - mark}) - - cs = zero = VEIL("r", 0u); - eof = pe = (mark = buf = p) + size; - - uri->scheme = ABSENT; - uri->opaque = ABSENT; - uri->userinfo = ABSENT; - uri->host = ABSENT; - uri->port = ABSENT; - uri->fragment = ABSENT; - uri->segs.i = zero; - uri->paramsegs.i = zero; - uri->params.i = zero; - uri->queries.i = zero; - - /* clang-format off */ - - -#line 229 "net/http/uriparse.rl" - - - -#line 435 "build/bootstrap/net/http/uriparse.c" - { - cs = uriparse_start; - } - -#line 232 "net/http/uriparse.rl" - cs = uriparse_en_uri; - -#line 443 "build/bootstrap/net/http/uriparse.c" - { - int _klen; - unsigned int _trans; - const char *_acts; - unsigned int _nacts; - const char *_keys; - - if ( p == pe ) - goto _test_eof; - if ( cs == 0 ) - goto _out; -_resume: - _keys = _uriparse_trans_keys + _uriparse_key_offsets[cs]; - _trans = _uriparse_index_offsets[cs]; - - _klen = _uriparse_single_lengths[cs]; - if ( _klen > 0 ) { - const char *_lower = _keys; - const char *_mid; - const char *_upper = _keys + _klen - 1; - while (1) { - if ( _upper < _lower ) - break; - - _mid = _lower + ((_upper-_lower) >> 1); - if ( (*p) < *_mid ) - _upper = _mid - 1; - else if ( (*p) > *_mid ) - _lower = _mid + 1; - else { - _trans += (unsigned int)(_mid - _keys); - goto _match; - } - } - _keys += _klen; - _trans += _klen; - } - - _klen = _uriparse_range_lengths[cs]; - if ( _klen > 0 ) { - const char *_lower = _keys; - const char *_mid; - const char *_upper = _keys + (_klen<<1) - 2; - while (1) { - if ( _upper < _lower ) - break; - - _mid = _lower + (((_upper-_lower) >> 1) & ~1); - if ( (*p) < _mid[0] ) - _upper = _mid - 2; - else if ( (*p) > _mid[1] ) - _lower = _mid + 2; - else { - _trans += (unsigned int)((_mid - _keys)>>1); - goto _match; - } - } - _trans += _klen; - } - -_match: - _trans = _uriparse_indicies[_trans]; - cs = _uriparse_trans_targs[_trans]; - - if ( _uriparse_trans_actions[_trans] == 0 ) - goto _again; - - _acts = _uriparse_actions + _uriparse_trans_actions[_trans]; - _nacts = (unsigned int) *_acts++; - while ( _nacts-- > 0 ) - { - switch ( *_acts++ ) - { - case 0: -#line 110 "net/http/uriparse.rl" - { mark = p; } - break; - case 1: -#line 111 "net/http/uriparse.rl" - { uri->scheme = SLICE; } - break; - case 3: -#line 113 "net/http/uriparse.rl" - { uri->userinfo = SLICE; } - break; - case 4: -#line 114 "net/http/uriparse.rl" - { uri->host = SLICE; } - break; - case 5: -#line 115 "net/http/uriparse.rl" - { uri->port = SLICE; } - break; - case 6: -#line 117 "net/http/uriparse.rl" - { - kv.k = SLICE; - kv.v = (struct UriSlice){zero, zero}; - } - break; - case 7: -#line 122 "net/http/uriparse.rl" - { - kv.v = SLICE; - } - break; - case 8: -#line 126 "net/http/uriparse.rl" - { - uri->segs.i = zero; - uri->paramsegs.i = zero; - } - break; - case 9: -#line 131 "net/http/uriparse.rl" - { - if (uri->params.n) { - if (uri->params.i < uri->params.n) { - uri->params.p[uri->params.i++] = kv; - } else { - return enomem(); - } - } - } - break; - case 10: -#line 141 "net/http/uriparse.rl" - { - if (uri->queries.n) { - if (uri->queries.i < uri->queries.n) { - uri->queries.p[uri->queries.i++] = kv; - } else { - return enomem(); - } - } - } - break; - case 11: -#line 151 "net/http/uriparse.rl" - { - if (p > mark && uri->segs.n) { - if (uri->segs.i < uri->segs.n) { - uri->segs.p[uri->segs.i++] = SLICE; - } else { - return enomem(); - } - } - } - break; - case 12: -#line 161 "net/http/uriparse.rl" - { - switch (urischeme(uri->scheme, buf)) { - case kUriSchemeSip: - case kUriSchemeSips: - --p; - {cs = 39;goto _again;} - default: - if (uricspn(p, pe - p) == pe - p) { - uri->opaque = (struct UriSlice){p - buf, pe - p}; - return zero; - } else { - return einval(); - } - } - } - break; -#line 611 "build/bootstrap/net/http/uriparse.c" - } - } - -_again: - if ( cs == 0 ) - goto _out; - if ( ++p != pe ) - goto _resume; - _test_eof: {} - if ( p == eof ) - { - const char *__acts = _uriparse_actions + _uriparse_eof_actions[cs]; - unsigned int __nacts = (unsigned int) *__acts++; - while ( __nacts-- > 0 ) { - switch ( *__acts++ ) { - case 0: -#line 110 "net/http/uriparse.rl" - { mark = p; } - break; - case 2: -#line 112 "net/http/uriparse.rl" - { uri->fragment = SLICE; } - break; - case 4: -#line 114 "net/http/uriparse.rl" - { uri->host = SLICE; } - break; - case 5: -#line 115 "net/http/uriparse.rl" - { uri->port = SLICE; } - break; - case 6: -#line 117 "net/http/uriparse.rl" - { - kv.k = SLICE; - kv.v = (struct UriSlice){zero, zero}; - } - break; - case 7: -#line 122 "net/http/uriparse.rl" - { - kv.v = SLICE; - } - break; - case 8: -#line 126 "net/http/uriparse.rl" - { - uri->segs.i = zero; - uri->paramsegs.i = zero; - } - break; - case 9: -#line 131 "net/http/uriparse.rl" - { - if (uri->params.n) { - if (uri->params.i < uri->params.n) { - uri->params.p[uri->params.i++] = kv; - } else { - return enomem(); - } - } - } - break; - case 10: -#line 141 "net/http/uriparse.rl" - { - if (uri->queries.n) { - if (uri->queries.i < uri->queries.n) { - uri->queries.p[uri->queries.i++] = kv; - } else { - return enomem(); - } - } - } - break; - case 11: -#line 151 "net/http/uriparse.rl" - { - if (p > mark && uri->segs.n) { - if (uri->segs.i < uri->segs.n) { - uri->segs.p[uri->segs.i++] = SLICE; - } else { - return enomem(); - } - } - } - break; -#line 699 "build/bootstrap/net/http/uriparse.c" - } - } - } - - _out: {} - } - -#line 234 "net/http/uriparse.rl" - - /* clang-format on */ - - if (cs >= uriparse_first_final) { - if (uri->host.n <= DNS_NAME_MAX && uri->port.n <= 6) { - return zero; - } else { - return eoverflow(); - } - } else { - return einval(); - } -} diff --git a/net/http/uriparse.rl b/net/http/uriparse.rl deleted file mode 100644 index 04133c16e..000000000 --- a/net/http/uriparse.rl +++ /dev/null @@ -1,247 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/assert.h" -#include "libc/dce.h" -#include "libc/dns/dns.h" -#include "libc/log/log.h" -#include "libc/str/str.h" -#include "libc/sysv/errfuns.h" -#include "net/http/uri.h" - -/* TODO(jart): Rewrite in C */ - -#define static - -/* clang-format off */ -%% machine uriparse; -%% write data; -/* clang-format on */ - -/** - * Parses URI. - * - * This is a general URL parser. It's typically used for HTTP. Support - * for the bonus syntax needed by SIP is provided. The whirlwhind tour - * of the URI rabbit hole is as follows: - * - * /foo.html - * //justine.local/foo.html - * http://justine.local/foo.html - * http://bettersearchengine.local/search.cgi?q=my%20query - * file:///etc/passwd - * gs://bucket/object.txt - * zip:///usr/share/zoneinfo/GMT - * sip:127.0.0.1:5060;lr - * sip:+12125650666@gateway.example - * sip:bob%20barker:priceisright@[dead:beef::666]:5060;isup-oli=00 - * data:video/mpeg;base64,gigabytesofhex - * - * This parser operates on slices rather than C strings. It performs - * slicing and validation only. Operations like turning "%20"→" " or - * "80"→80 and perfect hashing can be done later, if needed. - * - * The Uri object is owned by the caller; it has a lifecycle like the - * following: - * - * struct Uri uri; - * memset(&uri, 0, sizeof(uri)); - * - * uriparse(&uri, s1, strlen(s1)); - * CHECK_EQ(kUriSchemeHttp, urischeme(uri->scheme, s1)); - * - * uriparse(&uri, s2, strlen(s2)); - * printf("host = %`.*s\n", uri->host.n, s2 + uri->host.i); - * - * Inner arrays may be granted memory by the caller. The uri->𝐴.i field - * is cleared at the mark of this function. No more than uri->𝐴.n items - * can be inserted. If we need more than that, then ENOMEM is returned - * rather than dynamically extending uri->𝐴.p. However, if uri->𝐴.n==0, - * we assume caller doesn't care about uri->𝐴 and its data is discarded. - * - * @param uri is owned by caller - * @param p is caller-owned uri string; won't copy/alias/mutate - * @return 0 on success, or -1 w/ errno - * @see RFC2396: Uniform Resource Identifiers (URI): Generic Syntax - * @see RFC3261: SIP: Session Initiation Protocol - */ -int uriparse(struct Uri *uri, const char *p, size_t size) { - unsigned zero, cs; - struct UriKeyval kv; - const char *pe, *eof, *buf, *mark; - - assert(p || !size); - assert(size <= 0x7ffff000); - -#define ABSENT ((struct UriSlice){zero, zero}) -#define SLICE ((struct UriSlice){mark - buf, p - mark}) - - cs = zero = VEIL("r", 0u); - eof = pe = (mark = buf = p) + size; - - uri->scheme = ABSENT; - uri->opaque = ABSENT; - uri->userinfo = ABSENT; - uri->host = ABSENT; - uri->port = ABSENT; - uri->fragment = ABSENT; - uri->segs.i = zero; - uri->paramsegs.i = zero; - uri->params.i = zero; - uri->queries.i = zero; - - /* clang-format off */ - - %%{ - action Mark { mark = p; } - action SetScheme { uri->scheme = SLICE; } - action SetFragment { uri->fragment = SLICE; } - action SetUserinfo { uri->userinfo = SLICE; } - action SetHost { uri->host = SLICE; } - action SetPort { uri->port = SLICE; } - - action SetKey { - kv.k = SLICE; - kv.v = (struct UriSlice){zero, zero}; - } - - action SetVal { - kv.v = SLICE; - } - - action RestartSegs { - uri->segs.i = zero; - uri->paramsegs.i = zero; - } - - action AppendParam { - if (uri->params.n) { - if (uri->params.i < uri->params.n) { - uri->params.p[uri->params.i++] = kv; - } else { - return enomem(); - } - } - } - - action AppendQuery { - if (uri->queries.n) { - if (uri->queries.i < uri->queries.n) { - uri->queries.p[uri->queries.i++] = kv; - } else { - return enomem(); - } - } - } - - action AppendSegment { - if (p > mark && uri->segs.n) { - if (uri->segs.i < uri->segs.n) { - uri->segs.p[uri->segs.i++] = SLICE; - } else { - return enomem(); - } - } - } - - action HandleOpaquePart { - switch (urischeme(uri->scheme, buf)) { - case kUriSchemeSip: - case kUriSchemeSips: - --p; - fgoto sip; - default: - if (uricspn(p, pe - p) == pe - p) { - uri->opaque = (struct UriSlice){p - buf, pe - p}; - return zero; - } else { - return einval(); - } - } - } - - mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"; - reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | ","; - unreserved = alnum | mark; - ipv4c = digit | "."; - ipv6c = xdigit | "." | ":"; - hostc = alnum | "-" | "."; - telc = digit | "+" | "-"; - schemec = alnum | "+" | "-" | "."; - userinfoc = unreserved | "&" | "=" | "+" | "$" | "," | "?" | ":"; - paramc = unreserved | "[" | "]" | ":" | "&" | "+" | "$"; - queryc = unreserved | "[" | "]" | "/" | "?" | ":" | "+" | "$"; - pathc = unreserved | ":" | "@" | "&" | "=" | "+" | "$" | ","; - relc = unreserved | ";" | "@" | "&" | "=" | "+" | "$" | ","; - uric = reserved | unreserved; - - escaped = "%" xdigit xdigit; - pathchar = escaped | pathc; - urichar = escaped | uric; - relchar = escaped | relc; - userinfochar = escaped | userinfoc; - paramchar = escaped | paramc; - querychar = escaped | queryc; - - paramkey = paramchar+ >Mark %SetKey; - paramval = paramchar+ >Mark %SetVal; - param = ";" paramkey ( "=" paramval )? %AppendParam; - - querykey = querychar+ >Mark %SetKey; - queryval = querychar+ >Mark %SetVal; - query = querykey ( "=" queryval )? %AppendQuery; - queries = "?" query ( "&" query )*; - - scheme = ( alpha @Mark schemec* ) ":" @SetScheme; - userinfo = userinfochar+ >Mark "@" @SetUserinfo; - host6 = "[" ( ipv6c+ >Mark %SetHost ) "]"; - host = host6 | ( ( ipv4c | hostc | telc )+ >Mark %SetHost ); - port = digit+ >Mark %SetPort; - hostport = host ( ":" port )?; - authority = userinfo? hostport; - segment = pathchar+ %AppendSegment param*; - rel_segment = relchar+ >Mark %AppendSegment; - path_segments = segment ( "/" @Mark segment )*; - abs_path = "/" @Mark path_segments; - net_path = "//" authority abs_path? >RestartSegs; - hier_part = ( net_path | abs_path ) queries?; - rel_path = rel_segment abs_path?; - opaque_part = ( urichar -- "/" ) @HandleOpaquePart; - fragment = "#" urichar* >Mark %SetFragment; - relativeURI = ( net_path | abs_path | rel_path ) queries?; - absoluteURI = scheme ( hier_part | opaque_part ); - sip := authority >Mark param*; - uri := ( relativeURI | absoluteURI )? fragment?; - }%% - - %% write init; - cs = uriparse_en_uri; - %% write exec; - - /* clang-format on */ - - if (cs >= uriparse_first_final) { - if (uri->host.n <= DNS_NAME_MAX && uri->port.n <= 6) { - return zero; - } else { - return eoverflow(); - } - } else { - return einval(); - } -} diff --git a/net/http/uriparse.svgz b/net/http/uriparse.svgz deleted file mode 100644 index f6ab643b4..000000000 Binary files a/net/http/uriparse.svgz and /dev/null differ diff --git a/net/http/url.h b/net/http/url.h new file mode 100644 index 000000000..77c047145 --- /dev/null +++ b/net/http/url.h @@ -0,0 +1,39 @@ +#ifndef COSMOPOLITAN_NET_HTTP_URL_H_ +#define COSMOPOLITAN_NET_HTTP_URL_H_ +#if !(__ASSEMBLER__ + __LINKER__ + 0) +COSMOPOLITAN_C_START_ + +struct UrlView { + size_t n; + char *p; +}; + +struct UrlParams { + size_t n; + struct UrlParam { + struct UrlView key; + struct UrlView val; + } * p; +}; + +struct Url { + struct UrlView scheme; /* must be [A-Za-z][-+.0-9A-Za-z]* or empty */ + struct UrlView user; /* depends on host non-absence */ + struct UrlView pass; /* depends on user non-absence */ + struct UrlView host; /* or reg_name */ + struct UrlView port; /* depends on host non-absence */ + struct UrlView path; /* or opaque_part */ + struct UrlParams params; + struct UrlView fragment; +}; + +char *EncodeUrl(struct Url *, size_t *); +char *ParseUrl(const char *, size_t, struct Url *); +char *ParseParams(const char *, size_t, struct UrlParams *); +char *ParseRequestUri(const char *, size_t, struct Url *); +char *ParseHost(const char *, size_t, struct Url *); +char *EscapeUrlView(char *, struct UrlView *, const char[256]); + +COSMOPOLITAN_C_END_ +#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ +#endif /* COSMOPOLITAN_NET_HTTP_URL_H_ */ diff --git a/net/http/visualizecontrolcodes.c b/net/http/visualizecontrolcodes.c index d1049731d..3ba14fdac 100644 --- a/net/http/visualizecontrolcodes.c +++ b/net/http/visualizecontrolcodes.c @@ -20,7 +20,7 @@ #include "libc/str/str.h" #include "libc/str/thompike.h" #include "libc/str/tpenc.h" -#include "net/http/http.h" +#include "net/http/escape.h" /** * Filters out control codes from string. @@ -29,9 +29,13 @@ * want full blown C string literal escaping, but we don't want things * like raw ANSI control codes from untrusted devices in our terminals. * + * This function also canonicalizes overlong encodings. Therefore it + * isn't necessary to say VisualizeControlCodes(Underlong(𝑥))) since + * VisualizeControlCodes(𝑥) will do the same thing. + * * @param data is input value * @param size if -1 implies strlen - * @param out_size if non-NULL receives output length on success + * @param out_size if non-NULL receives output length * @return allocated NUL-terminated buffer, or NULL w/ errno */ char *VisualizeControlCodes(const char *data, size_t size, size_t *out_size) { @@ -40,7 +44,7 @@ char *VisualizeControlCodes(const char *data, size_t size, size_t *out_size) { unsigned i, n; wint_t x, a, b; const char *p, *e; - if (size == -1) size = strlen(data); + if (size == -1) size = data ? strlen(data) : 0; if ((r = malloc(size * 6 + 1))) { q = r; p = data; @@ -85,9 +89,14 @@ char *VisualizeControlCodes(const char *data, size_t size, size_t *out_size) { } while ((w >>= 8)); } } - if (out_size) *out_size = q - r; + n = q - r; *q++ = '\0'; if ((q = realloc(r, q - r))) r = q; + } else { + n = 0; + } + if (out_size) { + *out_size = n; } return r; } diff --git a/test/libc/bits/bitreverse_test.c b/test/libc/bits/bitreverse_test.c index ae2a8014a..acd47ae28 100644 --- a/test/libc/bits/bitreverse_test.c +++ b/test/libc/bits/bitreverse_test.c @@ -21,29 +21,24 @@ #include "libc/testlib/testlib.h" TEST(bitreverse, test) { + EXPECT_EQ(0xde, BITREVERSE8(123)); EXPECT_EQ(0xde, bitreverse8(123)); - EXPECT_EQ(0xde, (bitreverse8)(123)); + EXPECT_EQ(0xde00, BITREVERSE16(123)); EXPECT_EQ(0xde00, bitreverse16(123)); - EXPECT_EQ(0xde00, (bitreverse16)(123)); EXPECT_EQ(0xde000000u, bitreverse32(123)); - EXPECT_EQ(0xde000000u, (bitreverse32)(123)); EXPECT_EQ(0xde00000000000000ul, bitreverse64(123)); - EXPECT_EQ(0xde00000000000000ul, (bitreverse64)(123)); EXPECT_EQ(0x482d96c305f7c697ul, bitreverse64(0xe963efa0c369b412)); - EXPECT_EQ(0x482d96c305f7c697ul, (bitreverse64)(0xe963efa0c369b412)); } BENCH(bitreverse, bench) { - EZBENCH2("bitreverse8 mac", donothing, + EZBENCH2("BITREVERSE8", donothing, + EXPROPRIATE(BITREVERSE8(CONCEAL("r", 123)))); + EZBENCH2("bitreverse8", donothing, EXPROPRIATE(bitreverse8(CONCEAL("r", 123)))); - EZBENCH2("bitreverse8 fun", donothing, - EXPROPRIATE((bitreverse8)(CONCEAL("r", 123)))); - EZBENCH2("bitreverse16 mac", donothing, - EXPROPRIATE(bitreverse16(CONCEAL("r", 123)))); - EZBENCH2("bitreverse16 fun", donothing, - EXPROPRIATE((bitreverse16)(CONCEAL("r", 123)))); - EZBENCH2("bitreverse32 mac", donothing, + EZBENCH2("BITREVERSE16", donothing, + EXPROPRIATE(BITREVERSE16(CONCEAL("r", 123)))); + EZBENCH2("bitreverse32", donothing, EXPROPRIATE(bitreverse32(CONCEAL("r", 123)))); - EZBENCH2("bitreverse32 fun", donothing, - EXPROPRIATE((bitreverse32)(CONCEAL("r", (123))))); + EZBENCH2("bitreverse64", donothing, + EXPROPRIATE(bitreverse64(CONCEAL("r", 123)))); } diff --git a/test/libc/calls/mprotect_test.c b/test/libc/calls/mprotect_test.c new file mode 100644 index 000000000..7857f1066 --- /dev/null +++ b/test/libc/calls/mprotect_test.c @@ -0,0 +1,66 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/calls/calls.h" +#include "libc/runtime/runtime.h" +#include "libc/sysv/consts/prot.h" +#include "libc/sysv/consts/sa.h" +#include "libc/testlib/testlib.h" + +jmp_buf jb; +bool gotsegv; +struct sigaction old[2]; + +void OnSigSegv(int sig) { + gotsegv = true; + longjmp(jb, 1); +} + +void SetUp(void) { + sigaction(SIGBUS, NULL, &old[0]); + sigaction(SIGSEGV, NULL, &old[1]); +} + +void TearDown(void) { + sigaction(SIGBUS, &old[0], NULL); + sigaction(SIGSEGV, &old[1], NULL); +} + +TEST(mprotect, test) { + char *p = gc(memalign(PAGESIZE, PAGESIZE)); + p[0] = 0; + ASSERT_NE(-1, mprotect(p, PAGESIZE, PROT_READ | PROT_WRITE)); + p[0] = 1; + EXPECT_EQ(1, p[0]); +} + +TEST(mprotect, testSegfault) { + char *p; + struct sigaction ss = {.sa_handler = OnSigSegv, .sa_flags = SA_NODEFER}; + if (IsWindows()) return; /* TODO */ + p = gc(memalign(PAGESIZE, PAGESIZE)); + EXPECT_NE(-1, sigaction(SIGBUS, &ss, NULL)); + EXPECT_NE(-1, sigaction(SIGSEGV, &ss, NULL)); + if (!setjmp(jb)) p[0] = 1; + EXPECT_FALSE(gotsegv); + EXPECT_NE(-1, mprotect(p, sizeof(p), PROT_READ)); + if (!setjmp(jb)) p[0] = 2; + EXPECT_TRUE(gotsegv); + EXPECT_EQ(1, p[0]); + EXPECT_NE(-1, mprotect(p, sizeof(p), PROT_READ | PROT_WRITE)); +} diff --git a/test/libc/fmt/itoa64radix10_test.c b/test/libc/fmt/itoa64radix10_test.c index 970e87ead..c9387aa0f 100644 --- a/test/libc/fmt/itoa64radix10_test.c +++ b/test/libc/fmt/itoa64radix10_test.c @@ -40,6 +40,8 @@ TEST(uint64toarray_radix10, test) { char buf[21]; EXPECT_EQ(1, uint64toarray_radix10(0, buf)); EXPECT_STREQ("0", buf); + EXPECT_EQ(4, uint64toarray_radix10(1024, buf)); + EXPECT_STREQ("1024", buf); EXPECT_EQ(20, uint64toarray_radix10(UINT64_MAX, buf)); EXPECT_STREQ("18446744073709551615", buf); EXPECT_EQ(19, uint64toarray_radix10(INT64_MIN, buf)); diff --git a/test/libc/fmt/palandprintf_test.c b/test/libc/fmt/palandprintf_test.c index f1b65ead9..a9b5750b5 100644 --- a/test/libc/fmt/palandprintf_test.c +++ b/test/libc/fmt/palandprintf_test.c @@ -38,8 +38,9 @@ #include "libc/testlib/testlib.h" #include "libc/x/x.h" -static char buffer[128]; -#define Format(...) gc(xasprintf(__VA_ARGS__)) +char buffer[1000]; +/* #define Format(...) gc(xasprintf(__VA_ARGS__)) */ +#define Format(...) (snprintf(buffer, sizeof(buffer), __VA_ARGS__), buffer) TEST(sprintf, test_space_flag) { EXPECT_STREQ(" 42", Format("% d", 42)); @@ -593,32 +594,14 @@ TEST(snprintf, testFixedWidthString_wontOverrunInput) { TEST(snprintf, testFixedWidthStringIsNull_wontOverrunBuffer) { int N = 3; char *buf = malloc(N + 1); - EXPECT_EQ(6, snprintf(buf, N + 1, "%.*s", pushpop(N), pushpop(NULL))); - EXPECT_BINEQ(u"(nu ", buf); - EXPECT_EQ(6, snprintf(buf, N + 1, "%#.*s", pushpop(N), pushpop(NULL))); - EXPECT_BINEQ(u"(nu ", buf); - EXPECT_EQ(4, snprintf(buf, N + 1, "%`.*s", pushpop(N), pushpop(NULL))); - EXPECT_BINEQ(u"NUL ", buf); - EXPECT_EQ(4, snprintf(buf, N + 1, "%`#.*s", pushpop(N), pushpop(NULL))); - EXPECT_BINEQ(u"NUL ", buf); - free(buf); -} - -TEST(snprintf, testFixedWidthStringIsNull_wontLeakMemory) { - int N = 16; - char *buf = malloc(N + 1); - memset(buf, 0, N + 1); - EXPECT_EQ(6, snprintf(buf, N + 1, "%.*s", pushpop(N), pushpop(NULL))); - EXPECT_BINEQ(u"(null)           ", buf); - memset(buf, 0, N + 1); - EXPECT_EQ(6, snprintf(buf, N + 1, "%#.*s", pushpop(N), pushpop(NULL))); - EXPECT_BINEQ(u"(null)           ", buf); - memset(buf, 0, N + 1); - EXPECT_EQ(4, snprintf(buf, N + 1, "%`.*s", pushpop(N), pushpop(NULL))); - EXPECT_BINEQ(u"NULL             ", buf); - memset(buf, 0, N + 1); - EXPECT_EQ(4, snprintf(buf, N + 1, "%`#.*s", pushpop(N), pushpop(NULL))); - EXPECT_BINEQ(u"NULL             ", buf); + EXPECT_EQ(3, snprintf(buf, N + 1, "%.*s", pushpop(N), pushpop(NULL))); + EXPECT_STREQ("(nu", buf); + EXPECT_EQ(3, snprintf(buf, N + 1, "%#.*s", pushpop(N), pushpop(NULL))); + EXPECT_STREQ("(nu", buf); + EXPECT_EQ(3, snprintf(buf, N + 1, "%`'.*s", pushpop(N), pushpop(NULL))); + EXPECT_STREQ("NUL", buf); + EXPECT_EQ(3, snprintf(buf, N + 1, "%`#.*s", pushpop(N), pushpop(NULL))); + EXPECT_STREQ("NUL", buf); free(buf); } @@ -640,7 +623,9 @@ TEST(palandprintf, precisionStillRespectsNulTerminatorIfNotEscOrRepr) { } BENCH(palandprintf, bench) { + EZBENCH2("ascii", donothing, Format(VEIL("r", "hiuhcreohucreo"))); EZBENCH2("ascii %s", donothing, Format("%s", VEIL("r", "hiuhcreohucreo"))); + EZBENCH2("ascii %`'s", donothing, Format("%`'s", VEIL("r", "hiuhcreohucre"))); EZBENCH2("utf8 %s", donothing, Format("%s", VEIL("r", "hi (╯°□°)╯"))); EZBENCH2("snprintf %hs", donothing, Format("%hs", VEIL("r", u"hi (╯°□°)╯"))); EZBENCH2("snprintf %ls", donothing, Format("%ls", VEIL("r", L"hi (╯°□°)╯"))); @@ -648,6 +633,8 @@ BENCH(palandprintf, bench) { EZBENCH2("23 %d", donothing, Format("%d", VEIL("r", 23))); EZBENCH2("INT_MIN %x", donothing, Format("%x", VEIL("r", INT_MIN))); EZBENCH2("INT_MIN %d", donothing, Format("%d", VEIL("r", INT_MIN))); + EZBENCH2("LONG_MIN %x", donothing, Format("%lx", VEIL("r", LONG_MIN))); + EZBENCH2("LONG_MIN %d", donothing, Format("%ld", VEIL("r", LONG_MIN))); EZBENCH2("23 int64toarray", donothing, int64toarray_radix10(23, buffer)); EZBENCH2("INT_MIN int64toarray", donothing, int64toarray_radix10(INT_MIN, buffer)); diff --git a/test/libc/fmt/strerror_test.c b/test/libc/fmt/strerror_test.c index b6b607136..7ba6ee727 100644 --- a/test/libc/fmt/strerror_test.c +++ b/test/libc/fmt/strerror_test.c @@ -30,34 +30,26 @@ */ TEST(strerror, e2big) { - if (IsTiny()) return; EXPECT_STARTSWITH("E2BIG", strerror(E2BIG)); } TEST(strerror, enosys) { - if (IsTiny()) return; EXPECT_STARTSWITH("ENOSYS", strerror(ENOSYS)); } TEST(strerror, einval) { - if (IsTiny()) return; EXPECT_STARTSWITH("EINVAL", strerror(EINVAL)); } TEST(strerror, symbolizingTheseNumbersAsErrorsIsHeresyInUnixStyle) { - EXPECT_STARTSWITH("E?", strerror(0)); - EXPECT_STARTSWITH("E?", strerror(-1)); + EXPECT_STARTSWITH("EUNKNOWN", strerror(0)); + EXPECT_STARTSWITH("EUNKNOWN", strerror(-1)); } TEST(strerror, enotconn_orLinkerIsntUsingLocaleC_orCodeIsOutOfSync) { - if (IsTiny()) return; EXPECT_STARTSWITH("ENOTCONN", strerror(ENOTCONN)); } TEST(strerror, exfull_orLinkerIsntUsingLocaleC_orCodeIsOutOfSync) { - if (IsLinux() && !IsTiny()) { - EXPECT_STARTSWITH("EXFULL", strerror(EXFULL)); - } else { - EXPECT_STARTSWITH("E?", strerror(EXFULL)); - } + EXPECT_STARTSWITH("ETXTBSY", strerror(ETXTBSY)); } diff --git a/test/libc/release/test.mk b/test/libc/release/test.mk index 01aac0224..872f9395d 100644 --- a/test/libc/release/test.mk +++ b/test/libc/release/test.mk @@ -8,7 +8,7 @@ o/$(MODE)/test/libc/release/cosmopolitan.zip: \ o/$(MODE)/ape/ape.o \ o/$(MODE)/ape/ape-no-modify-self.o \ o/$(MODE)/cosmopolitan.a - @$(COMPILE) -AZIP -T$@ zip -j $@ $^ + @$(COMPILE) -AZIP -T$@ zip -qj $@ $^ o/$(MODE)/test/libc/release/smoke.com: \ o/$(MODE)/test/libc/release/smoke.com.dbg diff --git a/test/libc/sock/inet_pton_test.c b/test/libc/sock/inet_pton_test.c index 1963fb149..30415f079 100644 --- a/test/libc/sock/inet_pton_test.c +++ b/test/libc/sock/inet_pton_test.c @@ -23,18 +23,46 @@ #include "libc/testlib/testlib.h" TEST(inet_pton, testLocalhost) { - uint32_t addr; - ASSERT_EQ(1, inet_pton(AF_INET, "127.0.0.1", &addr)); - EXPECT_EQ(htonl(INADDR_LOOPBACK), addr); + uint8_t addr[4] = {255, 255, 255, 255}; + EXPECT_EQ(1, inet_pton(AF_INET, "127.0.0.1", &addr)); + EXPECT_EQ(127, addr[0]); + EXPECT_EQ(0, addr[1]); + EXPECT_EQ(0, addr[2]); + EXPECT_EQ(1, addr[3]); } -TEST(inet_pton, testBadAddresses) { - uint32_t addr; - ASSERT_EQ(0, inet_pton(AF_INET, "127.0.0", &addr)); - ASSERT_EQ(0, inet_pton(AF_INET, "256.0.0.1", &addr)); +TEST(inet_pton, testShortAddress_doesntFillFullValue) { + uint8_t addr[4] = {255, 255, 255, 255}; + EXPECT_EQ(0, inet_pton(AF_INET, "127.0.0", &addr)); + EXPECT_EQ(127, addr[0]); + EXPECT_EQ(0, addr[1]); + EXPECT_EQ(0, addr[2]); + EXPECT_EQ(255, addr[3]); } -TEST(inet_pton, testBadFamily) { - uint32_t addr = 666; - ASSERT_EQ(-1, inet_pton(666, "127.0.0.1", &addr)); +TEST(inet_pton, testOverflow_stopsParsing) { + uint8_t addr[4] = {255, 255, 255, 255}; + EXPECT_EQ(0, inet_pton(AF_INET, "0.300.0", &addr)); + EXPECT_EQ(0, addr[0]); + EXPECT_EQ(255, addr[1]); + EXPECT_EQ(255, addr[2]); + EXPECT_EQ(255, addr[3]); +} + +TEST(inet_pton, testBadChar_stopsParsing) { + uint8_t addr[4] = {255, 255, 255, 255}; + EXPECT_EQ(0, inet_pton(AF_INET, "127-.0.0", &addr)); + EXPECT_EQ(127, addr[0]); + EXPECT_EQ(255, addr[1]); + EXPECT_EQ(255, addr[2]); + EXPECT_EQ(255, addr[3]); +} + +TEST(inet_pton, testBadFamily_returnsNegAndChangesNothing) { + uint8_t addr[4] = {255, 255, 255, 255}; + EXPECT_EQ(-1, inet_pton(666, "127.0.0.1", &addr)); + EXPECT_EQ(255, addr[0]); + EXPECT_EQ(255, addr[1]); + EXPECT_EQ(255, addr[2]); + EXPECT_EQ(255, addr[3]); } diff --git a/test/libc/str/crc32c_test.c b/test/libc/str/crc32c_test.c index b755eb62b..27984f7d9 100644 --- a/test/libc/str/crc32c_test.c +++ b/test/libc/str/crc32c_test.c @@ -20,6 +20,8 @@ #include "libc/nexgen32e/crc32.h" #include "libc/nexgen32e/x86feature.h" #include "libc/str/str.h" +#include "libc/testlib/ezbench.h" +#include "libc/testlib/hyperion.h" #include "libc/testlib/testlib.h" #define FANATICS "Fanatics" @@ -40,12 +42,6 @@ TEST(crc32c, test) { strlen(hyperion) - strlen(FANATICS))); } -FIXTURE(crc32c, pure_) { - *(void **)(&crc32c) = (void *)crc32c_pure; -} - -FIXTURE(crc32c, sse42_) { - if (X86_HAVE(SSE4_2)) { - *(void **)(&crc32c) = (void *)crc32c_sse42; - } +BENCH(crc32c, bench) { + EZBENCH2("crc32c", donothing, crc32c(0, kHyperion, kHyperionSize)); } diff --git a/test/libc/str/regex_test.c b/test/libc/str/regex_test.c index 61088522d..c57e4e2b9 100644 --- a/test/libc/str/regex_test.c +++ b/test/libc/str/regex_test.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/str/str.h" +#include "libc/testlib/ezbench.h" #include "libc/testlib/testlib.h" #include "third_party/regex/regex.h" @@ -30,3 +31,125 @@ TEST(regex, test) { EXPECT_EQ(REG_NOMATCH, regexec(&rx, "0", 0, NULL, 0)); regfree(&rx); } + +TEST(regex, testDns) { + regex_t rx; + EXPECT_EQ(REG_OK, regcomp(&rx, "^[-._0-9A-Za-z]*$", REG_EXTENDED)); + EXPECT_EQ(REG_OK, regexec(&rx, "", 0, NULL, 0)); + EXPECT_EQ(REG_OK, regexec(&rx, "foo.com", 0, NULL, 0)); + EXPECT_EQ(REG_NOMATCH, regexec(&rx, "bar@example", 0, NULL, 0)); + regfree(&rx); +} + +TEST(regex, testIpBasic) { + regex_t rx; + EXPECT_EQ(REG_OK, regcomp(&rx, + "^" + "\\([0-9][0-9]*\\)\\." + "\\([0-9][0-9]*\\)\\." + "\\([0-9][0-9]*\\)\\." + "\\([0-9][0-9]*\\)" + "$", + 0)); + const char *s = "127.0.0.1"; + regmatch_t *m = gc(calloc(rx.re_nsub + 1, sizeof(regmatch_t))); + ASSERT_EQ(4, rx.re_nsub); + EXPECT_EQ(REG_OK, regexec(&rx, s, rx.re_nsub + 1, m, 0)); + EXPECT_STREQ("127", gc(strndup(s + m[1].rm_so, m[1].rm_eo - m[1].rm_so))); + EXPECT_STREQ("0", gc(strndup(s + m[2].rm_so, m[2].rm_eo - m[2].rm_so))); + EXPECT_STREQ("0", gc(strndup(s + m[3].rm_so, m[3].rm_eo - m[3].rm_so))); + EXPECT_STREQ("1", gc(strndup(s + m[4].rm_so, m[4].rm_eo - m[4].rm_so))); + regfree(&rx); +} + +TEST(regex, testIpExtended) { + regex_t rx; + EXPECT_EQ(REG_OK, regcomp(&rx, + "^" + "([0-9]{1,3})\\." + "([0-9]{1,3})\\." + "([0-9]{1,3})\\." + "([0-9]{1,3})" + "$", + REG_EXTENDED)); + const char *s = "127.0.0.1"; + regmatch_t *m = gc(calloc(rx.re_nsub + 1, sizeof(regmatch_t))); + ASSERT_EQ(4, rx.re_nsub); + EXPECT_EQ(REG_OK, regexec(&rx, s, rx.re_nsub + 1, m, 0)); + EXPECT_STREQ("127", gc(strndup(s + m[1].rm_so, m[1].rm_eo - m[1].rm_so))); + EXPECT_STREQ("0", gc(strndup(s + m[2].rm_so, m[2].rm_eo - m[2].rm_so))); + EXPECT_STREQ("0", gc(strndup(s + m[3].rm_so, m[3].rm_eo - m[3].rm_so))); + EXPECT_STREQ("1", gc(strndup(s + m[4].rm_so, m[4].rm_eo - m[4].rm_so))); + regfree(&rx); +} + +void A(void) { + regex_t rx; + regcomp(&rx, "^[-._0-9A-Za-z]*$", REG_EXTENDED); + regexec(&rx, "foo.com", 0, NULL, 0); + regfree(&rx); +} + +void B(regex_t *rx) { + regexec(rx, "foo.com", 0, NULL, 0); +} + +void C(void) { + regex_t rx; + regcomp(&rx, "^[-._0-9A-Za-z]*$", 0); + regexec(&rx, "foo.com", 0, NULL, 0); + regfree(&rx); +} + +void D(regex_t *rx, regmatch_t *m) { + regexec(rx, "127.0.0.1", rx->re_nsub + 1, m, 0); +} + +BENCH(regex, bench) { + regex_t rx; + regmatch_t *m; + regcomp(&rx, "^[-._0-9A-Za-z]*$", REG_EXTENDED); + EZBENCH2("precompiled extended", donothing, B(&rx)); + regfree(&rx); + EZBENCH2("easy api extended", donothing, A()); + EZBENCH2("easy api basic", donothing, C()); + + EXPECT_EQ(REG_OK, regcomp(&rx, + "^" + "\\([0-9][0-9]*\\)\\." + "\\([0-9][0-9]*\\)\\." + "\\([0-9][0-9]*\\)\\." + "\\([0-9][0-9]*\\)" + "$", + 0)); + m = calloc(rx.re_nsub + 1, sizeof(regmatch_t)); + EZBENCH2("precompiled basic match", donothing, D(&rx, m)); + free(m); + regfree(&rx); + + EXPECT_EQ(REG_OK, regcomp(&rx, + "^" + "([0-9]{1,3})\\." + "([0-9]{1,3})\\." + "([0-9]{1,3})\\." + "([0-9]{1,3})" + "$", + REG_EXTENDED)); + m = calloc(rx.re_nsub + 1, sizeof(regmatch_t)); + EZBENCH2("precompiled extended match", donothing, D(&rx, m)); + free(m); + regfree(&rx); + + EXPECT_EQ(REG_OK, regcomp(&rx, + "^" + "([0-9]{1,3})\\." + "([0-9]{1,3})\\." + "([0-9]{1,3})\\." + "([0-9]{1,3})" + "$", + REG_EXTENDED | REG_NOSUB)); + m = calloc(rx.re_nsub + 1, sizeof(regmatch_t)); + EZBENCH2("precompiled nosub match", donothing, D(&rx, m)); + free(m); + regfree(&rx); +} diff --git a/test/net/http/decodelatin1_test.c b/test/net/http/decodelatin1_test.c index ccb507181..12fef2dec 100644 --- a/test/net/http/decodelatin1_test.c +++ b/test/net/http/decodelatin1_test.c @@ -16,8 +16,11 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/errno.h" +#include "libc/testlib/ezbench.h" +#include "libc/testlib/hyperion.h" #include "libc/testlib/testlib.h" -#include "net/http/http.h" +#include "net/http/escape.h" size_t n; @@ -25,4 +28,41 @@ TEST(DecodeLatin1, test) { EXPECT_STREQ("", DecodeLatin1(NULL, 0, 0)); EXPECT_STREQ("¥atta", DecodeLatin1("\245atta", -1, &n)); EXPECT_EQ(6, n); + EXPECT_STREQ("\245atta", EncodeLatin1("¥atta", -1, &n, 0)); + EXPECT_EQ(5, n); +} + +TEST(DecodeLatin1, testAbleToImposeCharacterRestrictions) { + errno = 0; + EXPECT_EQ(0, EncodeLatin1("\200atta", -1, &n, kControlC1)); + EXPECT_EQ(0, n); + EXPECT_EQ(EILSEQ, errno); + errno = 0; + EXPECT_EQ(0, EncodeLatin1("\002atta", -1, &n, kControlC0)); + EXPECT_EQ(0, n); + EXPECT_EQ(EILSEQ, errno); +} + +TEST(EncodeLatin1, roundTrip) { + int i; + char b[256]; + for (i = 0; i < 256; ++i) b[i] = i; + char *utf8 = DecodeLatin1(b, 256, &n); + EXPECT_EQ(384, n); + char *lat1 = EncodeLatin1(utf8, n, &n, 0); + ASSERT_EQ(256, n); + EXPECT_EQ(0, memcmp(b, lat1, 256)); +} + +TEST(DecodeLatin1, testOom_returnsNullAndSetsSizeToZero) { + n = 31337; + EXPECT_EQ(NULL, DecodeLatin1("hello", 0x1000000000000, &n)); + EXPECT_EQ(0, n); +} + +BENCH(DecodeLatin1, bench) { + EZBENCH2("DecodeLatin1", donothing, + DecodeLatin1(kHyperion, kHyperionSize, 0)); + EZBENCH2("EncodeLatin1", donothing, + EncodeLatin1(kHyperion, kHyperionSize, 0, 0)); } diff --git a/test/net/http/encodebase64_test.c b/test/net/http/encodebase64_test.c index 4e4f23a30..24d5f4465 100644 --- a/test/net/http/encodebase64_test.c +++ b/test/net/http/encodebase64_test.c @@ -23,7 +23,7 @@ #include "libc/testlib/ezbench.h" #include "libc/testlib/hyperion.h" #include "libc/testlib/testlib.h" -#include "net/http/base64.h" +#include "net/http/escape.h" size_t i, n, m; char *p, *q, b[32]; @@ -126,6 +126,18 @@ TEST(DecodeBase64, testInvalidSequences_skipsOverThem) { EXPECT_BINEQ(u"♦ ", gc(DecodeBase64("====BB==", 8, 0))); } +TEST(DecodeBase64, testOom_returnsNullAndSetsSizeToZero) { + n = 31337; + EXPECT_EQ(NULL, DecodeBase64("hello", 0x1000000000000, &n)); + EXPECT_EQ(0, n); +} + +TEST(EncodeBase64, testOom_returnsNullAndSetsSizeToZero) { + n = 31337; + EXPECT_EQ(NULL, EncodeBase64("hello", 0x1000000000000, &n)); + EXPECT_EQ(0, n); +} + TEST(Base64, RoundTrip) { for (i = 0; i < 1000; ++i) { n = rand() % 32; diff --git a/test/net/http/encodehttpheadervalue_test.c b/test/net/http/encodehttpheadervalue_test.c index 9df05d12b..d5a9b4aa7 100644 --- a/test/net/http/encodehttpheadervalue_test.c +++ b/test/net/http/encodehttpheadervalue_test.c @@ -22,7 +22,7 @@ #include "libc/stdio/stdio.h" #include "libc/testlib/ezbench.h" #include "libc/testlib/testlib.h" -#include "net/http/http.h" +#include "net/http/escape.h" char *p; size_t n; @@ -70,6 +70,12 @@ TEST(EncodeHttpHeaderValue, testC1_isForbidden) { EXPECT_EQ(NULL, gc(EncodeHttpHeaderValue("\302\205", 2, 0))); } +TEST(EncodeHttpHeaderValue, testOom_returnsNullAndSetsSizeToZero) { + n = 31337; + EXPECT_EQ(NULL, EncodeHttpHeaderValue("hello", 0x1000000000000, &n)); + EXPECT_EQ(0, n); +} + BENCH(EncodeHttpHeaderValue, bench) { n = 22851; p = gc(malloc(n)); diff --git a/test/net/http/escapehtml_test.c b/test/net/http/escapehtml_test.c index 963baba0c..96928c061 100644 --- a/test/net/http/escapehtml_test.c +++ b/test/net/http/escapehtml_test.c @@ -24,10 +24,11 @@ #include "net/http/escape.h" char *escapehtml(const char *s) { - struct EscapeResult r; - r = EscapeHtml(s, strlen(s)); - ASSERT_EQ(strlen(r.data), r.size); - return r.data; + char *p; + size_t n; + p = EscapeHtml(s, strlen(s), &n); + ASSERT_EQ(strlen(p), n); + return p; } TEST(escapehtml, test) { @@ -49,5 +50,5 @@ TEST(escapehtml, testAstralPlanes_doesNothing) { BENCH(escapehtml, bench) { EZBENCH2("escapehtml", donothing, - free(EscapeHtml(kHyperion, kHyperionSize).data)); + free(EscapeHtml(kHyperion, kHyperionSize, 0))); } diff --git a/test/net/http/escapejsstringliteral_test.c b/test/net/http/escapejsstringliteral_test.c index 98da2f6ca..4555bc733 100644 --- a/test/net/http/escapejsstringliteral_test.c +++ b/test/net/http/escapejsstringliteral_test.c @@ -24,10 +24,11 @@ #include "net/http/escape.h" char *escapejs(const char *s) { - struct EscapeResult r; - r = EscapeJsStringLiteral(s, strlen(s)); - ASSERT_EQ(strlen(r.data), r.size); - return r.data; + char *p; + size_t n; + p = EscapeJsStringLiteral(s, strlen(s), &n); + ASSERT_EQ(strlen(p), n); + return p; } TEST(EscapeJsStringLiteral, test) { @@ -53,27 +54,29 @@ TEST(EscapeJsStringLiteral, testBrokenUnicode_sparesInnocentCharacters) { void makefile1(void) { FILE *f; - struct EscapeResult r; - r = EscapeJsStringLiteral(kHyperion, kHyperionSize); + char *p; + size_t n; + p = EscapeJsStringLiteral(kHyperion, kHyperionSize, &n); f = fopen("/tmp/a", "wb"); - fwrite(r.data, r.size, 1, f); + fwrite(p, n, 1, f); fclose(f); - free(r.data); + free(p); } void makefile2(void) { int fd; - struct EscapeResult r; - r = EscapeJsStringLiteral(kHyperion, kHyperionSize); + char *p; + size_t n; + p = EscapeJsStringLiteral(kHyperion, kHyperionSize, &n); fd = creat("/tmp/a", 0644); - write(fd, r.data, r.size); + write(fd, p, n); close(fd); - free(r.data); + free(p); } BENCH(EscapeJsStringLiteral, bench) { EZBENCH2("escapejs", donothing, - free(EscapeJsStringLiteral(kHyperion, kHyperionSize).data)); + free(EscapeJsStringLiteral(kHyperion, kHyperionSize, 0))); EZBENCH2("makefile1", donothing, makefile1()); EZBENCH2("makefile2", donothing, makefile2()); } diff --git a/test/net/http/escapeurlparam_test.c b/test/net/http/escapeurlparam_test.c index c7469c700..f550279af 100644 --- a/test/net/http/escapeurlparam_test.c +++ b/test/net/http/escapeurlparam_test.c @@ -24,30 +24,31 @@ #include "net/http/escape.h" char *escapeparam(const char *s) { - struct EscapeResult r; - r = EscapeUrlParam(s, strlen(s)); - ASSERT_EQ(strlen(r.data), r.size); - return r.data; + char *p; + size_t n; + p = EscapeParam(s, -1, &n); + ASSERT_EQ(strlen(p), n); + return p; } -TEST(escapeparam, test) { +TEST(EscapeParam, test) { EXPECT_STREQ("abc%20%26%3C%3E%22%27%01%02", gc(escapeparam("abc &<>\"'\1\2"))); } -TEST(escapeparam, testLargeGrowth) { +TEST(EscapeParam, testLargeGrowth) { EXPECT_STREQ("%22%22%22", gc(escapeparam("\"\"\""))); } -TEST(escapeparam, testEmpty) { +TEST(EscapeParam, testEmpty) { EXPECT_STREQ("", gc(escapeparam(""))); } -TEST(escapeparam, testAstralPlanes_usesUtf8HexEncoding) { +TEST(EscapeParam, testAstralPlanes_usesUtf8HexEncoding) { EXPECT_STREQ("%F0%90%8C%B0", escapeparam("𐌰")); } -BENCH(escapeparam, bench) { - EZBENCH2("escapeparam", donothing, - free(EscapeUrlParam(kHyperion, kHyperionSize).data)); +BENCH(EscapeParam, bench) { + EZBENCH2("EscapeParam", donothing, + free(EscapeParam(kHyperion, kHyperionSize, 0))); } diff --git a/test/net/http/hascontrolcodes_test.c b/test/net/http/hascontrolcodes_test.c new file mode 100644 index 000000000..26afa3a48 --- /dev/null +++ b/test/net/http/hascontrolcodes_test.c @@ -0,0 +1,51 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/testlib/ezbench.h" +#include "libc/testlib/hyperion.h" +#include "libc/testlib/testlib.h" +#include "net/http/escape.h" + +TEST(HasControlCodes, test) { + EXPECT_FALSE( + HasControlCodes(kHyperion, kHyperionSize, kControlC0 | kControlC1)); + EXPECT_TRUE(HasControlCodes("hi\1", -1, kControlC0)); + EXPECT_FALSE(HasControlCodes("hi\1", -1, kControlC1)); + EXPECT_FALSE(HasControlCodes("hi there", -1, 0)); + EXPECT_TRUE(HasControlCodes("hi\tthere", -1, kControlWs)); +} + +TEST(HasControlCodes, testDoesUtf8) { + EXPECT_FALSE(HasControlCodes(u8"→", -1, kControlC0 | kControlC1)); + EXPECT_FALSE(HasControlCodes("\304\200", -1, kControlC0 | kControlC1)); + EXPECT_TRUE(HasControlCodes("\300\200", -1, kControlC0 | kControlC1)); + EXPECT_FALSE(HasControlCodes("\300\200", -1, kControlC1)); + EXPECT_TRUE(HasControlCodes("\302\202", -1, kControlC0 | kControlC1)); + EXPECT_TRUE(HasControlCodes("\302\202", -1, kControlC1)); + EXPECT_FALSE(HasControlCodes("\302\202", -1, kControlC0)); +} + +TEST(HasControlCodes, testHasLatin1FallbackBehavior) { + EXPECT_TRUE(HasControlCodes("\202", -1, kControlWs | kControlC1)); + EXPECT_FALSE(HasControlCodes("\202", -1, kControlC0)); +} + +BENCH(HasControlCodes, bench) { + EZBENCH2("HasControlCodes", donothing, + HasControlCodes(kHyperion, kHyperionSize, kControlWs)); +} diff --git a/test/net/http/indentlines_test.c b/test/net/http/indentlines_test.c index 106bf9215..c82358ac7 100644 --- a/test/net/http/indentlines_test.c +++ b/test/net/http/indentlines_test.c @@ -21,7 +21,7 @@ #include "libc/testlib/ezbench.h" #include "libc/testlib/hyperion.h" #include "libc/testlib/testlib.h" -#include "net/http/http.h" +#include "net/http/escape.h" TEST(IndentLines, testEmpty) { char *p; diff --git a/test/net/http/isacceptablehost_test.c b/test/net/http/isacceptablehost_test.c new file mode 100644 index 000000000..d212afd20 --- /dev/null +++ b/test/net/http/isacceptablehost_test.c @@ -0,0 +1,131 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/testlib/ezbench.h" +#include "libc/testlib/testlib.h" +#include "net/http/http.h" + +TEST(IsAcceptableHost, test) { + EXPECT_TRUE(IsAcceptableHost("", -1)); + EXPECT_TRUE(IsAcceptableHost("0.0.0.0", -1)); + EXPECT_FALSE(IsAcceptableHost("1.2.3", -1)); + EXPECT_TRUE(IsAcceptableHost("1.2.3.4", -1)); + EXPECT_FALSE(IsAcceptableHost("1.2.3.4.5", -1)); + EXPECT_TRUE(IsAcceptableHost("1.2.3.4.5.arpa", -1)); + EXPECT_TRUE(IsAcceptableHost("255.255.255.255", -1)); + EXPECT_FALSE(IsAcceptableHost("255.255.255", -1)); + EXPECT_FALSE(IsAcceptableHost("256.255.255.255", -1)); + EXPECT_TRUE(IsAcceptableHost("hello.example", -1)); + EXPECT_FALSE(IsAcceptableHost("hello..example", -1)); + EXPECT_TRUE(IsAcceptableHost("hello", -1)); + EXPECT_FALSE(IsAcceptableHost("hello\177", -1)); + EXPECT_FALSE(IsAcceptableHost("hello.example\300\200", -1)); + EXPECT_FALSE(IsAcceptableHost(".", -1)); + EXPECT_FALSE(IsAcceptableHost(".e", -1)); + EXPECT_TRUE(IsAcceptableHost("e.", -1)); + EXPECT_FALSE(IsAcceptableHost(".hi.example", -1)); + EXPECT_FALSE(IsAcceptableHost("hi..example", -1)); + EXPECT_TRUE(IsAcceptableHost("hi-there.example", -1)); + EXPECT_TRUE(IsAcceptableHost("_there.example", -1)); + EXPECT_TRUE(IsAcceptableHost("-there.example", -1)); + EXPECT_TRUE(IsAcceptableHost("there-.example", -1)); + EXPECT_FALSE(IsAcceptableHost("ther#e.example", -1)); + EXPECT_TRUE(IsAcceptableHost("localhost", -1)); +} + +TEST(IsAcceptablePort, test) { + EXPECT_TRUE(IsAcceptablePort("", -1)); + EXPECT_TRUE(IsAcceptablePort("0", -1)); + EXPECT_TRUE(IsAcceptablePort("65535", -1)); + EXPECT_FALSE(IsAcceptablePort("65536", -1)); + EXPECT_FALSE(IsAcceptablePort("-1", -1)); + EXPECT_FALSE(IsAcceptablePort("http", -1)); +} + +TEST(ParseIp, test) { + EXPECT_EQ(-1, ParseIp("", -1)); + EXPECT_EQ(0x00000000, ParseIp("0.0.0.0", -1)); + EXPECT_EQ(0x01020304, ParseIp("1.2.3.4", -1)); + EXPECT_EQ(0x80020304, ParseIp("128.2.3.4", -1)); + EXPECT_EQ(0xFFFFFFFF, ParseIp("255.255.255.255", -1)); + EXPECT_EQ(0xcb007100, ParseIp("203.0.113.0", -1)); + EXPECT_EQ(0x00000000, ParseIp("...", -1)); /* meh */ + EXPECT_EQ(-1, ParseIp("128.2..3.4", -1)); + EXPECT_EQ(-1, ParseIp("1.2.3", -1)); + EXPECT_EQ(-1, ParseIp("256.255.255.255", -1)); + EXPECT_EQ(-1, ParseIp("1.2.3.4.5", -1)); + EXPECT_EQ(-1, ParseIp("1.2.3.4.5.arpa", -1)); + EXPECT_EQ(-1, ParseIp("255.255.255", -1)); + EXPECT_EQ(-1, ParseIp("hello", -1)); + EXPECT_EQ(-1, ParseIp("hello\177", -1)); + EXPECT_EQ(-1, ParseIp("hello.example\300\200", -1)); + EXPECT_EQ(-1, ParseIp(".", -1)); + EXPECT_EQ(-1, ParseIp(".e", -1)); + EXPECT_EQ(-1, ParseIp("e.", -1)); + EXPECT_EQ(-1, ParseIp(".hi.example", -1)); + EXPECT_EQ(-1, ParseIp("hi..example", -1)); + EXPECT_EQ(-1, ParseIp("hi-there.example", -1)); + EXPECT_EQ(-1, ParseIp("_there.example", -1)); + EXPECT_EQ(-1, ParseIp("-there.example", -1)); + EXPECT_EQ(-1, ParseIp("there-.example", -1)); + EXPECT_EQ(-1, ParseIp("ther#e.example", -1)); + EXPECT_EQ(-1, ParseIp("localhost", -1)); + EXPECT_EQ(-1, ParseIp("hello.example", -1)); + EXPECT_EQ(-1, ParseIp("hello..example", -1)); +} + +TEST(ParseForwarded, test) { + uint32_t ip = 7; + uint16_t port = 7; + EXPECT_EQ(-1, ParseForwarded("", -1, &ip, &port)); + EXPECT_EQ(-1, ParseForwarded("0.0.0.0", -1, &ip, &port)); + EXPECT_EQ(-1, ParseForwarded("8.8.8.8", -1, &ip, &port)); + EXPECT_EQ(-1, ParseForwarded("[::1]:123", -1, &ip, &port)); + EXPECT_EQ(7, ip); + EXPECT_EQ(7, port); + EXPECT_EQ(0, ParseForwarded("0.0.0.1:123", -1, &ip, &port)); + EXPECT_EQ(0x00000001, ip); + EXPECT_EQ(123, port); + EXPECT_EQ(0, ParseForwarded("1.2.3.4:123", -1, &ip, &port)); + EXPECT_EQ(0x01020304, ip); + EXPECT_EQ(123, port); + EXPECT_EQ(0, ParseForwarded("128.2.3.4:123", -1, &ip, &port)); + EXPECT_EQ(0x80020304, ip); + EXPECT_EQ(123, port); + EXPECT_EQ(0, ParseForwarded("255.255.255.255:123", -1, &ip, &port)); + EXPECT_EQ(0xFFFFFFFF, ip); + EXPECT_EQ(123, port); + EXPECT_EQ(0, ParseForwarded("203.0.113.0:123", -1, &ip, &port)); + EXPECT_EQ(0xcb007100, ip); + EXPECT_EQ(123, port); + EXPECT_EQ(0, ParseForwarded("203.0.113.42:31337", -1, &ip, &port)); + EXPECT_EQ(-1, ParseForwarded("...:123", -1, &ip, &port)); + EXPECT_EQ(-1, ParseForwarded("203.0.113.0:123123123", -1, &ip, &port)); +} + +BENCH(IsAcceptableHost, bench) { + uint32_t ip; + uint16_t port; + EZBENCH2("IsAcceptableHost 127.0.0.1", donothing, + IsAcceptableHost("127.0.0.1", 9)); + EZBENCH2("IsAcceptablePort 80", donothing, IsAcceptablePort("80", 2)); + EZBENCH2("ParseForwarded 80", donothing, + ParseForwarded("203.0.113.42:31337", 20, &ip, &port)); + EZBENCH2("IsAcceptableHost foo.example", donothing, + IsAcceptableHost("foo.example:31337", 17)); +} diff --git a/test/net/http/isacceptablehttprequestpath_test.c b/test/net/http/isacceptablehttprequestpath_test.c deleted file mode 100644 index a256bdf55..000000000 --- a/test/net/http/isacceptablehttprequestpath_test.c +++ /dev/null @@ -1,61 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2021 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/runtime/gc.internal.h" -#include "libc/testlib/ezbench.h" -#include "libc/testlib/testlib.h" -#include "net/http/escape.h" -#include "net/http/http.h" - -TEST(IsAcceptableHttpRequestPath, test) { - EXPECT_TRUE(IsAcceptableHttpRequestPath("/", 1)); - EXPECT_TRUE(IsAcceptableHttpRequestPath("/index.html", 11)); -} - -TEST(IsAcceptableHttpRequestPath, testDoubleSlash_notAllowed) { - EXPECT_FALSE(IsAcceptableHttpRequestPath("//", 2)); - EXPECT_FALSE(IsAcceptableHttpRequestPath("/foo//bar", 9)); -} - -TEST(IsAcceptableHttpRequestPath, testDoesntStartWithSlash_notAllowed) { - EXPECT_FALSE(IsAcceptableHttpRequestPath(NULL, 0)); - EXPECT_FALSE(IsAcceptableHttpRequestPath("*", 1)); -} - -TEST(IsAcceptableHttpRequestPath, testNoncanonicalDirectories_areForbidden) { - EXPECT_FALSE(IsAcceptableHttpRequestPath("/.", 2)); - EXPECT_FALSE(IsAcceptableHttpRequestPath("/./", 3)); - EXPECT_FALSE(IsAcceptableHttpRequestPath("/../", 4)); -} - -TEST(IsAcceptableHttpRequestPath, testNoncanonicalWindowsDirs_areForbidden) { - EXPECT_FALSE(IsAcceptableHttpRequestPath("\\.", 2)); - EXPECT_FALSE(IsAcceptableHttpRequestPath("\\.\\", 3)); - EXPECT_FALSE(IsAcceptableHttpRequestPath("\\..\\", 4)); -} - -TEST(IsAcceptableHttpRequestPath, testOverlongSlashDot_isDetected) { - EXPECT_FALSE(IsAcceptableHttpRequestPath("/\300\256", 3)); - EXPECT_FALSE(IsAcceptableHttpRequestPath("/\300\257", 3)); - EXPECT_FALSE(IsAcceptableHttpRequestPath("\300\256\300\256", 4)); -} - -BENCH(IsAcceptableHttpRequestPath, bench) { - EZBENCH2("IsAcceptableHttpRequestPath", donothing, - IsAcceptableHttpRequestPath("/index.html", 11)); -} diff --git a/test/net/http/isacceptablepath_test.c b/test/net/http/isacceptablepath_test.c new file mode 100644 index 000000000..4c0378ea8 --- /dev/null +++ b/test/net/http/isacceptablepath_test.c @@ -0,0 +1,95 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/runtime/gc.internal.h" +#include "libc/testlib/ezbench.h" +#include "libc/testlib/testlib.h" +#include "net/http/escape.h" +#include "net/http/http.h" + +TEST(IsAcceptablePath, test) { + EXPECT_TRUE(IsAcceptablePath("*", 1)); + EXPECT_TRUE(IsAcceptablePath("/", 1)); + EXPECT_TRUE(IsAcceptablePath("index.html", 10)); + EXPECT_TRUE(IsAcceptablePath("/index.html", 11)); + EXPECT_TRUE(IsAcceptablePath("/index.html", -1)); + EXPECT_TRUE(IsAcceptablePath("/redbean.png", -1)); +} + +TEST(IsAcceptablePath, testEmptyString_allowedIfYouLikeImplicitLeadingSlash) { + EXPECT_TRUE(IsAcceptablePath(0, 0)); + EXPECT_TRUE(IsAcceptablePath(0, -1)); + EXPECT_TRUE(IsAcceptablePath("", 0)); +} + +TEST(IsAcceptablePath, testHiddenFiles_notAllowed) { + EXPECT_FALSE(IsAcceptablePath("/.index.html", 12)); + EXPECT_FALSE(IsAcceptablePath("/x/.index.html", 14)); +} + +TEST(IsAcceptablePath, testDoubleSlash_notAllowed) { + EXPECT_FALSE(IsAcceptablePath("//", 2)); + EXPECT_FALSE(IsAcceptablePath("foo//", 5)); + EXPECT_FALSE(IsAcceptablePath("/foo//", 6)); + EXPECT_FALSE(IsAcceptablePath("/foo//bar", 9)); +} + +TEST(IsAcceptablePath, testNoncanonicalDirectories_areForbidden) { + EXPECT_FALSE(IsAcceptablePath(".", 1)); + EXPECT_FALSE(IsAcceptablePath("..", 2)); + EXPECT_FALSE(IsAcceptablePath("/.", 2)); + EXPECT_FALSE(IsAcceptablePath("/..", 3)); + EXPECT_FALSE(IsAcceptablePath("./", 2)); + EXPECT_FALSE(IsAcceptablePath("../", 3)); + EXPECT_FALSE(IsAcceptablePath("/./", 3)); + EXPECT_FALSE(IsAcceptablePath("/../", 4)); + EXPECT_FALSE(IsAcceptablePath("x/.", 3)); + EXPECT_FALSE(IsAcceptablePath("x/..", 4)); + EXPECT_FALSE(IsAcceptablePath("x/./", 4)); + EXPECT_FALSE(IsAcceptablePath("x/../", 5)); + EXPECT_FALSE(IsAcceptablePath("/x/./", 5)); + EXPECT_FALSE(IsAcceptablePath("/x/../", 6)); +} + +TEST(IsAcceptablePath, testNoncanonicalWindowsDirs_areForbidden) { + EXPECT_FALSE(IsAcceptablePath(".", 1)); + EXPECT_FALSE(IsAcceptablePath("..", 2)); + EXPECT_FALSE(IsAcceptablePath("\\.", 2)); + EXPECT_FALSE(IsAcceptablePath("\\..", 3)); + EXPECT_FALSE(IsAcceptablePath(".\\", 2)); + EXPECT_FALSE(IsAcceptablePath("..\\", 3)); + EXPECT_FALSE(IsAcceptablePath("\\.\\", 3)); + EXPECT_FALSE(IsAcceptablePath("\\..\\", 4)); + EXPECT_FALSE(IsAcceptablePath("x\\.", 3)); + EXPECT_FALSE(IsAcceptablePath("x\\..", 4)); + EXPECT_FALSE(IsAcceptablePath("x\\.\\", 4)); + EXPECT_FALSE(IsAcceptablePath("x\\..\\", 5)); + EXPECT_FALSE(IsAcceptablePath("\\x\\.\\", 5)); + EXPECT_FALSE(IsAcceptablePath("\\x\\..\\", 6)); +} + +TEST(IsAcceptablePath, testOverlongSlashDot_isDetected) { + EXPECT_FALSE(IsAcceptablePath("/\300\256", 3)); + EXPECT_FALSE(IsAcceptablePath("/\300\257", 3)); + EXPECT_FALSE(IsAcceptablePath("\300\256\300\256", 4)); +} + +BENCH(IsAcceptablePath, bench) { + EZBENCH2("IsAcceptablePath", donothing, IsAcceptablePath("*", 1)); + EZBENCH2("IsAcceptablePath", donothing, IsAcceptablePath("/index.html", 11)); +} diff --git a/test/net/http/isreasonablepath_test.c b/test/net/http/isreasonablepath_test.c new file mode 100644 index 000000000..7348d5a87 --- /dev/null +++ b/test/net/http/isreasonablepath_test.c @@ -0,0 +1,91 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/testlib/ezbench.h" +#include "libc/testlib/testlib.h" +#include "net/http/http.h" + +TEST(IsReasonablePath, test) { + EXPECT_TRUE(IsReasonablePath("/", 1)); + EXPECT_TRUE(IsReasonablePath("index.html", 10)); + EXPECT_TRUE(IsReasonablePath("/index.html", 11)); + EXPECT_TRUE(IsReasonablePath("/index.html", -1)); + EXPECT_TRUE(IsReasonablePath("/redbean.png", -1)); +} + +TEST(IsReasonablePath, testEmptyString_allowedIfYouLikeImplicitLeadingSlash) { + EXPECT_TRUE(IsReasonablePath(0, 0)); + EXPECT_TRUE(IsReasonablePath(0, -1)); + EXPECT_TRUE(IsReasonablePath("", 0)); +} + +TEST(IsReasonablePath, testHiddenFiles_areAllowed) { + EXPECT_TRUE(IsReasonablePath("/.index.html", 12)); + EXPECT_TRUE(IsReasonablePath("/x/.index.html", 14)); +} + +TEST(IsReasonablePath, testDoubleSlash_isAllowed) { + EXPECT_TRUE(IsReasonablePath("//", 2)); + EXPECT_TRUE(IsReasonablePath("foo//", 5)); + EXPECT_TRUE(IsReasonablePath("/foo//", 6)); + EXPECT_TRUE(IsReasonablePath("/foo//bar", 9)); +} + +TEST(IsReasonablePath, testNoncanonicalDirectories_areForbidden) { + EXPECT_FALSE(IsReasonablePath(".", 1)); + EXPECT_FALSE(IsReasonablePath("..", 2)); + EXPECT_FALSE(IsReasonablePath("/.", 2)); + EXPECT_FALSE(IsReasonablePath("/..", 3)); + EXPECT_FALSE(IsReasonablePath("./", 2)); + EXPECT_FALSE(IsReasonablePath("../", 3)); + EXPECT_FALSE(IsReasonablePath("/./", 3)); + EXPECT_FALSE(IsReasonablePath("/../", 4)); + EXPECT_FALSE(IsReasonablePath("x/.", 3)); + EXPECT_FALSE(IsReasonablePath("x/..", 4)); + EXPECT_FALSE(IsReasonablePath("x/./", 4)); + EXPECT_FALSE(IsReasonablePath("x/../", 5)); + EXPECT_FALSE(IsReasonablePath("/x/./", 5)); + EXPECT_FALSE(IsReasonablePath("/x/../", 6)); +} + +TEST(IsReasonablePath, testNoncanonicalWindowsDirs_areForbidden) { + EXPECT_FALSE(IsReasonablePath(".", 1)); + EXPECT_FALSE(IsReasonablePath("..", 2)); + EXPECT_FALSE(IsReasonablePath("\\.", 2)); + EXPECT_FALSE(IsReasonablePath("\\..", 3)); + EXPECT_FALSE(IsReasonablePath(".\\", 2)); + EXPECT_FALSE(IsReasonablePath("..\\", 3)); + EXPECT_FALSE(IsReasonablePath("\\.\\", 3)); + EXPECT_FALSE(IsReasonablePath("\\..\\", 4)); + EXPECT_FALSE(IsReasonablePath("x\\.", 3)); + EXPECT_FALSE(IsReasonablePath("x\\..", 4)); + EXPECT_FALSE(IsReasonablePath("x\\.\\", 4)); + EXPECT_FALSE(IsReasonablePath("x\\..\\", 5)); + EXPECT_FALSE(IsReasonablePath("\\x\\.\\", 5)); + EXPECT_FALSE(IsReasonablePath("\\x\\..\\", 6)); +} + +TEST(IsReasonablePath, testOverlongSlashDot_isDetected) { + EXPECT_FALSE(IsReasonablePath("/\300\256", 3)); /* /. */ + EXPECT_TRUE(IsReasonablePath("/\300\257", 3)); /* // */ + EXPECT_FALSE(IsReasonablePath("\300\256\300\256", 4)); /* .. */ +} + +BENCH(IsReasonablePath, bench) { + EZBENCH2("IsReasonablePath", donothing, IsReasonablePath("/index.html", 11)); +} diff --git a/test/net/http/parsecontentlength_test.c b/test/net/http/parsecontentlength_test.c index 582bed94d..eae45c108 100644 --- a/test/net/http/parsecontentlength_test.c +++ b/test/net/http/parsecontentlength_test.c @@ -20,13 +20,16 @@ #include "net/http/http.h" TEST(ParseContentLength, test) { - EXPECT_EQ(0, ParseContentLength("", 0)); + EXPECT_EQ(-1, ParseContentLength(0, 0)); + EXPECT_EQ(-1, ParseContentLength("", 0)); EXPECT_EQ(-1, ParseContentLength("-1", 2)); EXPECT_EQ(-1, ParseContentLength("-2", 2)); + EXPECT_EQ(-1, ParseContentLength("e", -1)); + EXPECT_EQ(-1, ParseContentLength(",", -1)); + EXPECT_EQ(-1, ParseContentLength("\0", 1)); EXPECT_EQ(0, ParseContentLength("0", 1)); EXPECT_EQ(1, ParseContentLength("1", 1)); - EXPECT_EQ(0x7fffffff, ParseContentLength("2147483647", 10)); - EXPECT_EQ(-1, ParseContentLength("2147483648", 10)); - EXPECT_EQ(-1, ParseContentLength("9223372036854775808", 19)); - EXPECT_EQ(-1, ParseContentLength("88223372036854775808", 20)); + EXPECT_EQ(42, ParseContentLength("42, 42", -1)); /* RFC7230 § 3.3.2 */ + EXPECT_EQ(0x000000ffffffffff, ParseContentLength("1099511627775", -1)); + EXPECT_EQ(-1, ParseContentLength("1099511627776", -1)); } diff --git a/test/net/http/parsehttprange_test.c b/test/net/http/parsehttprange_test.c index 75b9f00db..27801b314 100644 --- a/test/net/http/parsehttprange_test.c +++ b/test/net/http/parsehttprange_test.c @@ -20,11 +20,11 @@ #include "libc/testlib/testlib.h" #include "net/http/http.h" -TEST(ParseHttpRange, testEmptyHack) { +TEST(ParseHttpRange, testEmptyHack_refusedBecauseItWontEncodeInContentRange) { long start, length; const char *s = "bytes=-0"; - EXPECT_TRUE(ParseHttpRange(s, strlen(s), 100, &start, &length)); - EXPECT_EQ(100, start); + EXPECT_FALSE(ParseHttpRange(s, strlen(s), 100, &start, &length)); + EXPECT_EQ(0, start); EXPECT_EQ(0, length); } @@ -36,6 +36,22 @@ TEST(ParseHttpRange, testEmptyRange_isntEmpty) { EXPECT_EQ(1, length); } +TEST(ParseHttpRange, testEmptyRangeOfOneByteFile_itWorks) { + long start, length; + const char *s = "bytes=0-0"; + EXPECT_TRUE(ParseHttpRange(s, strlen(s), 1, &start, &length)); + EXPECT_EQ(0, start); + EXPECT_EQ(1, length); +} + +TEST(ParseHttpRange, testEmptyRangeOfEmptyFile_outOfRange) { + long start, length; + const char *s = "bytes=0-0"; + EXPECT_FALSE(ParseHttpRange(s, strlen(s), 0, &start, &length)); + EXPECT_EQ(0, start); + EXPECT_EQ(0, length); +} + TEST(ParseHttpRange, testInclusiveIndexing) { long start, length; const char *s = "bytes=0-10"; @@ -81,7 +97,7 @@ TEST(ParseHttpRange, testOutOfRange) { const char *s = "bytes=0-100"; EXPECT_FALSE(ParseHttpRange(s, strlen(s), 100, &start, &length)); EXPECT_EQ(0, start); - EXPECT_EQ(101, length); + EXPECT_EQ(0, length); } TEST(ParseHttpRange, testInvalidRange) { @@ -104,6 +120,14 @@ TEST(ParseHttpRange, testOverflow_duringAddition_setsErrorRange) { long start, length; const char *s = "bytes=4611686018427387904-4611686018427387915"; EXPECT_FALSE(ParseHttpRange(s, strlen(s), 100, &start, &length)); - EXPECT_EQ(4611686018427387904, start); - EXPECT_EQ(12, length); + EXPECT_EQ(0, start); + EXPECT_EQ(0, length); +} + +TEST(ParseHttpRange, testMultipartRange_notImplemented) { + long start, length; + const char *s = "bytes=0-100,200-300"; + EXPECT_FALSE(ParseHttpRange(s, strlen(s), 100, &start, &length)); + EXPECT_EQ(0, start); + EXPECT_EQ(0, length); } diff --git a/test/net/http/parsehttprequest_test.c b/test/net/http/parsehttprequest_test.c index 5047fa829..cf9cb22b9 100644 --- a/test/net/http/parsehttprequest_test.c +++ b/test/net/http/parsehttprequest_test.c @@ -27,7 +27,6 @@ #include "libc/testlib/testlib.h" #include "libc/x/x.h" #include "net/http/http.h" -#include "net/http/uri.h" struct HttpRequest req[1]; @@ -39,10 +38,6 @@ static char *slice(const char *m, struct HttpRequestSlice s) { return p; } -static unsigned version(const char *m) { - return ParseHttpVersion(m + req->version.a, req->version.b - req->version.a); -} - void SetUp(void) { InitHttpRequest(req); } @@ -51,9 +46,9 @@ void TearDown(void) { DestroyHttpRequest(req); } -/* TEST(ParseHttpRequest, soLittleState) { */ -/* ASSERT_EQ(280, sizeof(struct HttpRequest)); */ -/* } */ +TEST(ParseHttpRequest, soLittleState) { + ASSERT_LE(sizeof(struct HttpRequest), 512); +} TEST(ParseHttpRequest, testEmpty_tooShort) { EXPECT_EQ(0, ParseHttpRequest(req, "", 0)); @@ -68,7 +63,7 @@ TEST(ParseHttpRequest, testNoHeaders) { EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); EXPECT_EQ(kHttpGet, req->method); EXPECT_STREQ("/foo", gc(slice(m, req->uri))); - EXPECT_STREQ("HTTP/1.0", gc(slice(m, req->version))); + EXPECT_EQ(10, req->version); } TEST(ParseHttpRequest, testSomeHeaders) { @@ -80,7 +75,7 @@ Content-Length: 0\r\n\ EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); EXPECT_EQ(kHttpPost, req->method); EXPECT_STREQ("/foo?bar%20hi", gc(slice(m, req->uri))); - EXPECT_STREQ("HTTP/1.0", gc(slice(m, req->version))); + EXPECT_EQ(10, req->version); EXPECT_STREQ("foo.example", gc(slice(m, req->headers[kHttpHost]))); EXPECT_STREQ("0", gc(slice(m, req->headers[kHttpContentLength]))); EXPECT_STREQ("", gc(slice(m, req->headers[kHttpEtag]))); @@ -91,8 +86,7 @@ TEST(ParseHttpRequest, testHttp101) { EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); EXPECT_EQ(kHttpGet, req->method); EXPECT_STREQ("/", gc(slice(m, req->uri))); - EXPECT_STREQ("HTTP/1.1", gc(slice(m, req->version))); - EXPECT_EQ(101, version(m)); + EXPECT_EQ(11, req->version); } TEST(ParseHttpRequest, testHttp100) { @@ -100,17 +94,48 @@ TEST(ParseHttpRequest, testHttp100) { EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); EXPECT_EQ(kHttpGet, req->method); EXPECT_STREQ("/", gc(slice(m, req->uri))); - EXPECT_STREQ("HTTP/1.0", gc(slice(m, req->version))); - EXPECT_EQ(100, version(m)); + EXPECT_EQ(10, req->version); } -TEST(ParseHttpRequest, testHttp009) { +TEST(ParseHttpRequest, testUnknownMethod_canBeUsedIfYouWant) { + static const char m[] = "#%*+_^ / HTTP/1.0\r\n\r\n"; + EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); + EXPECT_FALSE(req->method); + EXPECT_STREQ("WUT", kHttpMethod[req->method]); + EXPECT_STREQ("#%*+_^", gc(slice(m, req->xmethod))); +} + +TEST(ParseHttpRequest, testIllegalMethod) { + static const char m[] = "ehd@oruc / HTTP/1.0\r\n\r\n"; + EXPECT_EQ(-1, ParseHttpRequest(req, m, strlen(m))); + EXPECT_STREQ("WUT", kHttpMethod[req->method]); +} + +TEST(ParseHttpRequest, testIllegalMethodCasing_weAllowItAndPreserveIt) { + static const char m[] = "get / HTTP/1.0\r\n\r\n"; + EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); + EXPECT_STREQ("GET", kHttpMethod[req->method]); + EXPECT_STREQ("get", gc(slice(m, req->xmethod))); +} + +TEST(ParseHttpRequest, testEmptyMethod_isntAllowed) { + static const char m[] = " / HTTP/1.0\r\n\r\n"; + EXPECT_EQ(-1, ParseHttpRequest(req, m, strlen(m))); + EXPECT_STREQ("WUT", kHttpMethod[req->method]); +} + +TEST(ParseHttpRequest, testEmptyUri_isntAllowed) { + static const char m[] = "GET HTTP/1.0\r\n\r\n"; + EXPECT_EQ(-1, ParseHttpRequest(req, m, strlen(m))); + EXPECT_STREQ("GET", kHttpMethod[req->method]); +} + +TEST(ParseHttpRequest, testHttp09) { static const char m[] = "GET /\r\n\r\n"; EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); EXPECT_EQ(kHttpGet, req->method); EXPECT_STREQ("/", gc(slice(m, req->uri))); - EXPECT_STREQ("", gc(slice(m, req->version))); - EXPECT_EQ(9, version(m)); + EXPECT_EQ(9, req->version); } TEST(ParseHttpRequest, testLeadingLineFeeds_areIgnored) { @@ -153,7 +178,7 @@ Content-Length: 0\n\ EXPECT_EQ(strlen(m) - 1, ParseHttpRequest(req, m, strlen(m))); EXPECT_EQ(kHttpPost, req->method); EXPECT_STREQ("/foo?bar%20hi", gc(slice(m, req->uri))); - EXPECT_STREQ("HTTP/1.0", gc(slice(m, req->version))); + EXPECT_EQ(10, req->version); EXPECT_STREQ("foo.example", gc(slice(m, req->headers[kHttpHost]))); EXPECT_STREQ("0", gc(slice(m, req->headers[kHttpContentLength]))); EXPECT_STREQ("", gc(slice(m, req->headers[kHttpEtag]))); @@ -174,7 +199,7 @@ Accept-Language: en-US,en;q=0.9\r\n\ EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); EXPECT_EQ(kHttpGet, req->method); EXPECT_STREQ("/tool/net/redbean.png", gc(slice(m, req->uri))); - EXPECT_STREQ("HTTP/1.1", gc(slice(m, req->version))); + EXPECT_EQ(11, req->version); EXPECT_STREQ("10.10.10.124:8080", gc(slice(m, req->headers[kHttpHost]))); EXPECT_STREQ("1", gc(slice(m, req->headers[kHttpDnt]))); EXPECT_STREQ("", gc(slice(m, req->headers[kHttpExpect]))); @@ -193,6 +218,54 @@ X-User-Agent: hi\r\n\ EXPECT_STREQ("hi", gc(slice(m, req->xheaders.p[0].v))); } +TEST(ParseHttpRequest, testNormalHeaderOnMultipleLines_getsOverwritten) { + static const char m[] = "\ +GET / HTTP/1.1\r\n\ +Content-Type: text/html\r\n\ +Content-Type: text/plain\r\n\ +\r\n"; + EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); + EXPECT_STREQ("text/plain", gc(slice(m, req->headers[kHttpContentType]))); + ASSERT_EQ(0, req->xheaders.n); +} + +TEST(ParseHttpRequest, testCommaSeparatedOnMultipleLines_becomesLinear) { + static const char m[] = "\ +GET / HTTP/1.1\r\n\ +Accept: text/html\r\n\ +Accept: text/plain\r\n\ +\r\n"; + EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); + EXPECT_STREQ("text/html", gc(slice(m, req->headers[kHttpAccept]))); + ASSERT_EQ(1, req->xheaders.n); + EXPECT_STREQ("Accept", gc(slice(m, req->xheaders.p[0].k))); + EXPECT_STREQ("text/plain", gc(slice(m, req->xheaders.p[0].v))); +} + +TEST(HeaderHas, testHeaderSpansMultipleLines) { + static const char m[] = "\ +GET / HTTP/1.1\r\n\ +Accept-Encoding: deflate\r\n\ +ACCEPT-ENCODING: gzip\r\n\ +ACCEPT-encoding: bzip2\r\n\ +\r\n"; + EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); + EXPECT_TRUE(HeaderHas(req, m, kHttpAcceptEncoding, "gzip", -1)); + EXPECT_TRUE(HeaderHas(req, m, kHttpAcceptEncoding, "deflate", -1)); + EXPECT_FALSE(HeaderHas(req, m, kHttpAcceptEncoding, "funzip", -1)); +} + +TEST(HeaderHas, testHeaderOnSameLIne) { + static const char m[] = "\ +GET / HTTP/1.1\r\n\ +Accept-Encoding: deflate, gzip, bzip2\r\n\ +\r\n"; + EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); + EXPECT_TRUE(HeaderHas(req, m, kHttpAcceptEncoding, "gzip", -1)); + EXPECT_TRUE(HeaderHas(req, m, kHttpAcceptEncoding, "deflate", -1)); + EXPECT_FALSE(HeaderHas(req, m, kHttpAcceptEncoding, "funzip", -1)); +} + TEST(ParseHttpRequest, testHeaderValuesWithWhitespace_getsTrimmed) { static const char m[] = "\ OPTIONS * HTTP/1.0\r\n\ @@ -200,6 +273,45 @@ User-Agent: \t hi there \t \r\n\ \r\n"; EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); EXPECT_STREQ("hi there", gc(slice(m, req->headers[kHttpUserAgent]))); + EXPECT_STREQ("*", gc(slice(m, req->uri))); +} + +TEST(ParseHttpRequest, testAbsentHost_setsSliceToZero) { + static const char m[] = "\ +GET / HTTP/1.1\r\n\ +\r\n"; + EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); + EXPECT_EQ(0, req->headers[kHttpHost].a); + EXPECT_EQ(0, req->headers[kHttpHost].b); +} + +TEST(ParseHttpRequest, testEmptyHost_setsSliceToNonzeroValue) { + static const char m[] = "\ +GET / HTTP/1.1\r\n\ +Host:\r\n\ +\r\n"; + EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); + EXPECT_NE(0, req->headers[kHttpHost].a); + EXPECT_EQ(req->headers[kHttpHost].a, req->headers[kHttpHost].b); +} + +TEST(ParseHttpRequest, testEmptyHost2_setsSliceToNonzeroValue) { + static const char m[] = "\ +GET / HTTP/1.1\r\n\ +Host: \r\n\ +\r\n"; + EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); + EXPECT_NE(0, req->headers[kHttpHost].a); + EXPECT_EQ(req->headers[kHttpHost].a, req->headers[kHttpHost].b); +} + +TEST(IsMimeType, test) { + ASSERT_TRUE(IsMimeType("text/plain", -1, "text/plain")); + ASSERT_TRUE(IsMimeType("TEXT/PLAIN", -1, "text/plain")); + ASSERT_TRUE(IsMimeType("TEXT/PLAIN ", -1, "text/plain")); + ASSERT_TRUE(IsMimeType("text/plain; charset=utf-8", -1, "text/plain")); + ASSERT_FALSE(IsMimeType("TEXT/PLAI ", -1, "text/plain")); + ASSERT_FALSE(IsMimeType("", -1, "text/plain")); } void DoTiniestHttpRequest(void) { @@ -261,3 +373,24 @@ BENCH(ParseHttpRequest, bench) { EZBENCH2("DoStandardChromeRequest", donothing, DoStandardChromeRequest()); EZBENCH2("DoUnstandardChromeRequest", donothing, DoUnstandardChromeRequest()); } + +BENCH(HeaderHas, bench) { + static const char m[] = "\ +GET / HTTP/1.1\r\n\ +X-In-Your-Way-A: a\r\n\ +X-In-Your-Way-B: b\r\n\ +X-In-Your-Way-C: b\r\n\ +Accept-Encoding: deflate\r\n\ +ACCEPT-ENCODING: gzip\r\n\ +ACCEPT-encoding: bzip2\r\n\ +\r\n"; + EXPECT_EQ(strlen(m), ParseHttpRequest(req, m, strlen(m))); + EZBENCH2("HeaderHas text/plain", donothing, + HeaderHas(req, m, kHttpAccept, "text/plain", 7)); + EZBENCH2("HeaderHas deflate", donothing, + HeaderHas(req, m, kHttpAcceptEncoding, "deflate", 7)); + EZBENCH2("HeaderHas gzip", donothing, + HeaderHas(req, m, kHttpAcceptEncoding, "gzip", 4)); + EZBENCH2("IsMimeType", donothing, + IsMimeType("text/plain; charset=utf-8", -1, "text/plain")); +} diff --git a/test/net/http/parseurl_test.c b/test/net/http/parseurl_test.c new file mode 100644 index 000000000..ca462f70a --- /dev/null +++ b/test/net/http/parseurl_test.c @@ -0,0 +1,725 @@ +/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ +│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/limits.h" +#include "libc/mem/mem.h" +#include "libc/rand/rand.h" +#include "libc/testlib/ezbench.h" +#include "libc/testlib/hyperion.h" +#include "libc/testlib/testlib.h" +#include "net/http/http.h" +#include "net/http/url.h" + +TEST(ParseUrl, testEmpty) { + struct Url h; + gc(ParseUrl(0, 0, &h)); + gc(h.params.p); + ASSERT_EQ(0, h.params.n); + ASSERT_STREQ("", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testFragment) { + struct Url h; + gc(ParseUrl("#x", -1, &h)); + gc(h.params.p); + ASSERT_EQ(0, h.path.n); + ASSERT_EQ(1, h.fragment.n); + ASSERT_BINEQ(u"x", h.fragment.p); + ASSERT_STREQ("#x", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testFragmentAbsent_isNull) { + struct Url h; + gc(ParseUrl("", -1, &h)); + gc(h.params.p); + ASSERT_EQ(0, h.fragment.p); + ASSERT_EQ(0, h.fragment.n); + ASSERT_STREQ("", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testFragmentEmpty_isNonNull) { + struct Url h; + gc(ParseUrl("#", -1, &h)); /* python's uri parser is wrong here */ + gc(h.params.p); + ASSERT_NE(0, h.fragment.p); + ASSERT_EQ(0, h.fragment.n); + ASSERT_STREQ("#", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testPathFragment) { + struct Url h; + gc(ParseUrl("x#y", -1, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.path.n); + ASSERT_EQ('x', h.path.p[0]); + ASSERT_EQ(1, h.fragment.n); + ASSERT_EQ('y', h.fragment.p[0]); + ASSERT_STREQ("x#y", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testAbsolutePath) { + struct Url h; + gc(ParseUrl("/x/y", -1, &h)); + gc(h.params.p); + ASSERT_EQ(4, h.path.n); + ASSERT_BINEQ(u"/x/y", h.path.p); + ASSERT_STREQ("/x/y", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testRelativePath1) { + struct Url h; + gc(ParseUrl("x", -1, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.path.n); + ASSERT_EQ('x', h.path.p[0]); + ASSERT_STREQ("x", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testOptions) { + struct Url h; + gc(ParseUrl("*", -1, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.path.n); + ASSERT_EQ('*', h.path.p[0]); + ASSERT_STREQ("*", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testRelativePath2) { + struct Url h; + gc(ParseUrl("x/y", -1, &h)); + gc(h.params.p); + ASSERT_EQ(3, h.path.n); + ASSERT_BINEQ(u"x/y", h.path.p); + ASSERT_STREQ("x/y", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testRoot) { + struct Url h; + gc(ParseUrl("/", -1, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.path.n); + ASSERT_EQ('/', h.path.p[0]); + ASSERT_STREQ("/", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testSchemePath) { + struct Url h; + gc(ParseUrl("x:y", -1, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.scheme.n); + ASSERT_BINEQ(u"x", h.scheme.p); + ASSERT_EQ(1, h.path.n); + ASSERT_BINEQ(u"y", h.path.p); + ASSERT_STREQ("x:y", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testSchemeAuthority) { + struct Url h; + gc(ParseUrl("x://y", -1, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.scheme.n); + ASSERT_EQ('x', h.scheme.p[0]); + ASSERT_EQ(1, h.host.n); + ASSERT_EQ('y', h.host.p[0]); + ASSERT_STREQ("x://y", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testParamsQuestion_doesntTurnIntoSpace) { + struct Url h; + gc(ParseUrl("x?+", -1, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.path.n); + ASSERT_BINEQ(u"x", h.path.p); + ASSERT_EQ(1, h.params.n); + ASSERT_EQ(1, h.params.p[0].key.n); + ASSERT_EQ('+', h.params.p[0].key.p[0]); + ASSERT_STREQ("x?%2B", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testUrl) { + struct Url h; + gc(ParseUrl("a://b:B@c:C/d?e#f", -1, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.scheme.n); + ASSERT_EQ('a', h.scheme.p[0]); + ASSERT_EQ(1, h.user.n); + ASSERT_EQ('b', h.user.p[0]); + ASSERT_EQ(1, h.pass.n); + ASSERT_EQ('B', h.pass.p[0]); + ASSERT_STREQ("c", gc(strndup(h.host.p, h.host.n))); + ASSERT_EQ(1, h.port.n); + ASSERT_EQ('C', h.port.p[0]); + ASSERT_EQ(2, h.path.n); + ASSERT_BINEQ(u"/d", h.path.p); + ASSERT_EQ(1, h.params.n); + ASSERT_EQ(1, h.params.p[0].key.n); + ASSERT_BINEQ(u"e", h.params.p[0].key.p); + ASSERT_EQ(0, h.params.p[0].val.n); + ASSERT_EQ(0, h.params.p[0].val.p); + ASSERT_EQ(1, h.fragment.n); + ASSERT_BINEQ(u"f", h.fragment.p); + ASSERT_STREQ("a://b:B@c:C/d?e#f", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testEmptyQueryKeyVal_decodesToEmptyStrings) { + struct Url h; + gc(ParseUrl("?=", -1, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.params.n); + ASSERT_EQ(0, h.params.p[0].key.n); + ASSERT_NE(0, h.params.p[0].key.p); + ASSERT_EQ(0, h.params.p[0].val.n); + ASSERT_NE(0, h.params.p[0].val.p); + ASSERT_STREQ("?=", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testMultipleEquals_goesIntoValue) { + struct Url h; + gc(ParseUrl("?==", -1, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.params.n); + ASSERT_EQ(0, h.params.p[0].key.n); + ASSERT_NE(0, h.params.p[0].key.p); + ASSERT_EQ(1, h.params.p[0].val.n); + ASSERT_EQ('=', h.params.p[0].val.p[0]); + ASSERT_STREQ("?=%3D", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testUrlWithoutScheme) { + struct Url h; + gc(ParseUrl("//b@c/d?e#f", -1, &h)); + gc(h.params.p); + ASSERT_EQ(0, h.scheme.n); + ASSERT_EQ(1, h.user.n); + ASSERT_EQ('b', h.user.p[0]); + ASSERT_EQ(1, h.host.n); + ASSERT_EQ('c', h.host.p[0]); + ASSERT_EQ(2, h.path.n); + ASSERT_BINEQ(u"/d", h.path.p); + ASSERT_EQ(1, h.params.n); + ASSERT_EQ(1, h.params.p[0].key.n); + ASSERT_BINEQ(u"e", h.params.p[0].key.p); + ASSERT_EQ(0, h.params.p[0].val.n); + ASSERT_EQ(0, h.params.p[0].val.p); + ASSERT_EQ(1, h.fragment.n); + ASSERT_BINEQ(u"f", h.fragment.p); + ASSERT_STREQ("//b@c/d?e#f", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testUrlWithoutUser) { + struct Url h; + gc(ParseUrl("a://c/d?e#f", -1, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.scheme.n); + ASSERT_EQ('a', h.scheme.p[0]); + ASSERT_EQ(0, h.user.n); + ASSERT_EQ(0, h.pass.n); + ASSERT_EQ(1, h.host.n); + ASSERT_EQ('c', h.host.p[0]); + ASSERT_EQ(0, h.port.n); + ASSERT_EQ(2, h.path.n); + ASSERT_BINEQ(u"/d", h.path.p); + ASSERT_EQ(1, h.params.n); + ASSERT_EQ(1, h.params.p[0].key.n); + ASSERT_EQ('e', h.params.p[0].key.p[0]); + ASSERT_EQ(0, h.params.p[0].val.n); + ASSERT_EQ(0, h.params.p[0].val.p); + ASSERT_EQ(1, h.fragment.n); + ASSERT_EQ('f', h.fragment.p[0]); + ASSERT_STREQ("a://c/d?e#f", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testEmptyParams_absentCanBeDiscerned) { + struct Url h; + gc(ParseUrl("", -1, &h)); + gc(h.params.p); + ASSERT_EQ(0, h.params.n); + ASSERT_EQ(NULL, h.params.p); + gc(ParseUrl("?", -1, &h)); /* python's uri parser is wrong here */ + gc(h.params.p); + ASSERT_EQ(0, h.params.n); + ASSERT_NE(NULL, h.params.p); +} + +TEST(ParseUrl, testWeirdAmps_areReprodicible) { + struct Url h; + gc(ParseUrl("?&&", -1, &h)); + gc(h.params.p); + ASSERT_EQ(3, h.params.n); + ASSERT_EQ(0, h.params.p[0].key.n); + ASSERT_NE(0, h.params.p[0].key.p); + ASSERT_EQ(0, h.params.p[0].val.n); + ASSERT_EQ(0, h.params.p[0].val.p); + ASSERT_EQ(0, h.params.p[1].key.n); + ASSERT_NE(0, h.params.p[1].key.p); + ASSERT_EQ(0, h.params.p[1].val.n); + ASSERT_EQ(0, h.params.p[1].val.p); + ASSERT_EQ(0, h.params.p[2].key.n); + ASSERT_NE(0, h.params.p[2].key.p); + ASSERT_EQ(0, h.params.p[2].val.n); + ASSERT_EQ(0, h.params.p[2].val.p); + ASSERT_STREQ("?&&", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testOpaquePart_canLetQuestionMarkGoInPath) { + struct Url h; /* python's uri parser is wrong here */ + gc(ParseUrl("s:o!$%&'()*+,-./09:;=?@AZ_az#fragged", -1, &h)); + gc(h.params.p); + ASSERT_EQ(26, h.path.n); + ASSERT_EQ(0, memcmp(h.path.p, "o!$%&'()*+,-./09:;=?@AZ_az", 26)); + ASSERT_EQ(0, h.params.n); + ASSERT_EQ(NULL, h.params.p); + ASSERT_STREQ("s:o!$%25&'()*+,-./09:;=%3F@AZ_az#fragged", + gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testSchemePathWithoutAuthority_paramsAreAllowed) { + struct Url h; + gc(ParseUrl("s:/o!$%&'()*+,-./09:;=?@AZ_az#fragged", -1, &h)); + gc(h.params.p); + ASSERT_EQ(20, h.path.n); + ASSERT_EQ(0, memcmp(h.path.p, "/o!$%&'()*+,-./09:;=", 20)); + ASSERT_EQ(1, h.params.n); + ASSERT_STREQ("s:/o!$%25&'()*+,-./09:;=?%40AZ_az#fragged", + gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testOpaquePart_permitsPercentEncoding) { + struct Url h; + gc(ParseUrl("s:%2Fo!$%&'()*+,-./09:;=?@AZ_az#fragged", -1, &h)); + gc(h.params.p); + ASSERT_EQ(27, h.path.n); + ASSERT_EQ(0, memcmp(h.path.p, "/o!$%&'()*+,-./09:;=?@AZ_az", 27)); + ASSERT_EQ(0, h.params.n); + ASSERT_STREQ("s:/o!$%25&\'()*+,-./09:;=%3F@AZ_az#fragged", + gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testTelephone) { + struct Url h; + gc(ParseUrl("tel:+1-212-867-5309", -1, &h)); + gc(h.params.p); + ASSERT_EQ(15, h.path.n); + ASSERT_BINEQ(u"+1-212-867-5309", h.path.p); + ASSERT_STREQ("tel:+1-212-867-5309", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testLolv6) { + struct Url h; + gc(ParseUrl("//[::1]:31337", -1, &h)); + gc(h.params.p); + ASSERT_EQ(3, h.host.n); + ASSERT_BINEQ(u"::1", h.host.p); + ASSERT_EQ(5, h.port.n); + ASSERT_BINEQ(u"31337", h.port.p); + ASSERT_STREQ("//[::1]:31337", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testLolV6_withoutPort) { + struct Url h; + gc(ParseUrl("//[::1]", -1, &h)); + gc(h.params.p); + ASSERT_STREQ("//[::1]", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testLolv7) { + struct Url h; + gc(ParseUrl("//[vf.::1]", -1, &h)); + gc(h.params.p); + ASSERT_EQ(6, h.host.n); + ASSERT_BINEQ(u"vf.::1", h.host.p); + ASSERT_EQ(0, h.port.n); + ASSERT_EQ(0, h.port.p); + ASSERT_STREQ("//[vf.::1]", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testLolv7WithoutColon_weCantProduceLegalEncodingSadly) { + struct Url h; + gc(ParseUrl("//[v7.7.7.7]", -1, &h)); + gc(h.params.p); + ASSERT_STREQ("//v7.7.7.7", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testObviouslyIllegalIpLiteral_getsTreatedAsRegName) { + struct Url h; + gc(ParseUrl("//[vf.::1%00]", -1, &h)); + gc(h.params.p); + ASSERT_STREQ("//vf.%3A%3A1%00", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseHost, test) { + struct Url h = {0}; + gc(ParseHost("foo.example:80", -1, &h)); + gc(h.params.p); + ASSERT_EQ(11, h.host.n); + ASSERT_BINEQ(u"foo.example", h.host.p); + ASSERT_EQ(2, h.port.n); + ASSERT_BINEQ(u"80", h.port.p); + ASSERT_STREQ("//foo.example:80", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseHost, testObviouslyIllegalIpLiteral_getsTreatedAsRegName) { + struct Url h = {0}; + gc(ParseHost("[vf.::1%00]", -1, &h)); + gc(h.params.p); + ASSERT_STREQ("//vf.%3A%3A1%00", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseHost, testUnclosedIpv6_doesntSetPort) { + struct Url h = {0}; + gc(ParseHost("2001:db8:cafe::17", -1, &h)); + gc(h.params.p); + ASSERT_STREQ("2001:db8:cafe::17", gc(strndup(h.host.p, h.host.n))); + ASSERT_EQ(0, h.port.n); + ASSERT_EQ(0, h.port.p); + ASSERT_STREQ("//2001%3Adb8%3Acafe%3A%3A17", gc(EncodeUrl(&h, 0))); +} + +TEST(EncodeUrl, testHostPortPlacedInHostField_ungoodIdea) { + struct Url h = {0}; + h.host.n = strlen("foo.example:80"); + h.host.p = "foo.example:80"; + ASSERT_STREQ("//foo.example%3A80", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testUrlWithoutParams) { + struct Url h; + gc(ParseUrl("a://b@c/d#f", -1, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.scheme.n); + ASSERT_EQ('a', h.scheme.p[0]); + ASSERT_EQ(1, h.user.n); + ASSERT_EQ('b', h.user.p[0]); + ASSERT_EQ(1, h.host.n); + ASSERT_EQ('c', h.host.p[0]); + ASSERT_EQ(2, h.path.n); + ASSERT_BINEQ(u"/d", h.path.p); + ASSERT_EQ(0, h.params.n); + ASSERT_EQ(1, h.fragment.n); + ASSERT_EQ('f', h.fragment.p[0]); + ASSERT_STREQ("a://b@c/d#f", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testLatin1_doesNothing) { + struct Url h; + const char b[1] = {0377}; + gc(ParseUrl(b, 1, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.path.n); + ASSERT_EQ(0, memcmp("\377", h.path.p, 1)); + ASSERT_STREQ("%FF", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseRequestUri, testLatin1_expandsMemoryToUtf8) { + struct Url h; + const char b[1] = {0377}; + gc(ParseRequestUri(b, 1, &h)); + gc(h.params.p); + ASSERT_EQ(2, h.path.n); + ASSERT_EQ(0, memcmp("\303\277", h.path.p, 2)); +} + +TEST(ParseUrl, testPercentShrinkingMemory) { + struct Url h; + gc(ParseUrl("%Ff", 3, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.path.n); + ASSERT_EQ(0, memcmp("\377", h.path.p, 1)); + ASSERT_STREQ("%FF", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testEscapingWontOverrun) { + struct Url h; + char b[1] = {'%'}; + gc(ParseUrl(b, 1, &h)); + gc(h.params.p); + ASSERT_EQ(1, h.path.n); + ASSERT_EQ(0, memcmp("%", h.path.p, 1)); + ASSERT_STREQ("%25", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testBadPercent_getsIgnored) { + struct Url h; + gc(ParseUrl("%FZ", 3, &h)); + gc(h.params.p); + ASSERT_EQ(3, h.path.n); + ASSERT_EQ(0, memcmp("%FZ", h.path.p, 3)); +} + +TEST(ParseUrl, testFileUrl) { + struct Url h; + gc(ParseUrl("file:///etc/passwd", -1, &h)); + gc(h.params.p); + ASSERT_EQ(4, h.scheme.n); + ASSERT_BINEQ(u"file", h.scheme.p); + ASSERT_EQ(0, h.host.n); + ASSERT_NE(0, h.host.p); + ASSERT_EQ(0, h.port.n); + ASSERT_EQ(0, h.port.p); + ASSERT_EQ(11, h.path.n); + ASSERT_BINEQ(u"/etc/passwd", h.path.p); + ASSERT_STREQ("file:///etc/passwd", gc(EncodeUrl(&h, 0))); +} + +TEST(EncodeUrl, testModifyingParseResultAndReencoding_addsStructure) { + size_t n; + struct Url h; + gc(ParseUrl("rel", -1, &h)); + gc(h.params.p); + h.host.n = 7; + h.host.p = "justine"; + ASSERT_STREQ("//justine/rel", gc(EncodeUrl(&h, &n))); + ASSERT_EQ(13, n); +} + +TEST(EncodeUrl, testTortureCharacters_doesWhatYouAskItToDoButSchemeCantEscape) { + size_t n; + struct Url h; + memset(&h, 0, sizeof(h)); + h.scheme.n = 1; + h.scheme.p = "/"; + h.user.n = 1; + h.user.p = ""; + h.pass.n = 1; + h.pass.p = ""; + h.host.n = 1; + h.host.p = ""; + h.port.n = 1; + h.port.p = ""; + h.path.n = 1; + h.path.p = ""; + h.params = (struct UrlParams){.n = 1, + .p = (struct UrlParam[]){{ + .key = (struct UrlView){.n = 1, .p = ""}, + .val = (struct UrlView){.n = 1, .p = ""}, + }}}; + h.fragment.n = 1; + h.fragment.p = ""; + ASSERT_STREQ("/://%00:%00@%00:%00/%00?%00=%00#%00", gc(EncodeUrl(&h, &n))); + ASSERT_EQ(35, n); +} + +TEST(EncodeUrl, testUserPassPort_allDependOnHostNonAbsence) { + size_t n; + struct Url h; + memset(&h, 0, sizeof(h)); + h.scheme.n = 1; + h.scheme.p = "/"; + h.user.n = 1; + h.user.p = ""; + h.pass.n = 1; + h.pass.p = ""; + h.host.n = 0; + h.host.p = 0; + h.port.n = 1; + h.port.p = ""; + h.path.n = 1; + h.path.p = ""; + h.params = (struct UrlParams){.n = 1, + .p = (struct UrlParam[]){{ + .key = (struct UrlView){.n = 1, .p = ""}, + .val = (struct UrlView){.n = 1, .p = ""}, + }}}; + h.fragment.n = 1; + h.fragment.p = ""; + ASSERT_STREQ("/:%00?%00=%00#%00", gc(EncodeUrl(&h, 0))); +} + +TEST(EncodeUrl, testEmptyRegName_isLegal) { + size_t n; + struct Url h; + memset(&h, 0, sizeof(h)); + h.scheme.n = 1; + h.scheme.p = "/"; + h.user.n = 1; + h.user.p = ""; + h.pass.n = 1; + h.pass.p = ""; + h.host.n = 0; + h.host.p = ""; + h.port.n = 1; + h.port.p = ""; + h.path.n = 1; + h.path.p = ""; + h.params = (struct UrlParams){.n = 1, + .p = (struct UrlParam[]){{ + .key = (struct UrlView){.n = 1, .p = ""}, + .val = (struct UrlView){.n = 1, .p = ""}, + }}}; + h.fragment.n = 1; + h.fragment.p = ""; + ASSERT_STREQ("/://%00:%00@:%00/%00?%00=%00#%00", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testEmptyScheme_isNotPossible) { + struct Url h; + gc(ParseUrl(":", -1, &h)); + gc(h.params.p); + ASSERT_EQ(0, h.scheme.n); + ASSERT_EQ(0, h.scheme.p); + ASSERT_EQ(1, h.path.n); + ASSERT_EQ(':', h.path.p[0]); + ASSERT_STREQ(":", gc(EncodeUrl(&h, 0))); + gc(ParseUrl("://hi", -1, &h)); + gc(h.params.p); + ASSERT_EQ(0, h.scheme.n); + ASSERT_EQ(0, h.scheme.p); + ASSERT_EQ(5, h.path.n); + ASSERT_BINEQ(u"://hi", h.path.p); + ASSERT_STREQ("://hi", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testZipUri2) { + struct Url h; + gc(ParseUrl("zip:etc/passwd", -1, &h)); + gc(h.params.p); + ASSERT_EQ(3, h.scheme.n); + ASSERT_BINEQ(u"zip", h.scheme.p); + ASSERT_EQ(10, h.path.n); + ASSERT_BINEQ(u"etc/passwd", h.path.p); + ASSERT_STREQ("zip:etc/passwd", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testZipUri3) { + struct Url h; + gc(ParseUrl("zip:/etc/passwd", -1, &h)); + gc(h.params.p); + ASSERT_EQ(0, h.host.n); + ASSERT_EQ(0, h.host.p); + ASSERT_EQ(3, h.scheme.n); + ASSERT_BINEQ(u"zip", h.scheme.p); + ASSERT_EQ(11, h.path.n); + ASSERT_BINEQ(u"/etc/passwd", h.path.p); + ASSERT_STREQ("zip:/etc/passwd", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testDataUri) { + struct Url h; + gc(ParseUrl("data:image/png;base64,09AZaz+/==", -1, &h)); + gc(h.params.p); + ASSERT_EQ(0, h.host.n); + ASSERT_EQ(0, h.host.p); + ASSERT_EQ(4, h.scheme.n); + ASSERT_BINEQ(u"data", h.scheme.p); + ASSERT_EQ(27, h.path.n); + ASSERT_BINEQ(u"image/png;base64,09AZaz+/==", h.path.p); + ASSERT_STREQ("data:image/png;base64,09AZaz+/==", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseUrl, testBadSchemeCharacter_parserAssumesItsPath) { + struct Url h; + gc(ParseUrl("fil\e://hi", -1, &h)); + gc(h.params.p); + ASSERT_EQ(0, h.scheme.n); + ASSERT_EQ(0, h.scheme.p); + ASSERT_EQ(9, h.path.n); + ASSERT_BINEQ(u"fil←://hi", h.path.p); + ASSERT_STREQ("fil%1B://hi", gc(EncodeUrl(&h, 0))); +} + +TEST(ParseParams, testEmpty) { + struct UrlParams h = {0}; + gc(ParseParams(0, 0, &h)); + gc(h.p); + ASSERT_EQ(0, h.n); +} + +TEST(ParseParams, test) { + struct UrlParams h = {0}; + gc(ParseParams("a=b&c&x+y%7A=", -1, &h)); + gc(h.p); + ASSERT_EQ(3, h.n); + ASSERT_EQ(1, h.p[0].key.n); + ASSERT_EQ(1, h.p[0].val.n); + ASSERT_EQ(1, h.p[1].key.n); + ASSERT_NE(0, h.p[1].key.p); + ASSERT_EQ(0, h.p[1].val.n); + ASSERT_EQ(0, h.p[1].val.p); + ASSERT_EQ(4, h.p[2].key.n); + ASSERT_EQ(0, h.p[2].val.n); + EXPECT_EQ('a', h.p[0].key.p[0]); + EXPECT_EQ('b', h.p[0].val.p[0]); + EXPECT_EQ('c', h.p[1].key.p[0]); + EXPECT_BINEQ(u"x yz", h.p[2].key.p); +} + +TEST(ParseParams, testLatin1_doesNothing) { + struct UrlParams h = {0}; + gc(ParseParams("\200", -1, &h)); + gc(h.p); + ASSERT_EQ(1, h.n); + ASSERT_EQ(1, h.p[0].key.n); + ASSERT_EQ(0200, h.p[0].key.p[0] & 255); +} + +TEST(ParseParams, testUtf8_doesNothing) { + struct UrlParams h = {0}; + gc(ParseParams("\300\200", -1, &h)); + gc(h.p); + ASSERT_EQ(1, h.n); + ASSERT_EQ(2, h.p[0].key.n); + ASSERT_EQ(0300, h.p[0].key.p[0] & 255); + ASSERT_EQ(0200, h.p[0].key.p[1] & 255); +} + +TEST(ParseRequestUri, fuzz) { + int i, j; + struct Url h; + char B[13], C[] = "/:#?%[]:@&=abc123xyz\200\300"; + for (i = 0; i < 1024; ++i) { + for (j = 0; j < sizeof(B); ++j) { + B[j] = C[rand() % sizeof(C)]; + } + free(ParseRequestUri(B, 8, &h)); + free(h.params.p); + } +} + +void A(void) { + struct UrlParams h = {0}; + free(ParseParams(kHyperion, kHyperionSize, &h)); + free(h.p); +} + +BENCH(ParseUrl, bench) { + struct Url h; + EZBENCH2("ParseParams hyperion", donothing, A()); + EZBENCH2("ParseUrl a", donothing, free(ParseUrl("a", -1, &h))); + EZBENCH2("ParseUrl a://b@c/d#f", donothing, + free(ParseUrl("a://b@c/d#f", -1, &h))); + EZBENCH2("ParseUrl a://b@c/d?z#f", donothing, ({ + free(ParseUrl("a://b@c/?zd#f", -1, &h)); + free(h.params.p); + })); + EZBENCH2("ParseHost", donothing, free(ParseHost("127.0.0.1:34832", 15, &h))); + EZBENCH2("ParseIp", donothing, ParseIp("127.0.0.1", 9)); +} + +BENCH(EncodeUrl, bench) { + struct Url h; + gc(ParseUrl("a", -1, &h)); + EZBENCH2("EncodeUrl a", donothing, free(EncodeUrl(&h, 0))); + gc(ParseUrl("a://b@c/d#f", -1, &h)); + EZBENCH2("EncodeUrl a://b@c/d#f", donothing, free(EncodeUrl(&h, 0))); + gc(ParseUrl("a://b@c/?zd#f", -1, &h)); + gc(h.params.p); + EZBENCH2("EncodeUrl a://b@c/d?z#f", donothing, free(EncodeUrl(&h, 0))); + gc(ParseUrl(kHyperion, kHyperionSize, &h)); + gc(h.params.p); + EZBENCH2("EncodeUrl hyperion", donothing, free(EncodeUrl(&h, 0))); +} diff --git a/net/http/urislice2cstr.c b/test/net/http/underlong_test.c similarity index 74% rename from net/http/urislice2cstr.c rename to test/net/http/underlong_test.c index 0633af2d9..043084956 100644 --- a/net/http/urislice2cstr.c +++ b/test/net/http/underlong_test.c @@ -1,7 +1,7 @@ /*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ │vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ ╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ +│ Copyright 2021 Justine Alexandra Roberts Tunney │ │ │ │ Permission to use, copy, modify, and/or distribute this software for │ │ any purpose with or without fee is hereby granted, provided that the │ @@ -16,30 +16,25 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/macros.internal.h" -#include "libc/str/str.h" -#include "net/http/uri.h" +#include "libc/runtime/gc.internal.h" +#include "libc/testlib/ezbench.h" +#include "libc/testlib/hyperion.h" +#include "libc/testlib/testlib.h" +#include "net/http/escape.h" -/* TODO(jart): Unescape */ - -char *urislice2cstr(char *buf, size_t size, struct UriSlice slice, - const char *uristr, const char *defaultval) { +TEST(Underlong, test) { size_t n; - const char *p; - if (size) { - if (slice.n) { - p = uristr + slice.i; - n = slice.n; - } else if (defaultval) { - p = defaultval; - n = strlen(defaultval); - } else { - p = NULL; - n = 0; - } - n = MIN(n, size - 1); - memcpy(buf, p, n); - buf[n] = '\0'; - } - return buf; + EXPECT_BINEQ(u"e e", gc(Underlong("e\300\200e", -1, &n))); + EXPECT_EQ(3, n); +} + +TEST(Underlong, testNormalText) { + size_t n; + EXPECT_STREQ(kHyperion, gc(Underlong(kHyperion, kHyperionSize, &n))); + EXPECT_EQ(kHyperionSize, n); +} + +BENCH(Underlong, bench) { + EZBENCH2("Underlong", donothing, + free(Underlong(kHyperion, kHyperionSize, 0))); } diff --git a/test/net/http/uricspn_test.c b/test/net/http/uricspn_test.c deleted file mode 100644 index 2e6801633..000000000 --- a/test/net/http/uricspn_test.c +++ /dev/null @@ -1,59 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/str/str.h" -#include "libc/testlib/ezbench.h" -#include "libc/testlib/testlib.h" -#include "net/http/uri.h" - -_Alignas(32) const char kWinsockIcoPngBase64[] = "\ -base64,iVBORw0KGgoAAAANSUhEUgAAAJcAAACXCAYAAAAYn8l5AAAABmJLR0QA/\ -wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4woLByMP6uwgW\ -QAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAMeSURBVHja7\ -d1BcuIwEAVQPMW94GbAzeBkZJepUXpw01ixDO+tE0PML+lHtsV0v9/vO+jgj1OAc\ -CFcIFwIF8IFP+wrvzRNkzP3y7a4YmTkQrgQLnitc/XqA3GX+9SrU/+ei8vl8uMnT\ -qeTkQvTIggXwoVC36mOJhZa3Upm5ALhQrjQuV6jT2HkQrgQLhAuNlLo+96Z6q5XI\ -xcIF8KFzrXbWTDt0jTf4AkrIxfChXCBcCFcCBcIF8LFO9iP/gajx9jXMvrj80Yuh\ -AuEC52r2q9G6jnRxWQX7Y1cCBfCBcLFxxb6tsBH5f12uz08xvV6Lb328Xh8+nfO5\ -/NsyVfwjVwIF8IFa3auzALpXL96pRst0dWinta+loVWIxfChXCBcCFcCBcIF8LFe\ -xn+6Z+5xc5oYTOzQJr5mcrFbYxcCBfCBcKFQv9AexdC9U7UueMueWwjFwgXwoVwO\ -QUIF8IFwkV3e6dgfdETQ5knmIxcmBZBuBAuUOgH1Rb6LRZ8IxfChXDBt+le2N9nq\ -a0a222VRn/aJrp5sO1CS22XlPkC9fa1R/tuIiMXwoVwgXDx5oV+ruCPJlrI7LXfa\ -XsuMouo1YXWXv8IGLkwLSJcMGbnyrzWmqK/s31/Ue+pdJr2uNECbrvoXP0cen2eR\ -i5MiwgXCBf9DX8n6ta+lCmzkFkp+FGhb89N9Yu52uMs9eVYRi5MiwgXbKdzba0TV\ -h7NjzpY5i7Tpb78tD1OZrE408GMXJgWES4QLhT6zRf8qAxXFlqXKu+Vgp/5xyX6u\ -41cmBYRLvg7dS5xJyqPzW2HFH0Ev9mxKjJ3wRq5MC0iXCBc9FdaRM38DzD6o/kjF\ -frRy7uRC+FCuOBlpUVUnjzJhQvXo+8PaxEV0yLCBU9xs+Cg2ies1+5g0RPfRi5Mi\ -wgXCBcK/UeYe3Ims6ia2RN1zfJu5MK0iHDBQy5cj/AhFLZd6inarskWSpgWES4QL\ -sZkEXUAS227VJU5ti2UMC0iXKBzfUIPW3vbqrm96qP3Z+TCtIhwgXCh0POfAt1T5\ -i6Nw+Ew+/6MXJgWES7Quejf74xcdPMFQQsgQ0YEZnUAAAAASUVORK5CYII="; - -size_t size; - -void SetUp(void) { - size = strlen(kWinsockIcoPngBase64); -} -BENCH(strlen, bench) { - EZBENCH(donothing, (size = strlen(kWinsockIcoPngBase64))); -} -TEST(uricspn, test) { - EXPECT_EQ(size, uricspn(kWinsockIcoPngBase64, size)); -} -BENCH(uricspn, bench) { - EZBENCH(donothing, uricspn(kWinsockIcoPngBase64, size)); -} diff --git a/test/net/http/uriparse_test.c b/test/net/http/uriparse_test.c deleted file mode 100644 index 306066dd1..000000000 --- a/test/net/http/uriparse_test.c +++ /dev/null @@ -1,141 +0,0 @@ -/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│ -│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│ -╞══════════════════════════════════════════════════════════════════════════════╡ -│ Copyright 2020 Justine Alexandra Roberts Tunney │ -│ │ -│ Permission to use, copy, modify, and/or distribute this software for │ -│ any purpose with or without fee is hereby granted, provided that the │ -│ above copyright notice and this permission notice appear in all copies. │ -│ │ -│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ -│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ -│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ -│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ -│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ -│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ -│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ -│ PERFORMANCE OF THIS SOFTWARE. │ -╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/bits/bits.h" -#include "libc/bits/initializer.internal.h" -#include "libc/errno.h" -#include "libc/log/log.h" -#include "libc/macros.internal.h" -#include "libc/mem/mem.h" -#include "libc/runtime/gc.internal.h" -#include "libc/stdio/stdio.h" -#include "libc/str/str.h" -#include "libc/testlib/ezbench.h" -#include "libc/testlib/testlib.h" -#include "libc/x/x.h" -#include "net/http/uri.h" - -#define URIPARSE(URI) uriparse(&uri, (p = URI), (size = sizeof(URI) - 1)) - -static const char kHttpCosmopolitanVideoUrl[] = - "http://cosmopolitan.storage.googleapis.com/pub/vid/blankspace.mpg"; - -static const char kSipPriceIsTortureUri[] = - "sip:bob%20barker:priceisright@[dead:beef::666]:5060;isup-oli=00"; - -static const char kWinsockIcoPngBase64[] = "\ -base64,iVBORw0KGgoAAAANSUhEUgAAAJcAAACXCAYAAAAYn8l5AAAABmJLR0QA/\ -wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4woLByMP6uwgW\ -QAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAMeSURBVHja7\ -d1BcuIwEAVQPMW94GbAzeBkZJepUXpw01ixDO+tE0PML+lHtsV0v9/vO+jgj1OAc\ -CFcIFwIF8IFP+wrvzRNkzP3y7a4YmTkQrgQLnitc/XqA3GX+9SrU/+ei8vl8uMnT\ -qeTkQvTIggXwoVC36mOJhZa3Upm5ALhQrjQuV6jT2HkQrgQLhAuNlLo+96Z6q5XI\ -xcIF8KFzrXbWTDt0jTf4AkrIxfChXCBcCFcCBcIF8LFO9iP/gajx9jXMvrj80Yuh\ -AuEC52r2q9G6jnRxWQX7Y1cCBfCBcLFxxb6tsBH5f12uz08xvV6Lb328Xh8+nfO5\ -/NsyVfwjVwIF8IFa3auzALpXL96pRst0dWinta+loVWIxfChXCBcCFcCBcIF8LFe\ -xn+6Z+5xc5oYTOzQJr5mcrFbYxcCBfCBcKFQv9AexdC9U7UueMueWwjFwgXwoVwO\ -QUIF8IFwkV3e6dgfdETQ5knmIxcmBZBuBAuUOgH1Rb6LRZ8IxfChXDBt+le2N9nq\ -a0a222VRn/aJrp5sO1CS22XlPkC9fa1R/tuIiMXwoVwgXDx5oV+ruCPJlrI7LXfa\ -XsuMouo1YXWXv8IGLkwLSJcMGbnyrzWmqK/s31/Ue+pdJr2uNECbrvoXP0cen2eR\ -i5MiwgXCBf9DX8n6ta+lCmzkFkp+FGhb89N9Yu52uMs9eVYRi5MiwgXbKdzba0TV\ -h7NjzpY5i7Tpb78tD1OZrE408GMXJgWES4QLhT6zRf8qAxXFlqXKu+Vgp/5xyX6u\ -41cmBYRLvg7dS5xJyqPzW2HFH0Ev9mxKjJ3wRq5MC0iXCBc9FdaRM38DzD6o/kjF\ -frRy7uRC+FCuOBlpUVUnjzJhQvXo+8PaxEV0yLCBU9xs+Cg2ies1+5g0RPfRi5Mi\ -wgXCBcK/UeYe3Ims6ia2RN1zfJu5MK0iHDBQy5cj/AhFLZd6inarskWSpgWES4QL\ -sZkEXUAS227VJU5ti2UMC0iXKBzfUIPW3vbqrm96qP3Z+TCtIhwgXCh0POfAt1T5\ -i6Nw+Ew+/6MXJgWES7Quejf74xcdPMFQQsgQ0YEZnUAAAAASUVORK5CYII="; - -static size_t size; -static const char *p; -static struct Uri uri; -static struct UriMem { - struct UriSlice segs[8]; - struct UriRef paramsegs[8]; - struct UriKeyval params[4], queries[4]; -} urimem_; - -static textstartup void init() { - uri.segs.n = ARRAYLEN(urimem_.segs); - uri.segs.p = urimem_.segs; - uri.params.n = ARRAYLEN(urimem_.params); - uri.params.p = urimem_.params; - uri.queries.n = ARRAYLEN(urimem_.queries); - uri.queries.p = urimem_.queries; - uri.paramsegs.n = ARRAYLEN(urimem_.paramsegs); - uri.paramsegs.p = urimem_.paramsegs; -} - -const void *const g_name_ctor[] initarray = {init}; - -TEST(uriparse, sipPstnUri) { - EXPECT_NE(-1, URIPARSE("sip:+12125650666")); - EXPECT_STREQ("sip", gc(strndup(p + uri.scheme.i, uri.scheme.n))); - EXPECT_STREQ("+12125650666", gc(strndup(p + uri.host.i, uri.host.n))); - EXPECT_STREQ("", gc(strndup(p + uri.opaque.i, uri.opaque.n))); -} - -TEST(uriparse, printVideoUrl) { - EXPECT_NE(-1, URIPARSE(kHttpCosmopolitanVideoUrl)); - EXPECT_STREQ("http", gc(strndup(p + uri.scheme.i, uri.scheme.n))); - EXPECT_STREQ("cosmopolitan.storage.googleapis.com", - gc(strndup(p + uri.host.i, uri.host.n))); - EXPECT_STREQ("", gc(strndup(p + uri.port.i, uri.port.n))); - EXPECT_STREQ("/pub/vid/blankspace.mpg", - gc(strndup(p + uri.segs.p[0].i, - (uri.segs.p[uri.segs.i - 1].n + - (uri.segs.p[uri.segs.i - 1].i - uri.segs.p[0].i))))); -} - -TEST(uriparse, localRelativeFile) { - EXPECT_NE(-1, URIPARSE("blankspace.mpg")); - EXPECT_STREQ("", gc(strndup(p + uri.scheme.i, uri.scheme.n))); - EXPECT_STREQ("", gc(strndup(p + uri.host.i, uri.host.n))); - EXPECT_STREQ("", gc(strndup(p + uri.port.i, uri.port.n))); - EXPECT_STREQ("blankspace.mpg", - gc(strndup(p + uri.segs.p[0].i, - (uri.segs.p[uri.segs.i - 1].n + - (uri.segs.p[uri.segs.i - 1].i - uri.segs.p[0].i))))); -} - -TEST(uriparse, badPort_einval) { - EXPECT_EQ(-1, URIPARSE("http://hello.example:http/")); - EXPECT_EQ(EINVAL, errno); -} - -TEST(uriparse, datauri) { - size = strlen((p = gc(xstrcat("data:image/png;", kWinsockIcoPngBase64)))); - EXPECT_NE(-1, uriparse(&uri, p, size)); - EXPECT_EQ(5, uri.opaque.i); - EXPECT_EQ(size - 5, uri.opaque.n); -} - -//////////////////////////////////////////////////////////////////////////////// - -BENCH(uriparse, bench) { - EZBENCH(donothing, URIPARSE("sip:+12125650666")); - EZBENCH(donothing, URIPARSE("http://hello.example")); - EZBENCH(donothing, URIPARSE(kHttpCosmopolitanVideoUrl)); - EZBENCH(donothing, URIPARSE(kSipPriceIsTortureUri)); -} - -BENCH(uriparse, bigWinsockIcoPngUri) { - const char *BigDataIconUri; - BigDataIconUri = gc(xstrcat("data:image/png;", kWinsockIcoPngBase64)); - size = strlen(kWinsockIcoPngBase64); - EZBENCH(donothing, uriparse(&uri, BigDataIconUri, size)); -} diff --git a/test/net/http/visualizecontrolcodes_test.c b/test/net/http/visualizecontrolcodes_test.c index b307f0b4d..8c147c7b9 100644 --- a/test/net/http/visualizecontrolcodes_test.c +++ b/test/net/http/visualizecontrolcodes_test.c @@ -16,16 +16,32 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/runtime/gc.internal.h" #include "libc/testlib/ezbench.h" #include "libc/testlib/hyperion.h" #include "libc/testlib/testlib.h" -#include "net/http/http.h" +#include "libc/x/x.h" +#include "net/http/escape.h" TEST(VisualizeControlCodes, test) { - EXPECT_STREQ("hello", VisualizeControlCodes("hello", -1, 0)); - EXPECT_STREQ("hello\r\n", VisualizeControlCodes("hello\r\n", -1, 0)); - EXPECT_STREQ("hello␁␂␡", VisualizeControlCodes("hello\1\2\177", -1, 0)); - EXPECT_STREQ("hello\\u0085", VisualizeControlCodes("hello\302\205", -1, 0)); + EXPECT_STREQ("hello", gc(VisualizeControlCodes("hello", -1, 0))); + EXPECT_STREQ("hello\r\n", gc(VisualizeControlCodes("hello\r\n", -1, 0))); + EXPECT_STREQ("hello␁␂␡", gc(VisualizeControlCodes("hello\1\2\177", -1, 0))); + EXPECT_STREQ("hello\\u0085", + gc(VisualizeControlCodes("hello\302\205", -1, 0))); +} + +TEST(VisualizeControlCodes, testOom_returnsNullAndSetsSizeToZero) { + size_t n = 31337; + EXPECT_EQ(NULL, gc(VisualizeControlCodes("hello", 0x1000000000000, &n))); + EXPECT_EQ(0, n); +} + +TEST(VisualizeControlCodes, testWeirdHttp) { + size_t n = 31337; + char *p, B[] = "\0GET /redbean.lua\n\n"; + ASSERT_NE(0, (p = gc(VisualizeControlCodes(B, sizeof(B), &n)))); + EXPECT_STREQ("\"␀GET /redbean.lua\\n\\n␀\"", gc(xasprintf("%`'.*s", n, p))); } BENCH(VisualizeControlCodes, bench) { diff --git a/third_party/chibicc/as.c b/third_party/chibicc/as.c index 8d59d04a6..88c430b49 100644 --- a/third_party/chibicc/as.c +++ b/third_party/chibicc/as.c @@ -16,6 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/bits/bits.h" #include "libc/calls/calls.h" #include "libc/calls/struct/stat.h" #include "libc/elf/def.h" @@ -138,16 +139,7 @@ #define APPEND(L) L.p = realloc(L.p, ++L.n * sizeof(*L.p)) #define IS(P, N, S) (N == sizeof(S) - 1 && !strncasecmp(P, S, sizeof(S) - 1)) #define MAX(X, Y) ((Y) < (X) ? (X) : (Y)) -#define LOAD128BE(S) ((unsigned __int128)LOAD64BE(S) << 64 | LOAD64BE((S) + 8)) -#define LOAD64BE(S) \ - ((unsigned long)((unsigned char *)(S))[0] << 070 | \ - (unsigned long)((unsigned char *)(S))[1] << 060 | \ - (unsigned long)((unsigned char *)(S))[2] << 050 | \ - (unsigned long)((unsigned char *)(S))[3] << 040 | \ - (unsigned long)((unsigned char *)(S))[4] << 030 | \ - (unsigned long)((unsigned char *)(S))[5] << 020 | \ - (unsigned long)((unsigned char *)(S))[6] << 010 | \ - (unsigned long)((unsigned char *)(S))[7] << 000) +#define READ128BE(S) ((unsigned __int128)READ64BE(S) << 64 | READ64BE((S) + 8)) struct As { int i; // things @@ -1911,13 +1903,13 @@ static void CopyLower(char *k, const char *p, int n) { static unsigned long MakeKey64(const char *p, int n) { char k[8] = {0}; CopyLower(k, p, n); - return LOAD64BE(k); + return READ64BE(k); } static unsigned __int128 MakeKey128(const char *p, int n) { char k[16] = {0}; CopyLower(k, p, n); - return LOAD128BE(k); + return READ128BE(k); } static bool Prefix(struct As *a, const char *p, int n) { @@ -1929,7 +1921,7 @@ static bool Prefix(struct As *a, const char *p, int n) { r = ARRAYLEN(kPrefix) - 1; while (l <= r) { m = (l + r) >> 1; - y = LOAD64BE(kPrefix[m]); + y = READ64BE(kPrefix[m]); if (x < y) { r = m - 1; } else if (x > y) { @@ -1954,7 +1946,7 @@ static bool FindReg(const char *p, int n, struct Reg *out_reg) { r = ARRAYLEN(kRegs) - 1; while (l <= r) { m = (l + r) >> 1; - y = LOAD64BE(kRegs[m].s); + y = READ64BE(kRegs[m].s); if (x < y) { r = m - 1; } else if (x > y) { @@ -3710,7 +3702,7 @@ static bool OnDirective8(struct As *a, struct Slice s) { r = ARRAYLEN(kDirective8) - 1; while (l <= r) { m = (l + r) >> 1; - y = LOAD64BE(kDirective8[m].s); + y = READ64BE(kDirective8[m].s); if (x < y) { r = m - 1; } else if (x > y) { @@ -3733,7 +3725,7 @@ static bool OnDirective16(struct As *a, struct Slice s) { r = ARRAYLEN(kDirective16) - 1; while (l <= r) { m = (l + r) >> 1; - y = LOAD128BE(kDirective16[m].s); + y = READ128BE(kDirective16[m].s); if (x < y) { r = m - 1; } else if (x > y) { diff --git a/third_party/chibicc/hashmap.c b/third_party/chibicc/hashmap.c index 05ec2e775..90902ae08 100644 --- a/third_party/chibicc/hashmap.c +++ b/third_party/chibicc/hashmap.c @@ -26,7 +26,7 @@ static void rehash(HashMap *map) { nkeys++; } } - size_t cap = map->capacity; + int cap = MAX(8, map->capacity); while ((nkeys * 100) / cap >= LOW_WATERMARK) cap = cap * 2; assert(cap > 0); // Create a new hashmap and copy all key-values. diff --git a/third_party/dlmalloc/dlmalloc.c b/third_party/dlmalloc/dlmalloc.c index 4bf1b9810..4b33edc6c 100644 --- a/third_party/dlmalloc/dlmalloc.c +++ b/third_party/dlmalloc/dlmalloc.c @@ -37,9 +37,10 @@ hidden struct MallocParams g_mparams; */ static void *dlmalloc_requires_more_vespene_gas(size_t size) { char *p; - p = mapanon(size); - if (weaken(__asan_poison)) { - weaken(__asan_poison)((uintptr_t)p, size, kAsanHeapFree); + if ((p = mapanon(size)) != MAP_FAILED) { + if (weaken(__asan_poison)) { + weaken(__asan_poison)((uintptr_t)p, size, kAsanHeapFree); + } } return p; } @@ -836,7 +837,7 @@ textstartup void dlmalloc_init(void) { if (g_mparams.magic == 0) { size_t magic; size_t psize = PAGESIZE; - size_t gsize = FRAMESIZE; + size_t gsize = DEFAULT_GRANULARITY; /* Sanity-check configuration: size_t must be unsigned and as wide as pointer type. ints must be at least 4 bytes. diff --git a/third_party/dlmalloc/dlmalloc.internal.h b/third_party/dlmalloc/dlmalloc.internal.h index a88b8000d..5a3357dd1 100644 --- a/third_party/dlmalloc/dlmalloc.internal.h +++ b/third_party/dlmalloc/dlmalloc.internal.h @@ -907,7 +907,7 @@ extern struct MallocParams g_mparams; #else /* GNUC */ #define RTCHECK(e) (e) #endif /* GNUC */ -#else /* !IsTrustworthy() */ +#else /* !IsTrustworthy() */ #define RTCHECK(e) (1) #endif /* !IsTrustworthy() */ @@ -1230,12 +1230,12 @@ forceinline msegmentptr segment_holding(mstate m, char *addr) { #define check_malloc_state(M) do_check_malloc_state(M) #endif /* DEBUG */ -void do_check_free_chunk(mstate m, mchunkptr p) hidden; -void do_check_inuse_chunk(mstate m, mchunkptr p) hidden; -void do_check_top_chunk(mstate m, mchunkptr p) hidden; -void do_check_malloced_chunk(mstate m, void *mem, size_t s) hidden; -void do_check_mmapped_chunk(mstate m, mchunkptr p) hidden; -void do_check_malloc_state(mstate m) hidden; +void do_check_free_chunk(mstate, mchunkptr) hidden; +void do_check_inuse_chunk(mstate, mchunkptr) hidden; +void do_check_top_chunk(mstate, mchunkptr) hidden; +void do_check_malloced_chunk(mstate, void *, size_t) hidden; +void do_check_mmapped_chunk(mstate, mchunkptr) hidden; +void do_check_malloc_state(mstate) hidden; /* ─────────────────────────── prototypes ──────────────────────────────── */ diff --git a/third_party/regex/regex.h b/third_party/regex/regex.h index c2d2a6c4b..038511dd4 100644 --- a/third_party/regex/regex.h +++ b/third_party/regex/regex.h @@ -14,8 +14,8 @@ COSMOPOLITAN_C_START_ #define REG_NEWLINE 4 #define REG_NOSUB 8 -#define REG_NOTBOL 1 -#define REG_NOTEOL 2 +#define REG_NOTBOL 1 /* ^ should not match beginning of string */ +#define REG_NOTEOL 2 /* $ should not match end of string */ #define REG_OK 0 #define REG_NOMATCH 1 @@ -36,20 +36,20 @@ COSMOPOLITAN_C_START_ typedef long regoff_t; -struct Regex { +struct PosixRegex { size_t re_nsub; void *__opaque, *__padding[4]; size_t __nsub2; char __padding2; }; -struct RegexMatch { +struct PosixRegexMatch { regoff_t rm_so; regoff_t rm_eo; }; -typedef struct Regex regex_t; -typedef struct RegexMatch regmatch_t; +typedef struct PosixRegex regex_t; +typedef struct PosixRegexMatch regmatch_t; int regcomp(regex_t *, const char *, int); int regexec(const regex_t *, const char *, size_t, regmatch_t *, int); diff --git a/tool/build/lib/cvt.c b/tool/build/lib/cvt.c index 7a85bb262..04f4373dc 100644 --- a/tool/build/lib/cvt.c +++ b/tool/build/lib/cvt.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/macros.internal.h" #include "libc/math.h" +#include "libc/str/str.h" #include "tool/build/lib/cvt.h" #include "tool/build/lib/endian.h" #include "tool/build/lib/machine.h" diff --git a/tool/build/lib/endian.h b/tool/build/lib/endian.h index da716f707..f23d1d39b 100644 --- a/tool/build/lib/endian.h +++ b/tool/build/lib/endian.h @@ -1,116 +1,53 @@ #ifndef COSMOPOLITAN_TOOL_BUILD_LIB_ENDIAN_H_ #define COSMOPOLITAN_TOOL_BUILD_LIB_ENDIAN_H_ -#include "libc/dce.h" -#include "libc/str/str.h" -#if !(__ASSEMBLER__ + __LINKER__ + 0) -#if __BYTE_ORDER__ + 0 == 1234 +#include "libc/bits/bits.h" -#define Read8(P) \ - ({ \ - uint8_t *Ptr = (P); \ - *Ptr; \ +#define Read8(P) (*(const uint8_t *)(P)) + +#define Read16(P) \ + ({ \ + const uint8_t *Ptr = (const uint8_t *)(P); \ + READ16LE(P); \ }) -#define Read16(P) \ - ({ \ - uint16_t Res; \ - uint8_t *Ptr = (P); \ - memcpy(&Res, Ptr, 2); \ - Res; \ +#define Read32(P) \ + ({ \ + const uint8_t *Ptr = (const uint8_t *)(P); \ + READ32LE(P); \ }) -#define Read32(P) \ - ({ \ - uint32_t Res; \ - uint8_t *Ptr = (P); \ - memcpy(&Res, Ptr, 4); \ - Res; \ +#define Read64(P) \ + ({ \ + const uint8_t *Ptr = (const uint8_t *)(P); \ + READ64LE(P); \ }) -#define Read64(P) \ - ({ \ - uint64_t Res; \ - uint8_t *Ptr = (P); \ - memcpy(&Res, Ptr, 8); \ - Res; \ - }) - -#define Write8(P, B) \ +#define Write8(P, V) \ do { \ + uint8_t Val = (V); \ uint8_t *Ptr = (P); \ - *Ptr = (B); \ + *Ptr = Val; \ } while (0) -#define Write16(P, V) \ - do { \ - uint16_t Val = (V); \ - uint8_t *Ptr = (P); \ - memcpy(Ptr, &Val, 2); \ +#define Write16(P, V) \ + do { \ + uint16_t Val = (V); \ + uint8_t *Ptr = (P); \ + WRITE16LE(Ptr, Val); \ } while (0) -#define Write32(P, V) \ - do { \ - uint32_t Val = (V); \ - uint8_t *Ptr = (P); \ - memcpy(Ptr, &Val, 4); \ +#define Write32(P, V) \ + do { \ + uint32_t Val = (V); \ + uint8_t *Ptr = (P); \ + WRITE32LE(Ptr, Val); \ } while (0) -#define Write64(P, V) \ - do { \ - uint64_t Val = (V); \ - uint8_t *Ptr = (P); \ - memcpy(Ptr, &Val, 8); \ +#define Write64(P, V) \ + do { \ + uint64_t Val = (V); \ + uint8_t *Ptr = (P); \ + WRITE64LE(Ptr, Val); \ } while (0) -#else - -forceinline uint16_t Read8(const uint8_t p[hasatleast 1]) { - return p[0]; -} - -forceinline uint16_t Read16(const uint8_t p[hasatleast 2]) { - return p[0] | p[1] << 010; -} - -forceinline uint32_t Read32(const uint8_t bytes[hasatleast 4]) { - return (uint32_t)bytes[0] << 000 | (uint32_t)bytes[1] << 010 | - (uint32_t)bytes[2] << 020 | (uint32_t)bytes[3] << 030; -} - -forceinline uint64_t Read64(const uint8_t bytes[hasatleast 8]) { - return (uint64_t)bytes[0] << 000 | (uint64_t)bytes[1] << 010 | - (uint64_t)bytes[2] << 020 | (uint64_t)bytes[3] << 030 | - (uint64_t)bytes[4] << 040 | (uint64_t)bytes[5] << 050 | - (uint64_t)bytes[6] << 060 | (uint64_t)bytes[7] << 070; -} - -forceinline void Write8(unsigned char p[hasatleast 1], uint8_t x) { - p[0] = x >> 000; -} - -forceinline void Write16(unsigned char p[hasatleast 2], uint16_t x) { - p[0] = x >> 000; - p[1] = x >> 010; -} - -forceinline void Write32(unsigned char p[hasatleast 4], uint64_t x) { - p[0] = x >> 000; - p[1] = x >> 010; - p[2] = x >> 020; - p[3] = x >> 030; -} - -forceinline void Write64(unsigned char p[hasatleast 8], uint64_t x) { - p[0] = x >> 000; - p[1] = x >> 010; - p[2] = x >> 020; - p[3] = x >> 030; - p[4] = x >> 040; - p[5] = x >> 050; - p[6] = x >> 060; - p[7] = x >> 070; -} - -#endif /* ENDIAN */ -#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */ #endif /* COSMOPOLITAN_TOOL_BUILD_LIB_ENDIAN_H_ */ diff --git a/tool/build/lib/machine.c b/tool/build/lib/machine.c index c6478ce4b..72a42522a 100644 --- a/tool/build/lib/machine.c +++ b/tool/build/lib/machine.c @@ -20,6 +20,7 @@ #include "libc/macros.internal.h" #include "libc/rand/rand.h" #include "libc/runtime/runtime.h" +#include "libc/str/str.h" #include "tool/build/lib/abp.h" #include "tool/build/lib/address.h" #include "tool/build/lib/alu.h" @@ -1568,7 +1569,11 @@ static void Op1ae(struct Machine *m, uint32_t rde) { } static void OpSalc(struct Machine *m, uint32_t rde) { - Write8(m->ax, GetFlag(m->flags, FLAGS_CF)); + if (GetFlag(m->flags, FLAGS_CF)) { + m->ax[0] = 255; + } else { + m->ax[0] = 0; + } } static void OpBofram(struct Machine *m, uint32_t rde) { diff --git a/tool/build/lib/stack.c b/tool/build/lib/stack.c index 0ebe775dc..b646183a5 100644 --- a/tool/build/lib/stack.c +++ b/tool/build/lib/stack.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/log/check.h" #include "libc/macros.internal.h" +#include "libc/str/str.h" #include "tool/build/lib/address.h" #include "tool/build/lib/endian.h" #include "tool/build/lib/memory.h" diff --git a/tool/build/lib/syscall.c b/tool/build/lib/syscall.c index e22a07d0e..9ffd239f8 100644 --- a/tool/build/lib/syscall.c +++ b/tool/build/lib/syscall.c @@ -77,6 +77,8 @@ #include "tool/build/lib/throw.h" #include "tool/build/lib/xlaterrno.h" +#define SA_RESTORER 0x04000000 + #define AT_FDCWD_LINUX -100 #define TIOCGWINSZ_LINUX 0x5413 #define TCGETS_LINUX 0x5401 diff --git a/tool/build/lib/word.c b/tool/build/lib/word.c index f77df94b1..fd5d0ab8e 100644 --- a/tool/build/lib/word.c +++ b/tool/build/lib/word.c @@ -16,6 +16,7 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ +#include "libc/str/str.h" #include "tool/build/lib/endian.h" #include "tool/build/lib/memory.h" #include "tool/build/lib/word.h" diff --git a/tool/build/package.c b/tool/build/package.c index b9d1bbe49..a6c1f8184 100644 --- a/tool/build/package.c +++ b/tool/build/package.c @@ -25,6 +25,7 @@ #include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" #include "libc/calls/struct/stat.h" +#include "libc/dce.h" #include "libc/elf/def.h" #include "libc/elf/elf.h" #include "libc/elf/struct/rela.h" @@ -165,8 +166,8 @@ struct Packages { }; int CompareSymbolName(const struct Symbol *a, const struct Symbol *b, - const char *strs[hasatleast 2]) { - return strcmp(&strs[0][a->name], &strs[1][b->name]); + const char *tab) { + return strcmp(tab + a->name, tab + b->name); } struct Package *LoadPackage(const char *path) { @@ -189,6 +190,7 @@ struct Package *LoadPackage(const char *path) { pkg->strings.p); pkg->addr = pkg; pkg->size = st.st_size; + CHECK_NE(-1, mprotect(pkg, st.st_size, PROT_READ)); return pkg; } @@ -378,37 +380,48 @@ void LoadObjects(struct Package *pkg) { size_t i; struct Object *obj; for (i = 0; i < pkg->objects.i; ++i) { - obj = &pkg->objects.p[i]; + obj = pkg->objects.p + i; OpenObject(pkg, obj, O_RDONLY, PROT_READ, MAP_SHARED); LoadSymbols(pkg, i); CloseObject(obj); } - qsort_r(&pkg->symbols.p[0], pkg->symbols.i, sizeof(pkg->symbols.p[0]), - (void *)CompareSymbolName, - (const char *[2]){pkg->strings.p, pkg->strings.p}); + qsort_r(pkg->symbols.p, pkg->symbols.i, sizeof(*pkg->symbols.p), + (void *)CompareSymbolName, pkg->strings.p); +} + +struct Symbol *BisectSymbol(struct Package *pkg, const char *name) { + int c; + long m, l, r; + l = 0; + r = pkg->symbols.i - 1; + while (l <= r) { + m = (l + r) >> 1; + c = strcmp(pkg->strings.p + pkg->symbols.p[m].name, name); + if (c < 0) { + l = m + 1; + } else if (c > 0) { + r = m - 1; + } else { + return pkg->symbols.p + m; + } + } + return NULL; } bool FindSymbol(const char *name, struct Package *pkg, struct Packages *directdeps, struct Package **out_pkg, struct Symbol **out_sym) { - size_t i; - struct Package *dep; - struct Symbol key, *sym; - key.name = 0; - if ((sym = bisect(&key, &pkg->symbols.p[0], pkg->symbols.i, - sizeof(pkg->symbols.p[0]), (void *)CompareSymbolName, - (const char *[2]){name, pkg->strings.p}))) { - if (out_pkg) *out_pkg = pkg; + size_t i, j; + struct Symbol *sym; + if ((sym = BisectSymbol(pkg, name))) { if (out_sym) *out_sym = sym; + if (out_pkg) *out_pkg = pkg; return true; } for (i = 0; i < directdeps->i; ++i) { - dep = directdeps->p[i]; - if ((sym = bisect(&key, &dep->symbols.p[0], dep->symbols.i, - sizeof(dep->symbols.p[0]), (void *)CompareSymbolName, - (const char *[2]){name, dep->strings.p}))) { - if (out_pkg) *out_pkg = dep; + if ((sym = BisectSymbol(directdeps->p[i], name))) { if (out_sym) *out_sym = sym; + if (out_pkg) *out_pkg = directdeps->p[i]; return true; } } @@ -422,15 +435,15 @@ void CheckStrictDeps(struct Package *pkg, struct Packages *deps) { for (i = 0; i < pkg->undefs.i; ++i) { undef = &pkg->undefs.p[i]; if (undef->bind == STB_WEAK) continue; - if (!FindSymbol(&pkg->strings.p[undef->name], pkg, deps, NULL, NULL)) { - fprintf(stderr, "%s: %s (%s) %s %s\n", "error", - &pkg->strings.p[undef->name], - &pkg->strings.p[pkg->objects.p[undef->object].path], - "not defined by direct deps of", &pkg->strings.p[pkg->path]); + if (!FindSymbol(pkg->strings.p + undef->name, pkg, deps, NULL, NULL)) { + fprintf(stderr, "%s: %`'s (%s) %s %s\n", "error", + pkg->strings.p + undef->name, + pkg->strings.p + pkg->objects.p[undef->object].path, + "not defined by direct deps of", pkg->strings.p + pkg->path); for (j = 0; j < deps->i; ++j) { dep = deps->p[j]; fputc('\t', stderr); - fputs(&dep->strings.p[dep->path], stderr); + fputs(dep->strings.p + dep->path, stderr); fputc('\n', stderr); } exit(1); diff --git a/tool/build/zipobj.c b/tool/build/zipobj.c index 5804775c6..3b6f21186 100644 --- a/tool/build/zipobj.c +++ b/tool/build/zipobj.c @@ -55,16 +55,6 @@ #define ZIP_LOCALFILE_SECTION ".zip.2." #define ZIP_DIRECTORY_SECTION ".zip.4." -#define PUT8(P, V) *P++ = V -#define PUT16(P, V) P[0] = V & 0xff, P[1] = V >> 010 & 0xff, P += 2 -#define PUT32(P, V) \ - P[0] = V & 0xff, P[1] = V >> 010 & 0xff, P[2] = V >> 020 & 0xff, \ - P[3] = V >> 030 & 0xff, P += 4 -#define PUT64(P, V) \ - P[0] = V & 0xff, P[1] = V >> 010 & 0xff, P[2] = V >> 020 & 0xff, \ - P[3] = V >> 030 & 0xff, P[4] = V >> 040 & 0xff, P[5] = V >> 050 & 0xff, \ - P[6] = V >> 060 & 0xff, P[7] = V >> 070 & 0xff, P += 8 - #define DOS_DATE(YEAR, MONTH_IDX1, DAY_IDX1) \ (((YEAR)-1980) << 9 | (MONTH_IDX1) << 5 | (DAY_IDX1)) #define DOS_TIME(HOUR, MINUTE, SECOND) \ @@ -116,10 +106,24 @@ void GetOpts(int *argc, char ***argv) { CHECK_NOTNULL(outpath_); } -bool IsPureAscii(const void *data, size_t size) { +bool IsUtf8(const void *data, size_t size) { + const unsigned char *p, *pe; + for (p = data, pe = p + size; p + 2 <= pe; ++p) { + if (*p >= 0300) { + if (*p >= 0200 && *p < 0300) { + return true; + } else { + return false; + } + } + } + return false; +} + +bool IsText(const void *data, size_t size) { const unsigned char *p, *pe; for (p = data, pe = p + size; p < pe; ++p) { - if (!*p || *p >= 0x80) { + if (*p <= 3) { return false; } } @@ -146,86 +150,81 @@ void GetDosLocalTime(int64_t utcunixts, uint16_t *out_time, *out_date = DOS_DATE(tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday + 1); } -static unsigned char *EmitZipLfileHdr(unsigned char *op, const void *name, +static int DetermineVersionNeededToExtract(int method) { + if (method == kZipCompressionDeflate) { + return kZipEra1993; + } else { + return kZipEra1989; + } +} + +static unsigned char *EmitZipLfileHdr(unsigned char *p, const void *name, size_t namesize, uint32_t crc, uint8_t era, uint16_t gflags, uint16_t method, uint16_t mtime, uint16_t mdate, size_t compsize, size_t uncompsize) { - PUT32(op, kZipLfileHdrMagic); - PUT8(op, kZipEra1993); - PUT8(op, kZipOsDos); - PUT16(op, gflags); - PUT16(op, method); - PUT16(op, mtime); - PUT16(op, mdate); - PUT32(op, crc); - PUT32(op, compsize); - PUT32(op, uncompsize); - PUT16(op, namesize); - PUT16(op, 0); /* extra */ - return mempcpy(op, name, namesize); + p = WRITE32LE(p, kZipLfileHdrMagic); + *p++ = era; + *p++ = kZipOsDos; + p = WRITE16LE(p, gflags); + p = WRITE16LE(p, method); + p = WRITE16LE(p, mtime); + p = WRITE16LE(p, mdate); + p = WRITE32LE(p, crc); + p = WRITE32LE(p, compsize); + p = WRITE32LE(p, uncompsize); + p = WRITE16LE(p, namesize); + p = WRITE16LE(p, 0); /* extra */ + return mempcpy(p, name, namesize); } -static void EmitZipCdirHdr(unsigned char *op, const void *name, size_t namesize, +static void EmitZipCdirHdr(unsigned char *p, const void *name, size_t namesize, uint32_t crc, uint8_t era, uint16_t gflags, uint16_t method, uint16_t mtime, uint16_t mdate, uint16_t iattrs, uint16_t dosmode, uint16_t unixmode, size_t compsize, size_t uncompsize, size_t commentsize, struct stat *st) { uint64_t mt, at, ct; - PUT32(op, kZipCfileHdrMagic); - PUT8(op, 20); - PUT8(op, kZipOsDos); - PUT8(op, kZipEra1993); - PUT8(op, kZipOsDos); - PUT16(op, gflags); - PUT16(op, method); - PUT16(op, mtime); - PUT16(op, mdate); + p = WRITE32LE(p, kZipCfileHdrMagic); + *p++ = kZipCosmopolitanVersion; + *p++ = kZipOsUnix; + *p++ = era; + *p++ = kZipOsDos; + p = WRITE16LE(p, gflags); + p = WRITE16LE(p, method); + p = WRITE16LE(p, mtime); + p = WRITE16LE(p, mdate); /* 16 */ - PUT32(op, crc); - PUT32(op, compsize); - PUT32(op, uncompsize); - PUT16(op, namesize); -#if 0 -#define CFILE_HDR_SIZE kZipCfileHdrMinSize - PUT16(op, 0); /* extra size */ - /* 32 */ - PUT16(op, commentsize); - PUT16(op, 0); /* disk */ - PUT16(op, iattrs); - PUT16(op, dosmode); - PUT16(op, unixmode); - PUT32(op, 0); /* RELOCATE ME (kZipCfileOffsetOffset) */ - /* 46 */ - memcpy(op, name, namesize); -#else + p = WRITE32LE(p, crc); + p = WRITE32LE(p, compsize); + p = WRITE32LE(p, uncompsize); + p = WRITE16LE(p, namesize); #define CFILE_HDR_SIZE (kZipCfileHdrMinSize + 36) - PUT16(op, 36); /* extra size */ + p = WRITE16LE(p, 36); /* extra size */ /* 32 */ - PUT16(op, commentsize); - PUT16(op, 0); /* disk */ - PUT16(op, iattrs); - PUT32(op, dosmode); - PUT32(op, 0); /* RELOCATE ME (kZipCfileOffsetOffset) */ + p = WRITE16LE(p, commentsize); + p = WRITE16LE(p, 0); /* disk */ + p = WRITE16LE(p, iattrs); + p = WRITE16LE(p, dosmode); + p = WRITE16LE(p, unixmode); + p = WRITE32LE(p, 0); /* RELOCATE ME (kZipCfileOffsetOffset) */ /* 46 */ - memcpy(op, name, namesize); - op += namesize; - PUT16(op, kZipExtraNtfs); - PUT16(op, 32); - PUT32(op, 0); - PUT16(op, 1); - PUT16(op, 24); + memcpy(p, name, namesize); + p += namesize; + p = WRITE16LE(p, kZipExtraNtfs); + p = WRITE16LE(p, 32); + p = WRITE32LE(p, 0); + p = WRITE16LE(p, 1); + p = WRITE16LE(p, 24); #define NTTIME(t) \ (t.tv_sec + MODERNITYSECONDS) * HECTONANOSECONDS + t.tv_nsec / 100 mt = NTTIME(st->st_mtim); at = NTTIME(st->st_atim); ct = NTTIME(st->st_ctim); - PUT64(op, mt); - PUT64(op, at); - PUT64(op, ct); -#endif + p = WRITE64LE(p, mt); + p = WRITE64LE(p, at); + p = WRITE64LE(p, ct); } void EmitZip(struct ElfWriter *elf, const char *name, size_t namesize, @@ -238,15 +237,17 @@ void EmitZip(struct ElfWriter *elf, const char *name, size_t namesize, size_t lfilehdrsize, uncompsize, compsize, commentsize; uint16_t method, gflags, mtime, mdate, iattrs, dosmode; + gflags = 0; + iattrs = 0; compsize = st->st_size; uncompsize = st->st_size; CHECK_LE(uncompsize, UINT32_MAX); lfilehdrsize = kZipLfileHdrMinSize + namesize; crc = crc32_z(0, data, uncompsize); GetDosLocalTime(st->st_mtim.tv_sec, &mtime, &mdate); - gflags = IsPureAscii(name, namesize) ? 0 : kZipGflagUtf8; + if (IsUtf8(name, namesize)) gflags |= kZipGflagUtf8; + if (IsText(data, st->st_size)) iattrs |= kZipIattrText; commentsize = kZipCdirHdrLinkableSize - (CFILE_HDR_SIZE + namesize); - iattrs = IsPureAscii(data, st->st_size) ? kZipIattrAscii : kZipIattrBinary; dosmode = !(st->st_mode & 0200) ? kNtFileAttributeReadonly : 0; method = (st->st_size >= kMinCompressSize && ShouldCompress(name, namesize)) ? kZipCompressionDeflate @@ -280,7 +281,7 @@ void EmitZip(struct ElfWriter *elf, const char *name, size_t namesize, if (method == kZipCompressionNone) { memcpy(lfile + lfilehdrsize, data, uncompsize); } - era = (gflags || method) ? kZipEra1993 : kZipEra1989; + era = method ? kZipEra1993 : kZipEra1989; EmitZipLfileHdr(lfile, name, namesize, crc, era, gflags, method, mtime, mdate, compsize, uncompsize); elfwriter_commit(elf, lfilehdrsize + compsize); diff --git a/tool/decode/lib/zipnames.c b/tool/decode/lib/zipnames.c index 23bb65d28..39f028f7d 100644 --- a/tool/decode/lib/zipnames.c +++ b/tool/decode/lib/zipnames.c @@ -29,13 +29,15 @@ const struct IdName kZipCompressionNames[] = { const struct IdName kZipExtraNames[] = { {kZipExtraZip64, "kZipExtraZip64"}, {kZipExtraNtfs, "kZipExtraNtfs"}, + {kZipExtraUnix, "kZipExtraUnix"}, {kZipExtraExtendedTimestamp, "kZipExtraExtendedTimestamp"}, + {kZipExtraInfoZipNewUnixExtra, "kZipExtraInfoZipNewUnixExtra"}, {0, 0}, }; const struct IdName kZipIattrNames[] = { {kZipIattrBinary, "kZipIattrBinary"}, - {kZipIattrAscii, "kZipIattrAscii"}, + {kZipIattrText, "kZipIattrText"}, {0, 0}, }; diff --git a/tool/decode/zip.c b/tool/decode/zip.c index 3ee9bcb1c..151f74bd6 100644 --- a/tool/decode/zip.c +++ b/tool/decode/zip.c @@ -22,6 +22,7 @@ #include "libc/calls/struct/stat.h" #include "libc/fmt/conv.h" #include "libc/log/check.h" +#include "libc/log/log.h" #include "libc/mem/mem.h" #include "libc/nexgen32e/crc32.h" #include "libc/nt/struct/filetime.h" @@ -45,17 +46,17 @@ * @fileoverview Zip File Disassembler. */ -nodiscard char *formatdosdate(uint16_t dosdate) { +nodiscard char *FormatDosDate(uint16_t dosdate) { return xasprintf("%04u-%02u-%02u", ((dosdate >> 9) & 0b1111111) + 1980, (dosdate >> 5) & 0b1111, dosdate & 0b11111); } -nodiscard char *formatdostime(uint16_t dostime) { +nodiscard char *FormatDosTime(uint16_t dostime) { return xasprintf("%02u:%02u:%02u", (dostime >> 11) & 0b11111, (dostime >> 5) & 0b111111, (dostime << 1) & 0b111110); } -void advancepos(uint8_t *map, size_t *pos, size_t off) { +void AdvancePosition(uint8_t *map, size_t *pos, size_t off) { CHECK_GE(off, *pos); if (off > *pos) { printf("\n/\t<%s>\n", "LIMBO"); @@ -65,7 +66,7 @@ void advancepos(uint8_t *map, size_t *pos, size_t off) { *pos = off; } -void showgeneralflag(uint16_t generalflag) { +void ShowGeneralFlag(uint16_t generalflag) { puts("\ / ┌─utf8\n\ / │ ┌─strong encryption\n\ @@ -77,21 +78,21 @@ void showgeneralflag(uint16_t generalflag) { show(".short", format(b1, "0b%016b", generalflag), "generalflag"); } -void showtimestamp(uint16_t time, uint16_t date) { +void ShowTimestamp(uint16_t time, uint16_t date) { show(".short", format(b1, "%#04hx", time), - gc(xasprintf("%s (%s)", "lastmodifiedtime", gc(formatdostime(time))))); + gc(xasprintf("%s (%s)", "lastmodifiedtime", gc(FormatDosTime(time))))); show(".short", format(b1, "%#04hx", date), - gc(xasprintf("%s (%s)", "lastmodifieddate", gc(formatdosdate(date))))); + gc(xasprintf("%s (%s)", "lastmodifieddate", gc(FormatDosDate(date))))); } -void showcompressmethod(uint16_t compressmethod) { +void ShowCompressionMethod(uint16_t compressmethod) { show(".short", firstnonnull(findnamebyid(kZipCompressionNames, compressmethod), format(b1, "%hu", compressmethod)), "compressionmethod"); } -void showextrantfs(uint8_t *ntfs) { +void ShowNtfs(uint8_t *ntfs, size_t n) { struct timespec mtime, atime, ctime; mtime = FileTimeToTimeSpec( (struct NtFileTime){READ32LE(ntfs + 8), READ32LE(ntfs + 12)}); @@ -115,47 +116,85 @@ void showextrantfs(uint8_t *ntfs) { void ShowExtendedTimestamp(uint8_t *p, size_t n, bool islocal) { int flag; - int64_t x; - struct timespec ts; - flag = *p++; - show(".byte", gc(xasprintf("0b%03hhb", flag)), "fields present in local"); - if (!islocal) { - show(".quad", gc(xasprintf("%u", READ32LE(p))), - gc(xasprintf("%s (%s)", "last modified", gc(xiso8601(&ts))))); - } else { - if (flag & 1) { - ts = (struct timespec){READ32LE(p)}; - show(".quad", gc(xasprintf("%u", READ32LE(p))), - gc(xasprintf("%s (%s)", "last modified", gc(xiso8601(&ts))))); + if (n) { + --n; + flag = *p++; + show(".byte", gc(xasprintf("0b%03hhb", flag)), "fields present in local"); + if ((flag & 1) && n >= 4) { + show(".long", gc(xasprintf("%u", READ32LE(p))), + gc(xasprintf("%s (%s)", "last modified", + gc(xiso8601(&(struct timespec){READ32LE(p)}))))); p += 4; + n -= 4; } flag >>= 1; - if (flag & 1) { - ts = (struct timespec){READ32LE(p)}; - show(".quad", gc(xasprintf("%u", READ32LE(p))), - gc(xasprintf("%s (%s)", "access time", gc(xiso8601(&ts))))); - p += 4; - } - flag >>= 1; - if (flag & 1) { - ts = (struct timespec){READ32LE(p)}; - show(".quad", gc(xasprintf("%u", READ32LE(p))), - gc(xasprintf("%s (%s)", "creation time", gc(xiso8601(&ts))))); + if (islocal) { + if ((flag & 1) && n >= 4) { + show(".long", gc(xasprintf("%u", READ32LE(p))), + gc(xasprintf("%s (%s)", "access time", + gc(xiso8601(&(struct timespec){READ32LE(p)}))))); + p += 4; + n -= 4; + } + flag >>= 1; + if ((flag & 1) && n >= 4) { + show(".long", gc(xasprintf("%u", READ32LE(p))), + gc(xasprintf("%s (%s)", "creation time", + gc(xiso8601(&(struct timespec){READ32LE(p)}))))); + p += 4; + n -= 4; + } } } } -void showextra(uint8_t *extra, bool islocal) { +void ShowZip64(uint8_t *p, size_t n, bool islocal) { + if (n >= 8) { + show(".quad", gc(xasprintf("%lu", READ64LE(p))), + gc(xasprintf("uncompressed size (%,ld)", READ64LE(p)))); + } + if (n >= 16) { + show(".quad", gc(xasprintf("%lu", READ64LE(p + 8))), + gc(xasprintf("compressed size (%,ld)", READ64LE(p + 8)))); + } + if (n >= 24) { + show(".quad", gc(xasprintf("%lu", READ64LE(p + 16))), + gc(xasprintf("lfile hdr offset (%,ld)", READ64LE(p + 16)))); + } + if (n >= 28) { + show(".long", gc(xasprintf("%u", READ32LE(p + 24))), "disk number"); + } +} + +void ShowInfoZipNewUnixExtra(uint8_t *p, size_t n, bool islocal) { + if (p[0] == 1 && p[1] == 4 && p[6] == 4) { + show(".byte", "1", "version"); + show(".byte", "4", "uid length"); + show(".long", gc(xasprintf("%u", READ32LE(p + 2))), "uid"); + show(".byte", "4", "gid length"); + show(".long", gc(xasprintf("%u", READ32LE(p + 7))), "gid"); + } else { + disassemblehex(p, n, stdout); + } +} + +void ShowExtra(uint8_t *extra, bool islocal) { switch (ZIP_EXTRA_HEADERID(extra)) { case kZipExtraNtfs: - showextrantfs(ZIP_EXTRA_CONTENT(extra)); + ShowNtfs(ZIP_EXTRA_CONTENT(extra), ZIP_EXTRA_CONTENTSIZE(extra)); break; case kZipExtraExtendedTimestamp: ShowExtendedTimestamp(ZIP_EXTRA_CONTENT(extra), ZIP_EXTRA_CONTENTSIZE(extra), islocal); break; case kZipExtraZip64: - /* TODO */ + ShowZip64(ZIP_EXTRA_CONTENT(extra), ZIP_EXTRA_CONTENTSIZE(extra), + islocal); + break; + case kZipExtraInfoZipNewUnixExtra: + ShowInfoZipNewUnixExtra(ZIP_EXTRA_CONTENT(extra), + ZIP_EXTRA_CONTENTSIZE(extra), islocal); + break; default: disassemblehex(ZIP_EXTRA_CONTENT(extra), ZIP_EXTRA_CONTENTSIZE(extra), stdout); @@ -163,7 +202,7 @@ void showextra(uint8_t *extra, bool islocal) { } } -void showexternalattributes(uint8_t *cf) { +void ShowExternalAttributes(uint8_t *cf) { uint32_t ea; ea = ZIP_CFILE_EXTERNALATTRIBUTES(cf); if (ZIP_CFILE_FILEATTRCOMPAT(cf) == kZipOsUnix) { @@ -175,7 +214,7 @@ void showexternalattributes(uint8_t *cf) { } } -void showextras(uint8_t *extras, uint16_t extrassize, bool islocal) { +void ShowExtras(uint8_t *extras, uint16_t extrassize, bool islocal) { int i; bool first; uint8_t *p, *pe; @@ -194,14 +233,14 @@ void showextras(uint8_t *extras, uint16_t extrassize, bool islocal) { first = false; printf("%d:", (i + 1) * 10); } - showextra(p, islocal); + ShowExtra(p, islocal); printf("%d:", (i + 2) * 10); } } putchar('\n'); } -void showlocalfileheader(uint8_t *lf, uint16_t idx) { +void ShowLocalFileHeader(uint8_t *lf, uint16_t idx) { printf("\n/\t%s #%hu (%zu %s)\n", "local file", idx + 1, ZIP_LFILE_HDRSIZE(lf), "bytes"); show(".ascii", format(b1, "%`'.*s", 4, lf), "magic"); @@ -213,17 +252,23 @@ void showlocalfileheader(uint8_t *lf, uint16_t idx) { firstnonnull(findnamebyid(kZipOsNames, ZIP_LFILE_OSNEED(lf)), gc(xasprintf("%d", ZIP_LFILE_OSNEED(lf)))), "os need"); - showgeneralflag(ZIP_LFILE_GENERALFLAG(lf)); - showcompressmethod(ZIP_LFILE_COMPRESSIONMETHOD(lf)); - showtimestamp(ZIP_LFILE_LASTMODIFIEDTIME(lf), ZIP_LFILE_LASTMODIFIEDDATE(lf)); - show(".long", format(b1, "%#x", ZIP_LFILE_CRC32(lf)), - gc(xasprintf( - "%s (%#x)", "crc32z", - crc32_z(0, ZIP_LFILE_CONTENT(lf), ZIP_LFILE_COMPRESSEDSIZE(lf))))); - show(".long", "3f-2f", - format(b1, "%s (%u %s)", "compressedsize", ZIP_LFILE_COMPRESSEDSIZE(lf), - "bytes")); - show(".long", format(b1, "%u", ZIP_LFILE_UNCOMPRESSEDSIZE(lf)), + ShowGeneralFlag(ZIP_LFILE_GENERALFLAG(lf)); + ShowCompressionMethod(ZIP_LFILE_COMPRESSIONMETHOD(lf)); + ShowTimestamp(ZIP_LFILE_LASTMODIFIEDTIME(lf), ZIP_LFILE_LASTMODIFIEDDATE(lf)); + show( + ".long", + format(b1, "%#x", ZIP_LFILE_CRC32(lf)), gc(xasprintf("%s (%#x)", "crc32z", GetZipLfileCompressedSize(lf) /* crc32_z(0, ZIP_LFILE_CONTENT(lf), GetZipLfileCompressedSize(lf)) */))); + if (ZIP_LFILE_COMPRESSEDSIZE(lf) == 0xFFFFFFFF) { + show(".long", "0xFFFFFFFF", "compressedsize (zip64)"); + } else { + show(".long", "3f-2f", + format(b1, "%s (%u %s)", "compressedsize", + ZIP_LFILE_COMPRESSEDSIZE(lf), "bytes")); + } + show(".long", + ZIP_LFILE_UNCOMPRESSEDSIZE(lf) == 0xFFFFFFFF + ? "0xFFFFFFFF" + : format(b1, "%u", ZIP_LFILE_UNCOMPRESSEDSIZE(lf)), "uncompressedsize"); show(".short", "1f-0f", format(b1, "%s (%hu %s)", "namesize", ZIP_LFILE_NAMESIZE(lf), "bytes")); @@ -236,17 +281,19 @@ void showlocalfileheader(uint8_t *lf, uint16_t idx) { gc(strndup(ZIP_LFILE_NAME(lf), ZIP_LFILE_NAMESIZE(lf)))), "name"); printf("1:"); - showextras(ZIP_LFILE_EXTRA(lf), ZIP_LFILE_EXTRASIZE(lf), true); + ShowExtras(ZIP_LFILE_EXTRA(lf), ZIP_LFILE_EXTRASIZE(lf), true); printf("2:"); - disassemblehex(ZIP_LFILE_CONTENT(lf), ZIP_LFILE_COMPRESSEDSIZE(lf), stdout); + /* disassemblehex(ZIP_LFILE_CONTENT(lf), ZIP_LFILE_COMPRESSEDSIZE(lf), + * stdout); */ printf("3:\n"); } -void showcentralfileheader(uint8_t *cf) { +void ShowCentralFileHeader(uint8_t *cf) { printf("\n/\t%s (%zu %s)\n", "central directory file header", ZIP_CFILE_HDRSIZE(cf), "bytes"); show(".ascii", format(b1, "%`'.*s", 4, cf), "magic"); - show(".byte", gc(xasprintf("%d", ZIP_CFILE_VERSIONMADE(cf))), "version made"); + show(".byte", gc(xasprintf("%d", ZIP_CFILE_VERSIONMADE(cf))), + "zip version made"); show(".byte", firstnonnull(findnamebyid(kZipOsNames, ZIP_CFILE_FILEATTRCOMPAT(cf)), gc(xasprintf("%d", ZIP_CFILE_FILEATTRCOMPAT(cf)))), @@ -259,14 +306,22 @@ void showcentralfileheader(uint8_t *cf) { firstnonnull(findnamebyid(kZipOsNames, ZIP_CFILE_OSNEED(cf)), gc(xasprintf("%d", ZIP_CFILE_OSNEED(cf)))), "os need"); - showgeneralflag(ZIP_CFILE_GENERALFLAG(cf)); - showcompressmethod(ZIP_CFILE_COMPRESSIONMETHOD(cf)); - showtimestamp(ZIP_CFILE_LASTMODIFIEDTIME(cf), ZIP_CFILE_LASTMODIFIEDDATE(cf)); + ShowGeneralFlag(ZIP_CFILE_GENERALFLAG(cf)); + ShowCompressionMethod(ZIP_CFILE_COMPRESSIONMETHOD(cf)); + ShowTimestamp(ZIP_CFILE_LASTMODIFIEDTIME(cf), ZIP_CFILE_LASTMODIFIEDDATE(cf)); show(".long", format(b1, "%#x", ZIP_CFILE_CRC32(cf)), "crc32z"); - show(".long", format(b1, "%u", ZIP_CFILE_COMPRESSEDSIZE(cf)), - "compressedsize"); - show(".long", format(b1, "%u", ZIP_CFILE_UNCOMPRESSEDSIZE(cf)), - "uncompressedsize"); + if (ZIP_CFILE_COMPRESSEDSIZE(cf) == 0xFFFFFFFF) { + show(".long", "0xFFFFFFFF", "compressedsize (zip64)"); + } else { + show(".long", format(b1, "%u", ZIP_CFILE_COMPRESSEDSIZE(cf)), + "compressedsize"); + } + if (ZIP_CFILE_UNCOMPRESSEDSIZE(cf) == 0xFFFFFFFF) { + show(".long", "0xFFFFFFFF", "compressedsize (zip64)"); + } else { + show(".long", format(b1, "%u", ZIP_CFILE_UNCOMPRESSEDSIZE(cf)), + "uncompressedsize"); + } show(".short", "1f-0f", format(b1, "%s (%hu %s)", "namesize", ZIP_CFILE_NAMESIZE(cf), "bytes")); show( @@ -277,23 +332,29 @@ void showcentralfileheader(uint8_t *cf) { "bytes")); show(".short", format(b1, "%hu", ZIP_CFILE_DISK(cf)), "disk"); show(".short", - RecreateFlags(kZipIattrNames, ZIP_CFILE_INTERNALATTRIBUTES(cf)), + RecreateFlags(kZipIattrNames, ZIP_CFILE_INTERNALATTRIBUTES(cf) & 1), "internalattributes"); - showexternalattributes(cf); - show(".long", format(b1, "%u", ZIP_CFILE_OFFSET(cf)), "lfile hdr offset"); + ShowExternalAttributes(cf); + if (ZIP_CFILE_OFFSET(cf) == 0xFFFFFFFF) { + show(".long", "0xFFFFFFFF", "lfile hdr offset (zip64)"); + } else { + show(".long", format(b1, "%u", ZIP_CFILE_OFFSET(cf)), "lfile hdr offset"); + } printf("0:"); show(".ascii", format(b1, "%`'s", gc(strndup(ZIP_CFILE_NAME(cf), ZIP_CFILE_NAMESIZE(cf)))), "name"); printf("1:"); - showextras(ZIP_CFILE_EXTRA(cf), ZIP_CFILE_EXTRASIZE(cf), false); + ShowExtras(ZIP_CFILE_EXTRA(cf), ZIP_CFILE_EXTRASIZE(cf), false); printf("2:"); - disassemblehex(ZIP_CFILE_COMMENT(cf), ZIP_CFILE_COMMENTSIZE(cf), stdout); + show(".ascii", + format(b1, "%`'.*s", ZIP_CFILE_COMMENTSIZE(cf), ZIP_CFILE_COMMENT(cf)), + "comment"); printf("3:\n"); } -void showcentraldirheader(uint8_t *cd) { +void ShowCentralDirHeader32(uint8_t *cd) { printf("\n/\t%s (%zu %s)\n", "end of central directory header", ZIP_CDIR_HDRSIZE(cd), "bytes"); show(".ascii", format(b1, "%`'.*s", 4, cd), "magic"); @@ -312,39 +373,116 @@ void showcentraldirheader(uint8_t *cd) { printf("1:\n"); } -void disassemblezip(uint8_t *map, size_t mapsize) { +void ShowCentralDirHeader64(uint8_t *cd) { + printf("\n/\t%s (%zu %s)\n", "zip64 end of central directory header", + ZIP_CDIR64_HDRSIZE(cd), "bytes"); + show(".ascii", format(b1, "%`'.*s", 4, cd), "magic"); + show(".quad", format(b1, "%lu", ZIP_CDIR64_HDRSIZE(cd) - 12), "hdr size"); + show(".short", format(b1, "%hd", ZIP_CDIR64_VERSIONMADE(cd)), "version made"); + show(".short", format(b1, "%hd", ZIP_CDIR64_VERSIONNEED(cd)), "version need"); + show(".long", format(b1, "%d", ZIP_CDIR64_DISK(cd)), "disk"); + show(".long", format(b1, "%d", ZIP_CDIR64_STARTINGDISK(cd)), "startingdisk"); + show(".quad", format(b1, "%lu", ZIP_CDIR64_RECORDSONDISK(cd)), + "recordsondisk"); + show(".quad", format(b1, "%lu", ZIP_CDIR64_RECORDS(cd)), "records"); + show(".quad", format(b1, "%lu", ZIP_CDIR64_SIZE(cd)), "cdir size"); + show(".quad", format(b1, "%lu", ZIP_CDIR64_OFFSET(cd)), "cdir offset"); + printf("0:"); + disassemblehex(ZIP_CDIR64_COMMENT(cd), ZIP_CDIR64_COMMENTSIZE(cd), stdout); + printf("1:\n"); +} + +uint8_t *GetZipCdir32(const uint8_t *p, size_t n) { + size_t i; + if (n >= kZipCdirHdrMinSize) { + i = n - kZipCdirHdrMinSize; + do { + if (READ32LE(p + i) == kZipCdirHdrMagic && IsZipCdir32(p, n, i)) { + return (/*unconst*/ uint8_t *)(p + i); + } + } while (i--); + } + return NULL; +} + +uint8_t *GetZipCdir64(const uint8_t *p, size_t n) { + size_t i; + if (n >= kZipCdir64HdrMinSize) { + i = n - kZipCdir64HdrMinSize; + do { + if (READ32LE(p + i) == kZipCdir64HdrMagic && IsZipCdir64(p, n, i)) { + return (/*unconst*/ uint8_t *)(p + i); + } + } while (i--); + } + return NULL; +} + +void DisassembleZip(const char *path, uint8_t *p, size_t n) { size_t pos; uint16_t i; static int records; - uint8_t *cd, *cf, *lf; - CHECK_NOTNULL((cd = zipfindcentraldir(map, mapsize))); + uint8_t *eocd32, *eocd64, *cdir, *cf, *lf, *q; + if (endswith(path, ".com.dbg") && (q = memmem(p, n, "MZqFpD", 6))) { + n -= q - p; + p += q - p; + } + eocd32 = GetZipCdir32(p, n); + eocd64 = GetZipCdir64(p, n); + CHECK(eocd32 || eocd64); pos = 0; - records = ZIP_CDIR_RECORDS(cd); - for (i = 0, cf = map + ZIP_CDIR_OFFSET(cd); i < records; - ++i, cf += ZIP_CFILE_HDRSIZE(cf)) { - lf = map + ZIP_CFILE_OFFSET(cf); + if (eocd64) { + records = ZIP_CDIR64_RECORDS(eocd64); + cdir = p + ZIP_CDIR64_OFFSET(eocd64); + } else { + records = ZIP_CDIR_RECORDS(eocd32); + cdir = p + ZIP_CDIR_OFFSET(eocd32); + } + for (i = 0, cf = cdir; i < records; ++i, cf += ZIP_CFILE_HDRSIZE(cf)) { + lf = p + GetZipCfileOffset(cf); CHECK_EQ(kZipLfileHdrMagic, ZIP_LFILE_MAGIC(lf)); - advancepos(map, &pos, lf - map); - showlocalfileheader(lf, i); - pos = (lf - map) + ZIP_LFILE_SIZE(lf); + AdvancePosition(p, &pos, lf - p); + ShowLocalFileHeader(lf, i); + pos = (lf - p) + ZIP_LFILE_SIZE(lf); } - for (i = 0, cf = map + ZIP_CDIR_OFFSET(cd); i < records; - ++i, cf += ZIP_CFILE_HDRSIZE(cf)) { + for (i = 0, cf = cdir; i < records; ++i, cf += ZIP_CFILE_HDRSIZE(cf)) { CHECK_EQ(kZipCfileHdrMagic, ZIP_CFILE_MAGIC(cf)); - advancepos(map, &pos, cf - map); - showcentralfileheader(cf); - pos = (cf - map) + ZIP_CFILE_HDRSIZE(cf); + AdvancePosition(p, &pos, cf - p); + ShowCentralFileHeader(cf); + pos = (cf - p) + ZIP_CFILE_HDRSIZE(cf); } - advancepos(map, &pos, cd - map); - showcentraldirheader(cd); - pos = (cd - map) + ZIP_CDIR_HDRSIZE(cd); - advancepos(map, &pos, mapsize); + if (eocd32 && eocd64) { + if (eocd32 < eocd64) { + ShowCentralDirHeader32(eocd32); + AdvancePosition(p, &pos, eocd32 - p); + ShowCentralDirHeader64(eocd64); + AdvancePosition(p, &pos, eocd64 - p); + } else { + ShowCentralDirHeader64(eocd64); + AdvancePosition(p, &pos, eocd64 - p); + ShowCentralDirHeader32(eocd32); + AdvancePosition(p, &pos, eocd32 - p); + } + } else if (eocd32) { + ShowCentralDirHeader32(eocd32); + AdvancePosition(p, &pos, eocd32 - p); + } else { + ShowCentralDirHeader64(eocd64); + AdvancePosition(p, &pos, eocd64 - p); + } + if (!eocd64 || eocd32 > eocd64) { + pos = eocd32 - p + ZIP_CDIR_HDRSIZE(eocd32); + } else { + pos = eocd64 - p + ZIP_CDIR_HDRSIZE(eocd64); + } + AdvancePosition(p, &pos, n); } int main(int argc, char *argv[]) { int fd; uint8_t *map; struct stat st; + showcrashreports(); CHECK_EQ(2, argc); CHECK_NE(-1, (fd = open(argv[1], O_RDONLY))); CHECK_NE(-1, fstat(fd, &st)); @@ -353,7 +491,7 @@ int main(int argc, char *argv[]) { (map = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0))); showtitle("αcτµαlly pδrταblε εxεcµταblε", "tool/decode/zip", basename(argv[1]), NULL, &kModelineAsm); - disassemblezip(map, st.st_size); + DisassembleZip(argv[1], map, st.st_size); CHECK_NE(-1, munmap(map, st.st_size)); CHECK_NE(-1, close(fd)); return 0; diff --git a/tool/net/.init.lua b/tool/net/.init.lua index 080402535..778f344ec 100644 --- a/tool/net/.init.lua +++ b/tool/net/.init.lua @@ -1,3 +1,2 @@ -- special script called by main redbean process at startup -ProgramRedirect(0, '/favicon.ico', '/tool/net/redbean.ico') HidePath('/usr/share/zoneinfo/') diff --git a/tool/net/demo/.init.lua b/tool/net/demo/.init.lua new file mode 100644 index 000000000..077d60f7d --- /dev/null +++ b/tool/net/demo/.init.lua @@ -0,0 +1,17 @@ +-- /.init.lua is loaded at startup in redbean's main process + +HidePath('/usr/share/zoneinfo/') + +function OnHttpRequest() + if HasParam('magic') then + Write('

\r\n') + Write('OnHttpRequest() has intercepted your request
\r\n') + Write('because you specified the magic parameter\r\n') + Write('

\r\n')
+      Write(EscapeHtml(LoadAsset('/.init.lua')))
+      Write('
\r\n') + else + Route() + end + SetHeader('Server', 'redbean!') +end diff --git a/tool/net/.reload.lua b/tool/net/demo/.reload.lua similarity index 100% rename from tool/net/.reload.lua rename to tool/net/demo/.reload.lua diff --git a/tool/net/demo/404.html b/tool/net/demo/404.html new file mode 100644 index 000000000..5e893efee --- /dev/null +++ b/tool/net/demo/404.html @@ -0,0 +1,11 @@ + +404 not found + +
+ _  _    ___  _  _                 _      __                       _ 
+| || |  / _ \| || |    _ __   ___ | |_   / _| ___  _   _ _ __   __| |
+| || |_| | | | || |_  | '_ \ / _ \| __| | |_ / _ \| | | | '_ \ / _` |
+|__   _| |_| |__   _| | | | | (_) | |_  |  _| (_) | |_| | | | | (_| |
+   |_|  \___/   |_|   |_| |_|\___/ \__| |_|  \___/ \__,_|_| |_|\__,_|
+                                                                     
+
diff --git a/tool/net/demo/hello.lua b/tool/net/demo/hello.lua new file mode 100644 index 000000000..602458869 --- /dev/null +++ b/tool/net/demo/hello.lua @@ -0,0 +1 @@ +Write('hello world\r\n') diff --git a/tool/net/redbean.html b/tool/net/demo/index.html similarity index 86% rename from tool/net/redbean.html rename to tool/net/demo/index.html index c7f6fe5b8..8cca37ed7 100644 --- a/tool/net/redbean.html +++ b/tool/net/demo/index.html @@ -1,8 +1,8 @@ redbean - - + +

redbean
diff --git a/tool/net/demo/redbean-form.lua b/tool/net/demo/redbean-form.lua new file mode 100644 index 000000000..527c72081 --- /dev/null +++ b/tool/net/demo/redbean-form.lua @@ -0,0 +1,70 @@ +-- redbean post request handler demo + +local function main() + if GetMethod() ~= 'POST' then + ServeError(405) + SetHeader('Allow', 'POST') + return + end + SetStatus(200) + SetHeader('Content-Type', 'text/html; charset=utf-8') + Write('\r\n') + Write('redbean\r\n') + Write('

POST Request HTML Form Handler Demo

\r\n') + + Write('

') + firstname = GetParam('firstname') + lastname = GetParam('lastname') + if firstname and lastname then + Write('Hello ') + Write(EscapeHtml(VisualizeControlCodes(firstname))) + Write(' ') + Write(EscapeHtml(VisualizeControlCodes(lastname))) + Write('!
') + Write('Thank you for using redbean.') + end + + Write('

\r\n') + + Write('
Params\r\n') + Write('
\r\n') + Write('
\r\n') + params = GetParams() + for i = 1,#params do + Write('
') + Write(EscapeHtml(VisualizeControlCodes(params[i][1]))) + Write('\r\n') + if params[i][2] then + Write('
') + Write(EscapeHtml(VisualizeControlCodes(params[i][2]))) + Write('\r\n') + end + end + Write('
\r\n') + + Write('
Headers\r\n') + Write('
\r\n') + Write('
\r\n') + for k,v in pairs(GetHeaders()) do + Write('
') + Write(EscapeHtml(k)) + Write('\r\n') + Write('
') + Write(EscapeHtml(v)) + Write('\r\n') + end + Write('
\r\n') + + Write('
Payload\r\n') + Write('

') + Write(EscapeHtml(VisualizeControlCodes(GetPayload()))) + Write('\r\n') + + Write('

\r\n') + + Write('

') + Write('Click here ') + Write('to return to the previous page.\r\n') +end + +main() diff --git a/tool/net/demo/redbean-xhr.lua b/tool/net/demo/redbean-xhr.lua new file mode 100644 index 000000000..a2daf44d1 --- /dev/null +++ b/tool/net/demo/redbean-xhr.lua @@ -0,0 +1,8 @@ +-- redbean xhr handler demo +hdr = GetHeader('x-custom-header') +if hdr then + SetHeader('Vary', 'X-Custom-Header') + SetHeader('X-Custom-Header', 'hello ' .. hdr) +else + ServeError(400) +end diff --git a/tool/net/redbean.css b/tool/net/demo/redbean.css similarity index 100% rename from tool/net/redbean.css rename to tool/net/demo/redbean.css diff --git a/tool/net/demo/redbean.lua b/tool/net/demo/redbean.lua new file mode 100644 index 000000000..3c9650fbd --- /dev/null +++ b/tool/net/demo/redbean.lua @@ -0,0 +1,350 @@ +-- redbean lua server page demo + +local function main() + -- This is the best way to print data to the console or log file. + Log(kLogWarn, "hello from \e[1mlua\e[0m!") + + -- This check is pedantic but might be good to have. + if GetMethod() ~= 'GET' and GetMethod() ~= 'HEAD' then + ServeError(405) + SetHeader('Allow', 'GET, HEAD') + return + end + + -- These two lines are optional. + -- The default behavior is to do this if you don't. + SetStatus(200) -- Shorthand for SetStatus(200, "OK") + SetHeader('Content-Type', 'text/html; charset=utf-8') + + -- Response data is buffered until the script finishes running. + -- Compression is applied automatically, based on your headers. + Write('\r\n') + Write('redbean\r\n') + Write('

\r\n') + Write('\r\n') + Write('redbean lua server page demo\r\n') + Write('

\r\n') + + -- Prevent caching. + -- We need this because we're doing things like putting the client's + -- IP address in the response so we naturally don't want that cached + SetHeader('Expires', FormatHttpDateTime(GetDate())) + SetHeader('Cache-Control', 'no-cache, must-revalidate, max-age=0') + + -- GetUrl() is the resolved Request-URI (TODO: Maybe change API to return a URL object?) + Write('

Thank you for visiting ') + Write(GetUrl()) -- redbean encoded this value so it doesn't need html entity escaping + Write('\r\n') + + -- GetParam(NAME) is the fastest easiest way to get URL and FORM params + -- If you want the RequestURL query params specifically in full do this + Write('

request url parameters

\r\n') + params = ParseUrl(GetUrl()).params -- like GetParams() but w/o form body + if params and #params>0 then + Write('
\r\n') + for i = 1,#params do + Write('
') + Write(EscapeHtml(VisualizeControlCodes(params[i][1]))) + Write('\r\n') + if params[i][2] then + Write('
') + Write(EscapeHtml(VisualizeControlCodes(params[i][2]))) + Write('\r\n') + end + end + Write('
\r\n') + Write("

Whatever you do, don't click on ") + Write('') + Write(EscapeHtml(VisualizeControlCodes(GetPath()))) + Write('?magic\r\n') + else + Write('

\r\n') + Write('none
\r\n') + Write('ProTip: Try clicking here!\r\n') + end + + -- redbean command line arguments + -- these come *after* the c getopt server arguments + Write('

command line arguments

\r\n') + if #argv > 0 then + Write('
    \r\n') + for i = 1,#argv do + Write('
  • ') + Write(EscapeHtml(VisualizeControlCodes(argv[i]))) + Write('\r\n') + end + Write('
\r\n') + else + Write('

none\r\n') + end + + Write([[ +

post request html form demo

+
+ + +
+ + +
+ +
+ ]]) + + Write([[ +

xmlhttprequest request demo

+ +
+
+
+ + ]]) + + -- fast redbean apis for accessing already parsed request data + Write('

extra information

\r\n') + Write('
\r\n') + Write('
GetMethod()\r\n') + Write('
') + Write(EscapeHtml(GetMethod())) -- & and ' are legal in http methods + Write('\r\n') + if GetUser() then + Write('
GetUser()\r\n') + Write('
') + Write(EscapeHtml(VisualizeControlCodes(GetUser()))) + Write('\r\n') + end + if GetScheme() then + Write('
GetScheme()\r\n') + Write('
') + Write(GetScheme()) + Write('\r\n') + end + if GetPass() then + Write('
GetPass()\r\n') + Write('
') + Write(EscapeHtml(VisualizeControlCodes(GetPass()))) + Write('\r\n') + end + Write('
GetHost() (from HTTP Request-URI or Host header or X-Forwarded-Host header or Berkeley Sockets)\r\n') + Write('
') + Write(EscapeHtml(VisualizeControlCodes(GetHost()))) + Write('\r\n') + Write('
GetPort() (from HTTP Request-URI or Host header or X-Forwarded-Host header or Berkeley Sockets)\r\n') + Write('
') + Write(tostring(GetPort())) + Write('\r\n') + Write('
GetPath() (from HTTP Request-URI)\r\n') + Write('
') + Write(EscapeHtml(VisualizeControlCodes(GetPath()))) + Write('\r\n') + Write('
GetEffectivePath() (actual path used internally to load the lua asset: routed depending on host, request path, and rewrites)\r\n') + Write('
') + Write(EscapeHtml(VisualizeControlCodes(GetEffectivePath()))) + Write('\r\n') + if GetFragment() then + Write('
GetFragment()\r\n') + Write('
') + Write(EscapeHtml(VisualizeControlCodes(GetFragment()))) + Write('\r\n') + end + Write('
GetRemoteAddr() (from Bekeley Sockets or X-Forwarded-For header)\r\n') + Write('
') + ip, port = GetRemoteAddr() + Write(string.format('%s, %d', FormatIp(ip), port)) + if CategorizeIp(ip) then + Write('
\r\n') + Write(CategorizeIp(ip)) + end + Write('\r\n') + Write('
GetClientAddr()\r\n') + Write('
') + ip, port = GetClientAddr() + Write(string.format('%s, %d', FormatIp(ip), port)) + if CategorizeIp(ip) then + Write('
\r\n') + Write(CategorizeIp(ip)) + end + Write('\r\n') + Write('
GetServerIp()\r\n') + Write('
') + ip, port = GetServerAddr() + Write(string.format('%s, %d', FormatIp(ip), port)) + if CategorizeIp(ip) then + Write('
\r\n') + Write(CategorizeIp(ip)) + end + Write('\r\n') + Write('
\r\n') + + -- redbean apis for generalized parsing and encoding + referer = GetHeader('Referer') + if referer then + url = ParseUrl(referer) + if url.scheme then + url.scheme = string.upper(url.scheme) + end + Write('

referer url

\r\n') + Write('

\r\n') + Write(EscapeHtml(EncodeUrl(url))) + Write('

\r\n') + if url.scheme then + Write('
scheme\r\n') + Write('
\r\n') + Write(url.scheme) + end + if url.user then + Write('
user\r\n') + Write('
\r\n') + Write(EscapeHtml(VisualizeControlCodes(url.user))) + end + if url.pass then + Write('
pass\r\n') + Write('
\r\n') + Write(EscapeHtml(VisualizeControlCodes(url.pass))) + end + if url.host then + Write('
host\r\n') + Write('
\r\n') + Write(EscapeHtml(VisualizeControlCodes(url.host))) + end + if url.port then + Write('
port\r\n') + Write('
\r\n') + Write(EscapeHtml(VisualizeControlCodes(url.port))) + end + if url.path then + Write('
path\r\n') + Write('
\r\n') + Write(EscapeHtml(VisualizeControlCodes(url.path))) + end + if url.params then + Write('
params\r\n') + Write('
\r\n') + Write('
\r\n') + for i = 1,#url.params do + Write('
') + Write(EscapeHtml(VisualizeControlCodes(url.params[i][1]))) + Write('\r\n') + if url.params[i][2] then + Write('
') + Write(EscapeHtml(VisualizeControlCodes(url.params[i][2]))) + Write('\r\n') + end + end + Write('
\r\n') + end + if url.fragment then + Write('
fragment\r\n') + Write('
\r\n') + Write(EscapeHtml(VisualizeControlCodes(url.fragment))) + end + Write('
\r\n') + end + + Write('

posix extended regular expressions

\r\n') + s = 'my ' .. FormatIp(GetRemoteAddr()) .. ' ip' + -- traditional regular expressions + m,a,b,c,d = re.search([[\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)]], s, re.BASIC) + -- easy api (~10x slower because compile is O(2ⁿ) and search is O(n)) + m,a,b,c,d = re.search([[([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})]], s) + -- proper api (especially if you put the re.compile() line in /.init.lua) + pat = re.compile([[([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})]]) + m,a,b,c,d = pat:search(s) -- m and rest are nil if match not found + Write('
\r\n')
+   Write([[pat = re.compile('([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})')]])
+   Write(string.format('\r\nm,a,b,c,d = pat:search(%q)\r\n', s))
+   Write('
\r\n') + Write('
\r\n') + Write('
m\r\n') + Write('
') + Write(tostring(m)) + Write('\r\n') + Write('
a\r\n') + Write('
') + Write(tostring(a)) + Write('\r\n') + Write('
b\r\n') + Write('
') + Write(tostring(b)) + Write('\r\n') + Write('
c\r\n') + Write('
') + Write(tostring(c)) + Write('\r\n') + Write('
d\r\n') + Write('
') + Write(tostring(d)) + Write('\r\n') + Write('
\r\n') + + Write('

source code to this page

\r\n') + Write('
\r\n')
+   Write(EscapeHtml(LoadAsset(GetEffectivePath())))
+   Write('
\r\n') + + -- redbean zip assets + Write('

zip assets

\r\n') + paths = GetZipPaths() + if #paths > 0 then + Write('
    \r\n') + for i = 1,#paths do + Write('
  • \r\n') + Write('') + Write(EscapeHtml(VisualizeControlCodes(paths[i]))) + Write('') + if IsHiddenPath(paths[i]) then + Write(' [HIDDEN]') + end + if not IsAcceptablePath(paths[i]) then + Write(' [BLOCKED]') + end + if not IsCompressed(paths[i]) then + Write(' [UNCOMPRESSED]') + end + if (GetAssetMode(paths[i]) & 0xF000) == 0x4000 then + Write(' [DIRECTORY]') + end + Write('
    \r\n') + Write('Modified: ') + Write(FormatHttpDateTime(GetLastModifiedTime(paths[i]))) + Write('
    \r\n') + Write('Mode: ') + Write(string.format("0%o", GetAssetMode(paths[i]))) + Write('
    \r\n') + Write('Size: ') + Write(tostring(GetAssetSize(paths[i]))) + Write('
    \r\n') + if GetComment(paths[i]) then + Write('Comment: ') + Write(EscapeHtml(VisualizeControlCodes(GetComment(paths[i])))) + Write('
    \r\n') + end + Write('\r\n') + end + Write('
\r\n') + else + Write('

none\r\n') + end + +end + +main() diff --git a/tool/net/demo/seekable.txt b/tool/net/demo/seekable.txt new file mode 100644 index 000000000..a6f1d23fc --- /dev/null +++ b/tool/net/demo/seekable.txt @@ -0,0 +1,26 @@ +A +B +C +D +E +F +G +H +I +J +K +L +M +N +O +P +Q +R +S +T +U +V +W +X +Y +Z diff --git a/tool/net/demo/virtualbean.html b/tool/net/demo/virtualbean.html new file mode 100644 index 000000000..49326e0f8 --- /dev/null +++ b/tool/net/demo/virtualbean.html @@ -0,0 +1,7 @@ + + +redbean virtual host +

virtualbean.justine.lol

+

This page uses redbean virtual hosting. Please refer to +//redbean.justine.lol +to see the primary instance. diff --git a/tool/net/redbean.ico b/tool/net/favicon.ico similarity index 100% rename from tool/net/redbean.ico rename to tool/net/favicon.ico diff --git a/tool/net/net.mk b/tool/net/net.mk index 8bd0dd324..bc720ede2 100644 --- a/tool/net/net.mk +++ b/tool/net/net.mk @@ -42,6 +42,7 @@ TOOL_NET_DIRECTDEPS = \ NET_HTTP \ THIRD_PARTY_GETOPT \ THIRD_PARTY_LUA \ + THIRD_PARTY_REGEX \ THIRD_PARTY_ZLIB \ TOOL_DECODE_LIB @@ -63,20 +64,83 @@ o/$(MODE)/tool/net/%.com.dbg: \ o/$(MODE)/tool/net/redbean.com.dbg: \ $(TOOL_NET_DEPS) \ o/$(MODE)/tool/net/redbean.o \ - o/$(MODE)/tool/net/redbean.ico.zip.o \ - o/$(MODE)/tool/net/redbean.png.zip.o \ - o/$(MODE)/tool/net/redbean.css.zip.o \ - o/$(MODE)/tool/net/redbean.html.zip.o \ - o/$(MODE)/tool/net/redbean.lua.zip.o \ - o/$(MODE)/tool/net/redbean-form.lua.zip.o \ - o/$(MODE)/tool/net/redbean-xhr.lua.zip.o \ - o/$(MODE)/tool/net/.init.lua.zip.o \ - o/$(MODE)/tool/net/.reload.lua.zip.o \ o/$(MODE)/tool/net/net.pkg \ $(CRT) \ $(APE) @$(APELINK) +o/$(MODE)/tool/net/redbean.com: \ + o/$(MODE)/tool/net/redbean.com.dbg \ + tool/net/net.mk \ + tool/net/.init.lua \ + tool/net/favicon.ico \ + tool/net/redbean.png + @$(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S -O binary $< $@ + @$(COMPILE) -ADD -T$@ dd if=$@ of=o/$(MODE)/tool/net/.ape bs=64 count=11 conv=notrunc 2>/dev/null + @$(COMPILE) -AZIP -T$@ zip -qj $@ o/$(MODE)/tool/net/.ape tool/net/.init.lua tool/net/favicon.ico tool/net/redbean.png + +o/$(MODE)/tool/net/redbean-demo.com.dbg: \ + o/$(MODE)/tool/net/redbean.com.dbg + @$(COMPILE) -ACP -T$@ cp $< $@ + +o/$(MODE)/tool/net/redbean-demo.com: \ + o/$(MODE)/tool/net/redbean-demo.com.dbg \ + tool/net/net.mk \ + tool/net/favicon.ico \ + tool/net/redbean.png \ + tool/net/demo/.init.lua \ + tool/net/demo/.reload.lua \ + tool/net/demo/404.html \ + tool/net/demo/hello.lua \ + tool/net/demo/index.html \ + tool/net/demo/redbean.css \ + tool/net/demo/redbean.lua \ + tool/net/demo/redbean-form.lua \ + tool/net/demo/redbean-xhr.lua \ + tool/net/demo/seekable.txt \ + tool/net/demo/virtualbean.html \ + tool/net/redbean.c \ + net/http/parsehttprequest.c \ + net/http/parseurl.c \ + net/http/encodeurl.c \ + test/net/http/parsehttprequest_test.c \ + test/net/http/parseurl_test.c + @$(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S -O binary $< $@ + @$(COMPILE) -AMKDIR -T$@ mkdir -p o/$(MODE)/tool/net/.redbean-demo + @$(COMPILE) -ADD -T$@ dd if=$@ of=o/$(MODE)/tool/net/.redbean-demo/.ape bs=64 count=11 conv=notrunc 2>/dev/null + @$(COMPILE) -AZIP -T$@ zip -qj $@ o/$(MODE)/tool/net/.redbean-demo/.ape tool/net/demo/.init.lua tool/net/demo/.reload.lua tool/net/demo/hello.lua + @echo "<-- check out this lua server page" | $(COMPILE) -AZIP -T$@ zip -cqj $@ tool/net/demo/redbean.lua + @$(COMPILE) -AZIP -T$@ zip -qj $@ tool/net/demo/404.html tool/net/favicon.ico tool/net/redbean.png tool/net/demo/redbean-form.lua tool/net/demo/redbean-xhr.lua + @echo Uncompressed for HTTP Range requests | $(COMPILE) -AZIP -T$@ zip -cqj0 $@ tool/net/demo/seekable.txt + @$(COMPILE) -AZIP -T$@ zip -q $@ tool/net/ tool/net/demo/ tool/net/demo/index.html tool/net/demo/redbean.css tool/net/redbean.c net/http/parsehttprequest.c net/http/parseurl.c net/http/encodeurl.c test/net/http/parsehttprequest_test.c test/net/http/parseurl_test.c + @echo "

This is a live instance of redbean: a tiny multiplatform webserver that went viral on hacker news a few months ago. since then, we've added Lua dynamic serving, which also goes as fast as 1,000,000 requests per second on a core i9 (rather than a cheap virtual machine like this). the text you're reading now is a PKZIP End Of Central Directory comment.

redbean aims to be production worthy across six operating systems, using a single executable file (this demo is hosted on FreeBSD 13). redbean has been enhanced to restore the APE header after startup. It automatically generates this listing page based on your ZIP contents. If you use redbean as an application server / web development environment, then you'll find other new and useful features like function call logging so you can get that sweet sweet microsecond scale latency." | $(COMPILE) -AZIP -T$@ zip -z $@ + @$(COMPILE) -AMKDIR -T$@ mkdir -p o/$(MODE)/tool/net/virtualbean.justine.lol/ + @$(COMPILE) -ACP -T$@ cp tool/net/redbean.png o/$(MODE)/tool/net/virtualbean.justine.lol/redbean.png + @$(COMPILE) -ACP -T$@ cp tool/net/demo/virtualbean.html o/$(MODE)/tool/net/virtualbean.justine.lol/index.html + @(cd o/$(MODE)/tool/net && zip -q redbean-demo.com virtualbean.justine.lol/) + @(cd o/$(MODE)/tool/net && echo 'Go to http://virtualbean.justine.lol' | zip -cq redbean-demo.com virtualbean.justine.lol/index.html) + @(cd o/$(MODE)/tool/net && zip -q redbean-demo.com virtualbean.justine.lol/redbean.png) + +o/$(MODE)/tool/net/redbean-static.com: \ + o/$(MODE)/tool/net/redbean-static.com.dbg \ + tool/net/favicon.ico \ + tool/net/redbean.png + @$(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S -O binary $< $@ + @$(COMPILE) -AMKDIR -T$@ mkdir -p o/$(MODE)/tool/net/.redbean-static + @$(COMPILE) -ADD -T$@ dd if=$@ of=o/$(MODE)/tool/net/.redbean-static/.ape bs=64 count=11 conv=notrunc 2>/dev/null + @$(COMPILE) -AZIP -T$@ zip -qj $@ o/$(MODE)/tool/net/.redbean-static/.ape tool/net/favicon.ico tool/net/redbean.png + +o/$(MODE)/tool/net/redbean-static.com.dbg: \ + $(TOOL_NET_DEPS) \ + o/$(MODE)/tool/net/redbean-static.o \ + o/$(MODE)/tool/net/net.pkg \ + $(CRT) \ + $(APE) + @$(APELINK) + +o/$(MODE)/tool/net/redbean-static.o: tool/net/redbean.c + @$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.c) -DSTATIC $(OUTPUT_OPTION) $< + .PHONY: o/$(MODE)/tool/net o/$(MODE)/tool/net: \ $(TOOL_NET_BINS) \ diff --git a/tool/net/redbean-form.lua b/tool/net/redbean-form.lua deleted file mode 100644 index 5b8f03855..000000000 --- a/tool/net/redbean-form.lua +++ /dev/null @@ -1,70 +0,0 @@ --- redbean post request handler demo - -local function main() - if GetMethod() ~= 'POST' then - ServeError(405) - SetHeader('Allow', 'POST') - return - end - SetStatus(200) - SetHeader('Content-Type', 'text/html; charset=utf-8') - Write('\n') - Write('redbean\n') - Write('

POST Request HTML Form Handler Demo

\n') - - Write('

') - firstname = GetParam('firstname') - lastname = GetParam('lastname') - if firstname and lastname then - Write('Hello ') - Write(EscapeHtml(firstname)) - Write(' ') - Write(EscapeHtml(lastname)) - Write('!
') - Write('Thank you for using redbean.') - end - - Write('

\n') - - Write('
Params\n') - Write('
\n') - Write('
\n') - params = GetParams() - for i = 1,#params do - Write('
') - Write(EscapeHtml(params[i][1])) - Write('\n') - if params[i][2] then - Write('
') - Write(EscapeHtml(params[i][2])) - Write('\n') - end - end - Write('
\n') - - Write('
Headers\n') - Write('
\n') - Write('
\n') - for k,v in pairs(GetHeaders()) do - Write('
') - Write(EscapeHtml(k)) - Write('\n') - Write('
') - Write(EscapeHtml(v)) - Write('\n') - end - Write('
\n') - - Write('
Payload\n') - Write('

') - Write(EscapeHtml(GetPayload())) - Write('\n') - - Write('

\n') - - Write('

') - Write('Click here ') - Write('to return to the previous page.\n') -end - -main() diff --git a/tool/net/redbean-xhr.lua b/tool/net/redbean-xhr.lua deleted file mode 100644 index cd93d5d4e..000000000 --- a/tool/net/redbean-xhr.lua +++ /dev/null @@ -1,3 +0,0 @@ --- redbean xhr handler demo -SetHeader('Vary', 'X-Custom-Header') -SetHeader('X-Custom-Header', 'hello ' .. GetHeader('x-custom-header')) diff --git a/tool/net/redbean.c b/tool/net/redbean.c index 6b00f5eca..e9b8437c5 100644 --- a/tool/net/redbean.c +++ b/tool/net/redbean.c @@ -16,147 +16,72 @@ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ -#include "libc/bits/bits.h" -#include "libc/bits/bswap.h" #include "libc/bits/popcnt.h" #include "libc/bits/safemacros.internal.h" #include "libc/calls/calls.h" -#include "libc/calls/struct/iovec.h" #include "libc/calls/struct/itimerval.h" +#include "libc/calls/struct/rusage.h" #include "libc/calls/struct/stat.h" -#include "libc/calls/weirdtypes.h" -#include "libc/dce.h" #include "libc/errno.h" #include "libc/fmt/conv.h" -#include "libc/fmt/fmt.h" #include "libc/fmt/itoa.h" #include "libc/log/check.h" #include "libc/log/log.h" -#include "libc/macros.internal.h" #include "libc/math.h" #include "libc/mem/fmt.h" -#include "libc/mem/mem.h" #include "libc/nexgen32e/bsf.h" #include "libc/nexgen32e/bsr.h" #include "libc/nexgen32e/crc32.h" -#include "libc/rand/rand.h" +#include "libc/runtime/clktck.h" #include "libc/runtime/runtime.h" #include "libc/sock/sock.h" #include "libc/stdio/stdio.h" -#include "libc/str/str.h" -#include "libc/str/thompike.h" -#include "libc/str/undeflate.h" -#include "libc/str/utf16.h" #include "libc/sysv/consts/af.h" #include "libc/sysv/consts/auxv.h" -#include "libc/sysv/consts/clock.h" #include "libc/sysv/consts/ex.h" #include "libc/sysv/consts/exit.h" -#include "libc/sysv/consts/f.h" -#include "libc/sysv/consts/fd.h" #include "libc/sysv/consts/inaddr.h" #include "libc/sysv/consts/ipproto.h" #include "libc/sysv/consts/itimer.h" #include "libc/sysv/consts/map.h" +#include "libc/sysv/consts/msync.h" #include "libc/sysv/consts/o.h" #include "libc/sysv/consts/prot.h" -#include "libc/sysv/consts/sa.h" +#include "libc/sysv/consts/rusage.h" #include "libc/sysv/consts/shut.h" -#include "libc/sysv/consts/sig.h" #include "libc/sysv/consts/so.h" #include "libc/sysv/consts/sock.h" #include "libc/sysv/consts/sol.h" #include "libc/sysv/consts/tcp.h" #include "libc/sysv/consts/w.h" -#include "libc/sysv/errfuns.h" -#include "libc/time/struct/tm.h" #include "libc/time/time.h" #include "libc/x/x.h" #include "libc/zip.h" -#include "libc/zipos/zipos.internal.h" -#include "net/http/base64.h" #include "net/http/escape.h" #include "net/http/http.h" +#include "net/http/ip.h" +#include "net/http/url.h" #include "third_party/getopt/getopt.h" #include "third_party/lua/lauxlib.h" #include "third_party/lua/ltests.h" #include "third_party/lua/lua.h" #include "third_party/lua/lualib.h" +#include "third_party/regex/regex.h" #include "third_party/zlib/zlib.h" -#define USAGE \ - " [-hvdsm] [-p PORT] [-- SCRIPTARGS...]\n\ -\n\ -DESCRIPTION\n\ -\n\ - redbean - single-file distributable web server\n\ -\n\ -FLAGS\n\ -\n\ - -h help\n\ - -v verbosity\n\ - -d daemonize\n\ - -u uniprocess\n\ - -z print port\n\ - -m log messages\n\ - -b log message bodies\n\ - -k encourage keep-alive\n\ - -D DIR serve assets from directory\n\ - -c INT cache seconds\n\ - -r /X=/Y redirect X to Y\n\ - -R /X=/Y rewrite X to Y\n\ - -l ADDR listen ip [default 0.0.0.0]\n\ - -p PORT listen port [default 8080]\n\ - -L PATH log file location\n\ - -P PATH pid file location\n\ - -U INT daemon set user id\n\ - -G INT daemon set group id\n\ - -B STR changes brand\n\ -\n\ -FEATURES\n\ -\n\ - - Lua v5.4\n\ - - HTTP v0.9\n\ - - HTTP v1.0\n\ - - HTTP v1.1\n\ - - Content-Encoding\n\ - - Range / Content-Range\n\ - - Last-Modified / If-Modified-Since\n\ -\n\ -USAGE\n\ -\n\ - This executable is also a ZIP file that contains static assets.\n\ -\n\ - unzip -vl redbean.com # shows listing of zip contents\n\ -\n\ - Audio video content should not be compressed in your ZIP files.\n\ - Uncompressed assets enable browsers to send Range HTTP request.\n\ - On the other hand compressed assets are best for gzip encoding.\n\ -\n\ - zip redbean.com index.html # adds file\n\ - zip -0 redbean.com video.mp4 # adds without compression\n\ -\n\ - You can run redbean interactively in your terminal as follows:\n\ -\n\ - redbean.com -vv\n\ - CTRL-C # 1x: graceful shutdown\n\ - CTRL-C # 2x: forceful shutdown\n\ -\n\ - You can have redbean run as a daemon by doing the following:\n\ -\n\ - redbean.com -vv -d -L redbean.log -P redbean.pid\n\ - kill -TERM $(cat redbean.pid) # 1x: graceful shutdown\n\ - kill -TERM $(cat redbean.pid) # 2x: forceful shutdown\n\ -\n\ - redbean imposes a 32kb limit on requests to limit the memory of\n\ - connection processes, which grow to whatever number your system\n\ - limits and tcp stack configuration allow. If fork() should fail\n\ - then redbean starts shutting idle connections down.\n\ -\n" - #define HASH_LOAD_FACTOR /* 1. / */ 4 #define DEFAULT_PORT 8080 +#define read(F, P, N) readv(F, &(struct iovec){P, N}, 1) +#define Hash(P, N) max(1, crc32c(0, P, N)); +#define LockInc(P) asm volatile("lock inc%z0\t%0" : "=m"(*(P))) +#define AppendCrlf(P) mempcpy(P, "\r\n", 2) +#define HasHeader(H) (!!msg.headers[H].a) +#define HeaderData(H) (inbuf.p + msg.headers[H].a) +#define HeaderLength(H) (msg.headers[H].b - msg.headers[H].a) +#define HeaderEqualCase(H, S) \ + SlicesEqualCase(S, strlen(S), HeaderData(H), HeaderLength(H)) + static const struct itimerval kHeartbeat = { {0, 500000}, {0, 500000}, @@ -175,68 +100,83 @@ static const uint8_t kGzipHeader[] = { kZipOsUnix, // OS }; -static const char kHexToInt[256] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x00 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x10 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x20 - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, // 0x30 - 0, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x40 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x50 - 0, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x60 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x70 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x80 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x90 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xa0 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xb0 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xc0 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xd0 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xe0 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xf0 +static const char *const kIndexPaths[] = { +#ifndef STATIC + "index.lua", +#endif + "index.html", }; static const struct ContentTypeExtension { unsigned char ext[8]; const char *mime; } kContentTypeExtension[] = { - {"S", "text/plain"}, // - {"bmp", "image/x-ms-bmp"}, // - {"c", "text/plain"}, // - {"cc", "text/plain"}, // - {"css", "text/css"}, // - {"csv", "text/csv"}, // - {"gif", "image/gif"}, // - {"h", "text/plain"}, // - {"html", "text/html"}, // - {"i", "text/plain"}, // - {"ico", "image/vnd.microsoft.icon"}, // - {"jpeg", "image/jpeg"}, // - {"jpg", "image/jpeg"}, // - {"js", "application/javascript"}, // - {"json", "application/json"}, // - {"m4a", "audio/mpeg"}, // - {"markdown", "text/plain"}, // - {"md", "text/plain"}, // - {"mp2", "audio/mpeg"}, // - {"mp3", "audio/mpeg"}, // - {"mp4", "video/mp4"}, // - {"mpg", "video/mpeg"}, // - {"otf", "font/otf"}, // - {"pdf", "application/pdf"}, // - {"png", "image/png"}, // - {"s", "text/plain"}, // - {"svg", "image/svg+xml"}, // - {"tiff", "image/tiff"}, // - {"ttf", "font/ttf"}, // - {"txt", "text/plain"}, // - {"wav", "audio/x-wav"}, // - {"woff", "font/woff"}, // - {"woff2", "font/woff2"}, // - {"xml", "application/xml"}, // - {"zip", "application/zip"}, // + {"7z", "application/x-7z-compressed"}, // + {"S", "text/plain"}, // + {"aac", "audio/aac"}, // + {"apng", "image/apng"}, // + {"avi", "video/x-msvideo"}, // + {"avif", "image/avif"}, // + {"bmp", "image/bmp"}, // + {"c", "text/plain"}, // + {"cc", "text/plain"}, // + {"css", "text/css"}, // + {"csv", "text/csv"}, // + {"gif", "image/gif"}, // + {"h", "text/plain"}, // + {"htm", "text/html"}, // + {"html", "text/html"}, // + {"i", "text/plain"}, // + {"ico", "image/vnd.microsoft.icon"}, // + {"jar", "appliaction/java-archive"}, // + {"jpeg", "image/jpeg"}, // + {"jpg", "image/jpeg"}, // + {"js", "application/javascript"}, // + {"json", "application/json"}, // + {"m4a", "audio/mpeg"}, // + {"markdown", "text/plain"}, // + {"md", "text/plain"}, // + {"mp2", "audio/mpeg"}, // + {"mp3", "audio/mpeg"}, // + {"mp4", "video/mp4"}, // + {"mpeg", "video/mpeg"}, // + {"mpg", "video/mpeg"}, // + {"oga", "audio/ogg"}, // + {"ogg", "application/ogg"}, // + {"ogv", "video/ogg"}, // + {"ogx", "application/ogg"}, // + {"otf", "font/otf"}, // + {"pdf", "application/pdf"}, // + {"png", "image/png"}, // + {"rar", "application/vnd.rar"}, // + {"rtf", "application/rtf"}, // + {"s", "text/plain"}, // + {"sh", "application/x-sh"}, // + {"svg", "image/svg+xml"}, // + {"swf", "application/x-shockwave-flash"}, // + {"tar", "application/x-tar"}, // + {"tiff", "image/tiff"}, // + {"ttf", "font/ttf"}, // + {"txt", "text/plain"}, // + {"wav", "audio/x-wav"}, // + {"weba", "audio/webm"}, // + {"webm", "video/webm"}, // + {"webp", "image/webp"}, // + {"woff", "font/woff"}, // + {"woff2", "font/woff2"}, // + {"xhtml", "application/xhtml+xml"}, // + {"xls", "application/vnd.ms-excel"}, // + {"xml", "application/xml"}, // + {"zip", "application/zip"}, // +}; + +static const char kRegCode[][9] = { + "OK", "NOMATCH", "BADPAT", "ECOLLATE", "ECTYPE", "EESCAPE", "ESUBREG", + "EBRACK", "EPAREN", "EBRACE", "BADBR", "ERANGE", "ESPACE", "BADRPT", }; struct Buffer { - size_t n; + size_t n, c; char *p; }; @@ -245,36 +185,20 @@ struct Strings { char **p; }; -struct Parser { - int i; - int c; - const char *data; - int size; - bool isform; - bool islatin1; - char *p; - char *q; -}; - -struct Params { - size_t n; - struct Param { - struct Buffer key; - struct Buffer val; // val.n may be SIZE_MAX - } * p; -}; - -struct Request { - struct Buffer path; - struct Params params; - struct Buffer fragment; -}; - static struct Freelist { - size_t n; + size_t n, c; void **p; } freelist; +static struct Unmaplist { + size_t n, c; + struct Unmap { + int f; + void *p; + size_t n; + } * p; +} unmaplist; + static struct Redirects { size_t n; struct Redirect { @@ -288,8 +212,10 @@ static struct Redirects { static struct Assets { uint32_t n; struct Asset { - uint32_t lf; + bool istext; uint32_t hash; + uint64_t cf; + uint64_t lf; int64_t lastmodified; char *lastmodifiedstr; struct File { @@ -300,7 +226,105 @@ static struct Assets { } assets; static struct Shared { - int workers; // + int workers; + long double nowish; + long double lastmeltdown; + char currentdate[32]; + struct rusage server; + struct rusage children; + long accepterrors; + long acceptinterrupts; + long acceptresets; + long badlengths; + long badmessages; + long badmethods; + long badranges; + long closeerrors; + long compressedresponses; + long connectionshandled; + long connectsrefused; + long continues; + long decompressedresponses; + long deflates; + long dropped; + long dynamicrequests; + long emfiles; + long enetdowns; + long enfiles; + long enobufs; + long enomems; + long enonets; + long errors; + long expectsrefused; + long failedchildren; + long forbiddens; + long forkerrors; + long frags; + long fumbles; + long http09; + long http10; + long http11; + long http12; + long hugepayloads; + long identityresponses; + long inflates; + long listingrequests; + long loops; + long mapfails; + long maps; + long meltdowns; + long messageshandled; + long missinglengths; + long netafrinic; + long netanonymous; + long netapnic; + long netapple; + long netarin; + long netatt; + long netcogent; + long netcomcast; + long netdod; + long netford; + long netlacnic; + long netloopback; + long netother; + long netprivate; + long netprudential; + long netripe; + long nettestnet; + long netusps; + long notfounds; + long notmodifieds; + long openfails; + long partialresponses; + long payloaddisconnects; + long pipelinedrequests; + long precompressedresponses; + long readerrors; + long readinterrupts; + long readresets; + long readtimeouts; + long redirects; + long reloads; + long rewrites; + long serveroptions; + long shutdowns; + long slowloris; + long slurps; + long statfails; + long staticrequests; + long stats; + long statuszrequests; + long synchronizationfailures; + long terminatedchildren; + long thiscorruption; + long transfersrefused; + long urisrefused; + long verifies; + long writeerrors; + long writeinterruputs; + long writeresets; + long writetimeouts; } * shared; static bool killed; @@ -308,13 +332,15 @@ static bool istext; static bool zombied; static bool gzipped; static bool branded; +static bool funtrace; static bool meltdown; -static bool unbranded; static bool heartless; static bool printport; static bool heartbeat; static bool daemonize; +static bool logrusage; static bool logbodies; +static bool loglatency; static bool terminated; static bool uniprocess; static bool invalidated; @@ -323,6 +349,8 @@ static bool checkedmethod; static bool connectionclose; static bool keyboardinterrupt; static bool encouragekeepalive; +static bool loggednetworkorigin; +static bool hasluaglobalhandler; static int frags; static int gmtoff; @@ -331,23 +359,23 @@ static int client; static int daemonuid; static int daemongid; static int statuscode; -static unsigned httpversion; +static int messageshandled; static uint32_t clientaddrsize; static lua_State *L; static size_t zsize; -static void *content; -static uint8_t *zdir; +static char *content; +static uint8_t *cdir; static uint8_t *zmap; static size_t hdrsize; static size_t msgsize; static size_t amtread; +static char *extrahdrs; static char *luaheaderp; -static const char *sauce; static const char *brand; static const char *pidpath; static const char *logpath; -static int64_t programtime; +static struct Strings loops; static size_t contentlength; static int64_t cacheseconds; static uint8_t gzip_footer[8]; @@ -355,24 +383,194 @@ static const char *serverheader; static struct Strings stagedirs; static struct Strings hidepaths; -static struct Buffer logo; static struct Buffer inbuf; static struct Buffer hdrbuf; static struct Buffer outbuf; -static struct Request request; +static struct linger linger; +static struct timeval timeout; +static struct Buffer effectivepath; + +static struct Url url; +static struct HttpRequest msg; +static char slashpath[PATH_MAX]; -static long double nowish; static long double startread; -static long double lastmeltdown; +static long double lastrefresh; +static long double startserver; static long double startrequest; static long double startconnection; static struct sockaddr_in serveraddr; static struct sockaddr_in clientaddr; -static struct HttpRequest msg; -static char currentdate[32]; -static char clientaddrstr[32]; -static char serveraddrstr[32]; +static wontreturn void PrintUsage(FILE *f, int rc) { + /* clang-format off */ + fprintf(f, "\ +SYNOPSIS\n\ +\n\ + %s [-hvduzmbagf] [-p PORT] [-- SCRIPTARGS...]\n\ +\n\ +DESCRIPTION\n\ +\n\ + redbean - single-file distributable web server\n\ +\n\ +FLAGS\n\ +\n\ + -h help\n\ + -v verbosity [repeat]\n\ + -d daemonize\n\ + -u uniprocess\n\ + -z print port\n\ + -m log messages\n\ + -b log message body\n\ + -a log resource usage\n\ + -g log handler latency\n" +#ifndef TINY +" -f log worker function calls\n" +#endif +" -H K:V sets http header globally [repeat]\n\ + -D DIR serve assets from local directory [repeat]\n\ + -t MS tunes read and write timeouts [default 30000]\n\ + -c SEC configures static asset cache-control headers\n\ + -r /X=/Y redirect X to Y [repeat]\n\ + -R /X=/Y rewrites X to Y [repeat]\n\ + -l ADDR listen ip [default 0.0.0.0]\n\ + -p PORT listen port [default 8080]\n\ + -L PATH log file location\n\ + -P PATH pid file location\n\ + -U INT daemon set user id\n\ + -G INT daemon set group id\n\ +\n\ +FEATURES\n\ +\n" +#ifndef STATIC +" - Lua v5.4\n" +#endif +" - HTTP v0.9\n\ + - HTTP v1.0\n\ + - HTTP v1.1\n\ + - Pipelining\n\ + - Accounting\n\ + - Content-Encoding\n\ + - Range / Content-Range\n\ + - Last-Modified / If-Modified-Since\n\ +\n\ +USAGE\n\ +\n\ + This executable is also a ZIP file that contains static assets.\n\ + You can run redbean interactively in your terminal as follows:\n\ +\n\ + ./redbean.com -vvvmbag # starts server verbosely\n\ + open http://127.0.0.1:8080/ # shows zip listing page\n\ + CTRL-C # 1x: graceful shutdown\n\ + CTRL-C # 2x: forceful shutdown\n\ +\n\ + You can override the default listing page by adding:\n\ +\n" +#ifndef STATIC +" zip redbean.com index.lua # lua server pages take priority\n" +#endif +" zip redbean.com index.html # default page for directory\n\ +\n\ + The listing page only applies to the root directory. However the\n\ + default index page applies to subdirectories too. In order for it\n\ + to work, there needs to be an empty directory entry in the zip.\n\ + That should already be the default practice of your zip editor.\n\ +\n\ + wget \\\n\ + --mirror \\\n\ + --convert-links \\\n\ + --adjust-extension \\\n\ + --page-requisites \\\n\ + --no-parent \\\n\ + --no-if-modified-since \\\n\ + http://a.example/index.html\n\ + zip -r redbean.com a.example/ # default page for directory\n\ +\n\ + redbean normalizes the trailing slash for you automatically:\n\ +\n\ + $ printf 'GET /a.example HTTP/1.0\\n\\n' | nc 127.0.0.1 8080\n\ + HTTP/1.0 307 Temporary Redirect\n\ + Location: /a.example/\n\ +\n\ + Virtual hosting is accomplished this way too. The Host is simply\n\ + prepended to the path, and if it doesn't exist, it gets removed.\n\ +\n\ + $ printf 'GET / HTTP/1.1\\nHost:a.example\\n\\n' | nc 127.0.0.1 8080\n\ + HTTP/1.1 200 OK\n\ + Link: ; rel=\"canonical\"\n\ +\n\ + If you mirror a lot of websites within your redbean then you can\n\ + actually tell your browser that redbean is your proxy server, in\n\ + which redbean will act as your private version of the Internet.\n\ +\n\ + $ printf 'GET http://a.example HTTP/1.0\\n\\n' | nc 127.0.0.1 8080\n\ + HTTP/1.0 200 OK\n\ + Link: ; rel=\"canonical\"\n\ +\n\ + If you use a reverse proxy, then redbean recognizes the following\n\ + provided that the proxy forwards requests over the local network:\n\ +\n\ + X-Forwarded-For: 203.0.113.42:31337\n\ + X-Forwarded-Host: foo.example:80\n\ +\n\ + There's a text/plain statistics page called /statusz that makes\n\ + it easy to track and monitor the health of your redbean:\n\ +\n\ + printf 'GET /statusz\\n\\n' | nc 127.0.0.1 8080\n\ +\n\ + redbean will display an error page using the /redbean.png logo\n\ + by default, embedded as a bas64 data uri. You can override the\n\ + custom page for various errors by adding files to the zip root.\n\ +\n\ + zip redbean.com 404.html # custom not found page\n\ +\n\ + Audio video content should not be compressed in your ZIP files.\n\ + Uncompressed assets enable browsers to send Range HTTP request.\n\ + On the other hand compressed assets are best for gzip encoding.\n\ +\n\ + zip redbean.com index.html # adds file\n\ + zip -0 redbean.com video.mp4 # adds without compression\n\ +\n\ + You can have redbean run as a daemon by doing the following:\n\ +\n\ + redbean.com -vv -d -L redbean.log -P redbean.pid\n\ + kill -TERM $(cat redbean.pid) # 1x: graceful shutdown\n\ + kill -TERM $(cat redbean.pid) # 2x: forceful shutdown\n\ +\n\ + redbean currently has a 32kb limit on request messages and 64kb\n\ + including the payload. redbean will grow to whatever the system\n\ + limits allow. Should fork() or accept() fail redbean will react\n\ + by going into \"meltdown mode\" which closes lingering workers.\n\ + You can trigger this at any time using:\n\ +\n\ + kill -USR2 $(cat redbean.pid)\n\ +\n\ + Another failure condition is running out of disk space in which\n\ + case redbean reacts by truncating the log file. Lastly, redbean\n\ + does the best job possible reporting on resource usage when the\n\ + logger is in debug mode noting that NetBSD is the best at this.\n\ +\n\ + Your redbean is an actually portable executable, that's able to\n\ + run on six different operating systems. To do that, it needs to\n\ + overwrite its own MZ header at startup, with ELF or Mach-O, and\n\ + then puts the original back once the program loads. If you want\n\ + your redbean to follow the platform-local executable convention\n\ + then delete the /.ape file from zip.\n\ +\n\ + redbean contains software licensed ISC, MIT, BSD-2, BSD-3, zlib\n\ + which makes it a permissively licensed gift to anyone who might\n\ + find it useful. The transitive closure of legalese can be found\n\ + inside the binary. redbean also respects your privacy and won't\n\ + phone home because your computer is its home.\n\ +\n\ +SEE ALSO\n\ +\n\ + https://justine.lol/redbean/index.html\n\ + https://news.ycombinator.com/item?id=26271117\n\ +\n", program_invocation_name); + /* clang-format on */ + exit(rc); +} static void OnChld(void) { zombied = true; @@ -411,6 +609,14 @@ static void OnHup(void) { } } +static bool SlicesEqual(const char *a, size_t n, const char *b, size_t m) { + return n == m && !memcmp(a, b, n); +} + +static bool SlicesEqualCase(const char *a, size_t n, const char *b, size_t m) { + return n == m && !memcasecmp(a, b, n); +} + static int CompareSlices(const char *a, size_t n, const char *b, size_t m) { int c; if ((c = memcmp(a, b, MIN(n, m)))) return c; @@ -427,6 +633,106 @@ static int CompareSlicesCase(const char *a, size_t n, const char *b, size_t m) { return 0; } +static void *FreeLater(void *p) { + if (p) { + if (++freelist.n > freelist.c) { + freelist.c = freelist.n + 2; + freelist.c += freelist.c >> 1; + freelist.p = xrealloc(freelist.p, freelist.c * sizeof(*freelist.p)); + } + freelist.p[freelist.n - 1] = p; + } + return p; +} + +static void UnmapLater(int f, void *p, size_t n) { + if (++unmaplist.n > unmaplist.c) { + unmaplist.c = unmaplist.n + 2; + unmaplist.c += unmaplist.c >> 1; + unmaplist.p = xrealloc(unmaplist.p, unmaplist.c * sizeof(*unmaplist.p)); + } + unmaplist.p[unmaplist.n - 1].f = f; + unmaplist.p[unmaplist.n - 1].p = p; + unmaplist.p[unmaplist.n - 1].n = n; +} + +static void CollectGarbage(void) { + DestroyHttpRequest(&msg); + while (freelist.n) { + free(freelist.p[--freelist.n]); + } + while (unmaplist.n) { + --unmaplist.n; + LOGIFNEG1(munmap(unmaplist.p[unmaplist.n].p, unmaplist.p[unmaplist.n].n)); + LOGIFNEG1(close(unmaplist.p[unmaplist.n].f)); + } +} + +static void UseOutput(void) { + content = FreeLater(outbuf.p); + contentlength = outbuf.n; + outbuf.p = 0; + outbuf.n = 0; + outbuf.c = 0; +} + +static void DropOutput(void) { + free(outbuf.p); + outbuf.p = 0; + outbuf.n = 0; + outbuf.c = 0; +} + +static void ClearOutput(void) { + outbuf.n = 0; +} + +static void Grow(size_t n) { + do { + if (outbuf.c) { + outbuf.c += outbuf.c >> 1; + } else { + outbuf.c = 16 * 1024; + } + } while (n > outbuf.c); + outbuf.p = xrealloc(outbuf.p, outbuf.c); +} + +static void AppendData(const char *data, size_t size) { + size_t n; + n = outbuf.n + size; + if (n > outbuf.c) Grow(n); + memcpy(outbuf.p + outbuf.n, data, size); + outbuf.n = n; +} + +static void Append(const char *fmt, ...) { + int n; + char *p; + va_list va, vb; + va_start(va, fmt); + va_copy(vb, va); + n = vsnprintf(outbuf.p + outbuf.n, outbuf.c - outbuf.n, fmt, va); + if (n >= outbuf.c - outbuf.n) { + Grow(outbuf.n + n + 1); + vsnprintf(outbuf.p + outbuf.n, outbuf.c - outbuf.n, fmt, vb); + } + va_end(vb); + va_end(va); + outbuf.n += n; +} + +static char *MergePaths(const char *p, size_t n, const char *q, size_t m, + size_t *z) { + char *r; + if (n && p[n - 1] == '/') --n; + if (m && q[0] == '/') ++q, --m; + r = xmalloc(n + 1 + m + 1); + mempcpy(mempcpy(mempcpy(mempcpy(r, p, n), "/", 1), q, m), "", 1); + if (z) *z = n + 1 + m; + return r; +} + static long FindRedirect(const char *path, size_t n) { int c, m, l, r, z; l = 0; @@ -489,7 +795,7 @@ static int CompareInts(const uint64_t x, uint64_t y) { return x > y ? 1 : x < y ? -1 : 0; } -static const char *FindContentType(uint64_t ext) { +static const char *BisectContentType(uint64_t ext) { int c, m, l, r; l = 0; r = ARRAYLEN(kContentTypeExtension) - 1; @@ -507,7 +813,7 @@ static const char *FindContentType(uint64_t ext) { return NULL; } -static const char *GetContentType2(const char *path, size_t n) { +static const char *FindContentType(const char *path, size_t n) { size_t i; uint64_t x; const char *p, *r; @@ -516,7 +822,7 @@ static const char *GetContentType2(const char *path, size_t n) { x <<= 8; x |= path[i] & 0xFF; } - if ((r = FindContentType(bswap_64(x)))) { + if ((r = BisectContentType(bswap_64(x)))) { return r; } } @@ -525,38 +831,95 @@ static const char *GetContentType2(const char *path, size_t n) { static const char *GetContentType(struct Asset *a, const char *path, size_t n) { const char *r; - if (a->file && (r = GetContentType2(a->file->path, strlen(a->file->path)))) { + if (a->file && (r = FindContentType(a->file->path, strlen(a->file->path)))) { return r; } return firstnonnull( - GetContentType2(path, n), - firstnonnull(GetContentType2(ZIP_LFILE_NAME(zmap + a->lf), + FindContentType(path, n), + firstnonnull(FindContentType(ZIP_LFILE_NAME(zmap + a->lf), ZIP_LFILE_NAMESIZE(zmap + a->lf)), - "application/octet-stream")); + a->istext ? "text/plain" : "application/octet-stream")); } -static void DescribeAddress(char buf[32], const struct sockaddr_in *addr) { - char *p = buf; - const uint8_t *ip4 = (const uint8_t *)&addr->sin_addr.s_addr; - p += uint64toarray_radix10(ip4[0], p), *p++ = '.'; - p += uint64toarray_radix10(ip4[1], p), *p++ = '.'; - p += uint64toarray_radix10(ip4[2], p), *p++ = '.'; - p += uint64toarray_radix10(ip4[3], p), *p++ = ':'; - p += uint64toarray_radix10(ntohs(addr->sin_port), p); - *p = '\0'; +static void DescribeAddress(char buf[32], uint32_t addr, uint16_t port) { + char *p; + const char *s; + p = buf; + p += uint64toarray_radix10((addr & 0xFF000000) >> 030, p), *p++ = '.'; + p += uint64toarray_radix10((addr & 0x00FF0000) >> 020, p), *p++ = '.'; + p += uint64toarray_radix10((addr & 0x0000FF00) >> 010, p), *p++ = '.'; + p += uint64toarray_radix10((addr & 0x000000FF) >> 000, p), *p++ = ':'; + p += uint64toarray_radix10(port, p); + if ((s = GetIpCategoryName(CategorizeIp(addr)))) { + *p++ = ' '; + p = stpcpy(p, s); + } + *p++ = '\0'; +} + +static void GetServerAddr(uint32_t *ip, uint16_t *port) { + *ip = ntohl(serveraddr.sin_addr.s_addr); + if (port) *port = ntohs(serveraddr.sin_port); +} + +static void GetClientAddr(uint32_t *ip, uint16_t *port) { + *ip = ntohl(clientaddr.sin_addr.s_addr); + if (port) *port = ntohs(clientaddr.sin_port); +} + +static void GetRemoteAddr(uint32_t *ip, uint16_t *port) { + GetClientAddr(ip, port); + if (HasHeader(kHttpXForwardedFor) && + (IsPrivateIp(*ip) || IsLoopbackIp(*ip))) { + ParseForwarded(HeaderData(kHttpXForwardedFor), + HeaderLength(kHttpXForwardedFor), ip, port); + } +} + +static char *DescribeClient(void) { + uint32_t ip; + uint16_t port; + static char clientaddrstr[32]; + GetRemoteAddr(&ip, &port); + DescribeAddress(clientaddrstr, ip, port); + return clientaddrstr; +} + +static char *DescribeServer(void) { + uint32_t ip; + uint16_t port; + static char serveraddrstr[32]; + GetServerAddr(&ip, &port); + DescribeAddress(serveraddrstr, ip, port); + return serveraddrstr; } static void ProgramBrand(const char *s) { free(brand); free(serverheader); brand = strdup(s); - if (!strstr(s, "redbean")) unbranded = true; if (!(serverheader = EncodeHttpHeaderValue(brand, -1, 0))) { fprintf(stderr, "error: brand isn't latin1 encodable: %`'s", brand); exit(1); } } +static void ProgramLinger(long sec) { + linger.l_onoff = sec > 0; + linger.l_linger = MAX(0, sec); +} + +static void ProgramTimeout(long ms) { + ldiv_t d; + if (ms <= 30) { + fprintf(stderr, "error: timeout needs to be 31ms or greater\n"); + exit(1); + } + d = ldiv(ms, 1000); + timeout.tv_sec = d.quot; + timeout.tv_usec = d.rem * 1000; +} + static void ProgramCache(long x) { cacheseconds = x; } @@ -566,19 +929,20 @@ static void ProgramPort(long x) { } static void SetDefaults(void) { - ProgramBrand("redbean/0.3"); +#ifdef STATIC + ProgramBrand("redbean-static/0.4"); +#else + ProgramBrand("redbean/0.4"); +#endif + __log_level = kLogWarn; ProgramCache(-1); + ProgramTimeout(30 * 1000); ProgramPort(DEFAULT_PORT); serveraddr.sin_family = AF_INET; serveraddr.sin_addr.s_addr = INADDR_ANY; if (IsWindows()) uniprocess = true; } -static wontreturn void PrintUsage(FILE *f, int rc) { - fprintf(f, "SYNOPSIS\n\n %s%s", program_invocation_name, USAGE); - exit(rc); -} - static char *RemoveTrailingSlashes(char *s) { size_t n; n = strlen(s); @@ -591,19 +955,58 @@ static void AddString(struct Strings *l, char *s) { l->p[l->n - 1] = s; } +static bool HasString(struct Strings *l, char *s) { + size_t i; + for (i = 0; i < l->n; ++i) { + if (!strcmp(l->p[i], s)) { + return true; + } + } + return false; +} + static void AddStagingDirectory(const char *dirpath) { char *s; s = RemoveTrailingSlashes(strdup(dirpath)); - if (!isdirectory(s)) { - fprintf(stderr, "error: not a directory: %s\n", s); + if (isempty(s) || !isdirectory(s)) { + fprintf(stderr, "error: not a directory: %`'s\n", s); exit(1); } AddString(&stagedirs, s); } +static void ProgramHeader(const char *s) { + char *p, *v, *h; + if ((p = strchr(s, ':')) && IsValidHttpToken(s, p - s) && + (v = EncodeLatin1(p + 1, -1, 0, kControlC0 | kControlC1 | kControlWs))) { + switch (GetHttpHeader(s, p - s)) { + case kHttpDate: + case kHttpConnection: + case kHttpContentLength: + case kHttpContentEncoding: + case kHttpContentRange: + fprintf(stderr, "error: can't program header: %`'s\n", s); + exit(1); + case kHttpServer: + ProgramBrand(p + 1); + break; + default: + p = xasprintf("%s%.*s:%s\r\n", extrahdrs ? extrahdrs : "", p - s, s, v); + free(extrahdrs); + extrahdrs = p; + break; + } + free(v); + } else { + fprintf(stderr, "error: illegal header: %`'s\n", s); + exit(1); + } +} + static void GetOpts(int argc, char *argv[]) { int opt; - while ((opt = getopt(argc, argv, "zhduvmbl:p:w:r:R:c:L:P:U:G:B:D:")) != -1) { + while ((opt = getopt(argc, argv, "azhdugvmbfl:p:r:R:H:c:L:P:U:G:B:D:t:")) != + -1) { switch (opt) { case 'v': __log_level++; @@ -611,9 +1014,15 @@ static void GetOpts(int argc, char *argv[]) { case 'd': daemonize = true; break; + case 'a': + logrusage = true; + break; case 'u': uniprocess = true; break; + case 'g': + loglatency = true; + break; case 'm': logmessages = true; break; @@ -623,9 +1032,15 @@ static void GetOpts(int argc, char *argv[]) { case 'z': printport = true; break; + case 'f': + funtrace = true; + break; case 'k': encouragekeepalive = true; break; + case 't': + ProgramTimeout(strtol(optarg, NULL, 0)); + break; case 'r': ProgramRedirectArg(307, optarg); break; @@ -647,6 +1062,9 @@ static void GetOpts(int argc, char *argv[]) { case 'B': ProgramBrand(optarg); break; + case 'H': + ProgramHeader(optarg); + break; case 'L': logpath = optarg; break; @@ -673,7 +1091,11 @@ static void GetOpts(int argc, char *argv[]) { static void Daemonize(void) { char ibuf[21]; int i, fd, pid; - for (i = 0; i < 128; ++i) close(i); + for (i = 3; i < 128; ++i) { + if (i != server) { + close(i); + } + } if ((pid = fork()) > 0) exit(0); setsid(); if ((pid = fork()) > 0) _exit(0); @@ -687,66 +1109,172 @@ static void Daemonize(void) { freopen("/dev/null", "r", stdin); freopen(logpath, "a", stdout); freopen(logpath, "a", stderr); - LOGIFNEG1(setuid(daemonuid)); LOGIFNEG1(setgid(daemongid)); + LOGIFNEG1(setuid(daemonuid)); } -static void OnWorkerExit(int pid, int ws) { - int w; - w = --shared->workers; +static void ReportWorkerExit(int pid, int ws) { + --shared->workers; if (WIFEXITED(ws)) { if (WEXITSTATUS(ws)) { - WARNF("worker %d exited with %d (%,d workers remain)", pid, - WEXITSTATUS(ws), w); + LockInc(&shared->failedchildren); + WARNF("%d exited with %d (%,d workers remain)", pid, WEXITSTATUS(ws), + shared->workers); } else { - DEBUGF("worker %d exited (%,d workers remain)", pid, w); + DEBUGF("%d exited (%,d workers remain)", pid, shared->workers); } } else { - WARNF("worker %d terminated with %s (%,d workers remain)", pid, - strsignal(WTERMSIG(ws)), w); + LockInc(&shared->terminatedchildren); + WARNF("%d terminated with %s (%,d workers remain)", pid, + strsignal(WTERMSIG(ws)), shared->workers); } } +static void AppendResourceReport(struct rusage *ru, const char *nl) { + long utime, stime; + long double ticks; + if (ru->ru_maxrss) { + Append("ballooned to %,ldkb in size%s", ru->ru_maxrss, nl); + } + if ((utime = ru->ru_utime.tv_sec * 1000000 + ru->ru_utime.tv_usec) | + (stime = ru->ru_stime.tv_sec * 1000000 + ru->ru_stime.tv_usec)) { + ticks = ceill((long double)(utime + stime) / (1000000.L / CLK_TCK)); + Append("needed %,ldµs cpu (%d%% kernel)%s", utime + stime, + (int)((long double)stime / (utime + stime) * 100), nl); + if (ru->ru_idrss) { + Append("needed %,ldkb memory on average%s", lroundl(ru->ru_idrss / ticks), + nl); + } + if (ru->ru_isrss) { + Append("needed %,ldkb stack on average%s", lroundl(ru->ru_isrss / ticks), + nl); + } + if (ru->ru_ixrss) { + Append("mapped %,ldkb shared on average%s", lroundl(ru->ru_ixrss / ticks), + nl); + } + } + if (ru->ru_minflt || ru->ru_majflt) { + Append("caused %,ld page faults (%d%% memcpy)%s", + ru->ru_minflt + ru->ru_majflt, + (int)((long double)ru->ru_minflt / (ru->ru_minflt + ru->ru_majflt) * + 100), + nl); + } + if (ru->ru_nvcsw + ru->ru_nivcsw > 1) { + Append( + "%,ld context switches (%d%% consensual)%s", + ru->ru_nvcsw + ru->ru_nivcsw, + (int)((long double)ru->ru_nvcsw / (ru->ru_nvcsw + ru->ru_nivcsw) * 100), + nl); + } + if (ru->ru_msgrcv || ru->ru_msgsnd) { + Append("received %,ld message%s and sent %,ld%s", ru->ru_msgrcv, + ru->ru_msgrcv == 1 ? "" : "s", ru->ru_msgsnd, nl); + } + if (ru->ru_inblock || ru->ru_oublock) { + Append("performed %,ld read%s and %,ld write i/o operations%s", + ru->ru_inblock, ru->ru_inblock == 1 ? "" : "s", ru->ru_oublock, nl); + } + if (ru->ru_nsignals) { + Append("received %,ld signals%s", ru->ru_nsignals, nl); + } + if (ru->ru_nswap) { + Append("got swapped %,ld times%s", ru->ru_nswap, nl); + } +} + +static void AddTimeval(struct timeval *x, const struct timeval *y) { + x->tv_sec += y->tv_sec; + x->tv_usec += y->tv_usec; + if (x->tv_usec >= 1000000) { + x->tv_usec -= 1000000; + x->tv_sec += 1; + } +} + +static void AddRusage(struct rusage *x, const struct rusage *y) { + AddTimeval(&x->ru_utime, &y->ru_utime); + AddTimeval(&x->ru_stime, &y->ru_stime); + x->ru_maxrss = MAX(x->ru_maxrss, y->ru_maxrss); + x->ru_ixrss += y->ru_ixrss; + x->ru_idrss += y->ru_idrss; + x->ru_isrss += y->ru_isrss; + x->ru_minflt += y->ru_minflt; + x->ru_majflt += y->ru_majflt; + x->ru_nswap += y->ru_nswap; + x->ru_inblock += y->ru_inblock; + x->ru_oublock += y->ru_oublock; + x->ru_msgsnd += y->ru_msgsnd; + x->ru_msgrcv += y->ru_msgrcv; + x->ru_nsignals += y->ru_nsignals; + x->ru_nvcsw += y->ru_nvcsw; + x->ru_nivcsw += y->ru_nivcsw; +} + +static void ReportWorkerResources(int pid, struct rusage *ru) { + const char *s; + if (logrusage || LOGGABLE(kLogDebug)) { + AppendResourceReport(ru, "\n"); + if (outbuf.n) { + if ((s = IndentLines(outbuf.p, outbuf.n - 1, 0, 1))) { + LOGF("resource report for pid %d\n%s", pid, s); + free(s); + } + ClearOutput(); + } + } +} + +static void HandleWorkerExit(int pid, int ws, struct rusage *ru) { + ++shared->connectionshandled; + AddRusage(&shared->children, ru); + ReportWorkerExit(pid, ws); + ReportWorkerResources(pid, ru); +} + static void WaitAll(void) { int ws, pid; + struct rusage ru; for (;;) { - if ((pid = wait(&ws)) != -1) { - OnWorkerExit(pid, ws); + if ((pid = wait4(-1, &ws, 0, &ru)) != -1) { + HandleWorkerExit(pid, ws, &ru); } else { if (errno == ECHILD) break; if (errno == EINTR) { if (killed) { killed = false; terminated = false; - WARNF("%s redbean shall terminate harder", serveraddrstr); + WARNF("redbean shall terminate harder"); LOGIFNEG1(kill(0, SIGTERM)); } continue; } - FATALF("%s wait error %s", serveraddrstr, strerror(errno)); + FATALF("%s wait error %s", DescribeServer(), strerror(errno)); } } } static void ReapZombies(void) { int ws, pid; - zombied = false; + struct rusage ru; do { - if ((pid = waitpid(-1, &ws, WNOHANG)) != -1) { + zombied = false; + if ((pid = wait4(-1, &ws, WNOHANG, &ru)) != -1) { if (pid) { - OnWorkerExit(pid, ws); + HandleWorkerExit(pid, ws, &ru); } else { break; } } else { if (errno == ECHILD) break; if (errno == EINTR) continue; - FATALF("%s wait error %s", serveraddrstr, strerror(errno)); + FATALF("%s wait error %s", DescribeServer(), strerror(errno)); } } while (!terminated); } -static ssize_t WritevAll(int fd, struct iovec *iov, int iovlen) { +static inline ssize_t WritevAll(int fd, struct iovec *iov, int iovlen) { ssize_t rc; size_t wrote; do { @@ -764,6 +1292,7 @@ static ssize_t WritevAll(int fd, struct iovec *iov, int iovlen) { } } while (wrote); } else if (errno == EINTR) { + LockInc(&shared->writeinterruputs); if (killed || (meltdown && nowl() - startread > 2)) { return -1; } @@ -774,46 +1303,22 @@ static ssize_t WritevAll(int fd, struct iovec *iov, int iovlen) { return 0; } -static uint32_t Hash(const void *data, size_t size) { - uint32_t h; - h = crc32c(0, data, size); - if (!h) h = 1; - return h; -} - -static bool HasHeader(int h) { - return msg.headers[h].b > msg.headers[h].a; -} - -static int CompareHeader(int h, const char *s) { - return CompareSlices(s, strlen(s), inbuf.p + msg.headers[h].a, - msg.headers[h].b - msg.headers[h].a); -} - -static bool HeaderEquals(int h, const char *s) { - return !CompareHeader(h, s); -} - static bool ClientAcceptsGzip(void) { - return httpversion >= 100 && - !!memmem(inbuf.p + msg.headers[kHttpAcceptEncoding].a, - msg.headers[kHttpAcceptEncoding].b - - msg.headers[kHttpAcceptEncoding].a, - "gzip", 4); + return msg.version >= 10 && /* RFC1945 § 3.5 */ + HeaderHas(&msg, inbuf.p, kHttpAcceptEncoding, "gzip", 4); } static void UpdateCurrentDate(long double now) { int64_t t; struct tm tm; - t = nowish = now; + t = now; + shared->nowish = now; gmtime_r(&t, &tm); - FormatHttpDateTime(currentdate, &tm); + FormatHttpDateTime(shared->currentdate, &tm); } -static int64_t GetGmtOffset(void) { - int64_t t; +static int64_t GetGmtOffset(int64_t t) { struct tm tm; - t = nowl(); localtime_r(&t, &tm); return tm.tm_gmtoff; } @@ -822,20 +1327,34 @@ static int64_t LocoTimeToZulu(int64_t x) { return x - gmtoff; } -static int64_t GetLastModifiedZip(const uint8_t *cfile) { +static int64_t GetZipCfileLastModified(const uint8_t *zcf) { const uint8_t *p, *pe; - for (p = ZIP_CFILE_EXTRA(cfile), pe = p + ZIP_CFILE_EXTRASIZE(cfile); p < pe; + for (p = ZIP_CFILE_EXTRA(zcf), pe = p + ZIP_CFILE_EXTRASIZE(zcf); p + 4 <= pe; p += ZIP_EXTRA_SIZE(p)) { - if (ZIP_EXTRA_HEADERID(p) == kZipExtraNtfs) { - return LocoTimeToZulu(READ64LE(ZIP_EXTRA_CONTENT(p) + 8) / - HECTONANOSECONDS - - MODERNITYSECONDS); - } else if (ZIP_EXTRA_HEADERID(p) == kZipExtraExtendedTimestamp) { - return READ32LE(ZIP_EXTRA_CONTENT(p) + 1); + if (ZIP_EXTRA_HEADERID(p) == kZipExtraNtfs && + ZIP_EXTRA_CONTENTSIZE(p) >= 4 + 4 + 8 * 3 && + READ16LE(ZIP_EXTRA_CONTENT(p) + 4) == 1 && + READ16LE(ZIP_EXTRA_CONTENT(p) + 6) == 24) { + return READ64LE(ZIP_EXTRA_CONTENT(p) + 8) / HECTONANOSECONDS - + MODERNITYSECONDS; } } - return LocoTimeToZulu(DosDateTimeToUnix(ZIP_CFILE_LASTMODIFIEDDATE(cfile), - ZIP_CFILE_LASTMODIFIEDTIME(cfile))); + for (p = ZIP_CFILE_EXTRA(zcf), pe = p + ZIP_CFILE_EXTRASIZE(zcf); p + 4 <= pe; + p += ZIP_EXTRA_SIZE(p)) { + if (ZIP_EXTRA_HEADERID(p) == kZipExtraExtendedTimestamp && + ZIP_EXTRA_CONTENTSIZE(p) >= 1 + 4 && (*ZIP_EXTRA_CONTENT(p) & 1)) { + return (int32_t)READ32LE(ZIP_EXTRA_CONTENT(p) + 1); + } + } + for (p = ZIP_CFILE_EXTRA(zcf), pe = p + ZIP_CFILE_EXTRASIZE(zcf); p + 4 <= pe; + p += ZIP_EXTRA_SIZE(p)) { + if (ZIP_EXTRA_HEADERID(p) == kZipExtraUnix && + ZIP_EXTRA_CONTENTSIZE(p) >= 4 + 4) { + return (int32_t)READ32LE(ZIP_EXTRA_CONTENT(p) + 4); + } + } + return LocoTimeToZulu(DosDateTimeToUnix(ZIP_CFILE_LASTMODIFIEDDATE(zcf), + ZIP_CFILE_LASTMODIFIEDTIME(zcf))); } static bool IsCompressed(struct Asset *a) { @@ -843,13 +1362,16 @@ static bool IsCompressed(struct Asset *a) { ZIP_LFILE_COMPRESSIONMETHOD(zmap + a->lf) == kZipCompressionDeflate; } +static int GetMode(struct Asset *a) { + return a->file ? a->file->st.st_mode : GetZipCfileMode(zmap + a->cf); +} + static bool IsNotModified(struct Asset *a) { - if (httpversion < 100) return false; + if (msg.version < 10) return false; if (!HasHeader(kHttpIfModifiedSince)) return false; return a->lastmodified >= - ParseHttpDateTime(inbuf.p + msg.headers[kHttpIfModifiedSince].a, - msg.headers[kHttpIfModifiedSince].b - - msg.headers[kHttpIfModifiedSince].a); + ParseHttpDateTime(HeaderData(kHttpIfModifiedSince), + HeaderLength(kHttpIfModifiedSince)); } static char *FormatUnixHttpDateTime(char *s, int64_t t) { @@ -859,49 +1381,28 @@ static char *FormatUnixHttpDateTime(char *s, int64_t t) { return s; } -static void *FreeLater(void *p) { - if (p) { - freelist.p = xrealloc(freelist.p, ++freelist.n * sizeof(*freelist.p)); - freelist.p[freelist.n - 1] = p; - } - return p; -} - -static void CollectGarbage(void) { - size_t i; - for (i = 0; i < freelist.n; ++i) free(freelist.p[i]); - free(freelist.p); - freelist.p = 0; - freelist.n = 0; - free(outbuf.p); - free(request.params.p); - DestroyHttpRequest(&msg); -} - static bool IsCompressionMethodSupported(int method) { return method == kZipCompressionNone || method == kZipCompressionDeflate; } static void IndexAssets(void) { int64_t lm; + uint64_t cf, lf; struct Asset *p; - uint32_t i, n, m, cf, step, hash; + uint32_t i, n, m, step, hash; CHECK_GE(HASH_LOAD_FACTOR, 2); - n = ZIP_CDIR_RECORDS(zdir); + CHECK(READ32LE(cdir) == kZipCdir64HdrMagic || + READ32LE(cdir) == kZipCdirHdrMagic); + n = GetZipCdirRecords(cdir); m = roundup2pow(MAX(1, n) * HASH_LOAD_FACTOR); p = xcalloc(m, sizeof(struct Asset)); - CHECK_EQ(kZipCdirHdrMagic, ZIP_CDIR_MAGIC(zdir)); - for (cf = ZIP_CDIR_OFFSET(zdir); n--; cf += ZIP_CFILE_HDRSIZE(zmap + cf)) { + for (cf = GetZipCdirOffset(cdir); n--; cf += ZIP_CFILE_HDRSIZE(zmap + cf)) { CHECK_EQ(kZipCfileHdrMagic, ZIP_CFILE_MAGIC(zmap + cf)); - if (!IsCompressionMethodSupported(ZIP_CFILE_COMPRESSIONMETHOD(zmap + cf))) { - WARNF("don't understand zip compression method %d used by %`'.*s", - ZIP_CFILE_COMPRESSIONMETHOD(zmap + cf), - ZIP_CFILE_NAMESIZE(zmap + cf), ZIP_CFILE_NAME(zmap + cf)); - continue; - } - if (ZIP_CFILE_NAMESIZE(zmap + cf) > 1 && - ZIP_CFILE_NAME(zmap + cf)[ZIP_CFILE_NAMESIZE(zmap + cf) - 1] == '/' && - !ZIP_CFILE_UNCOMPRESSEDSIZE(zmap + cf)) { + lf = GetZipCfileOffset(zmap + cf); + if (!IsCompressionMethodSupported(ZIP_LFILE_COMPRESSIONMETHOD(zmap + lf))) { + LOGF("don't understand zip compression method %d used by %`'.*s", + ZIP_LFILE_COMPRESSIONMETHOD(zmap + lf), + ZIP_CFILE_NAMESIZE(zmap + cf), ZIP_CFILE_NAME(zmap + cf)); continue; } hash = Hash(ZIP_CFILE_NAME(zmap + cf), ZIP_CFILE_NAMESIZE(zmap + cf)); @@ -910,9 +1411,11 @@ static void IndexAssets(void) { i = (hash + (step * (step + 1)) >> 1) & (m - 1); ++step; } while (p[i].hash); - lm = GetLastModifiedZip(zmap + cf); + lm = GetZipCfileLastModified(zmap + cf); p[i].hash = hash; - p[i].lf = ZIP_CFILE_OFFSET(zmap + cf); + p[i].lf = lf; + p[i].cf = cf; + p[i].istext = !!(ZIP_CFILE_INTERNALATTRIBUTES(zmap + cf) & kZipIattrText); p[i].lastmodified = lm; p[i].lastmodifiedstr = FormatUnixHttpDateTime(xmalloc(30), lm); } @@ -929,7 +1432,7 @@ static void OpenZip(const char *path) { CHECK((zsize = st.st_size)); CHECK_NE(MAP_FAILED, (zmap = mmap(NULL, zsize, PROT_READ, MAP_SHARED, fd, 0))); - CHECK_NOTNULL((zdir = zipfindcentraldir(zmap, zsize))); + CHECK_NOTNULL((cdir = GetZipCdir(zmap, zsize))); if (endswith(path, ".com.dbg") && (p = memmem(zmap, zsize, "MZqFpD", 6))) { zsize -= p - zmap; zmap = p; @@ -937,8 +1440,9 @@ static void OpenZip(const char *path) { close(fd); } -static struct Asset *FindAsset(const char *path, size_t pathlen) { +static struct Asset *GetAssetZip(const char *path, size_t pathlen) { uint32_t i, step, hash; + if (pathlen > 1 && path[0] == '/') ++path, --pathlen; hash = Hash(path, pathlen); for (step = 0;; ++step) { i = (hash + (step * (step + 1)) >> 1) & (assets.n - 1); @@ -951,234 +1455,57 @@ static struct Asset *FindAsset(const char *path, size_t pathlen) { } } -static struct Asset *LocateAssetZip(const char *path, size_t pathlen) { - char *p2, *p3, *p4; - struct Asset *a; - if (pathlen && path[0] == '/') ++path, --pathlen; - if (!(a = FindAsset(path, pathlen)) && - (!pathlen || (pathlen && path[pathlen - 1] == '/'))) { - p2 = strndup(path, pathlen); - p3 = xjoinpaths(p2, "index.lua"); - if (!(a = FindAsset(p3, strlen(p3)))) { - p4 = xjoinpaths(p2, "index.html"); - a = FindAsset(p4, strlen(p4)); - free(p4); - } - free(p3); - free(p2); - } - return a; -} - -static struct Asset *LocateAssetFile(const char *path, size_t pathlen) { - char *p; +static struct Asset *GetAssetFile(const char *path, size_t pathlen) { size_t i; struct Asset *a; if (stagedirs.n) { a = FreeLater(xcalloc(1, sizeof(struct Asset))); a->file = FreeLater(xmalloc(sizeof(struct File))); for (i = 0; i < stagedirs.n; ++i) { - if (stat((a->file->path = p = FreeLater(xasprintf( - "%s%.*s", stagedirs.p[i], request.path.n, request.path.p))), - &a->file->st) != -1 && - (S_ISREG(a->file->st.st_mode) || - (S_ISDIR(a->file->st.st_mode) && - ((stat((a->file->path = FreeLater(xjoinpaths(p, "index.lua"))), - &a->file->st) != -1 && - S_ISREG(a->file->st.st_mode)) || - (stat((a->file->path = FreeLater(xjoinpaths(p, "index.html"))), - &a->file->st) != -1 && - S_ISREG(a->file->st.st_mode)))))) { + LockInc(&shared->stats); + a->file->path = FreeLater( + MergePaths(stagedirs.p[i], strlen(stagedirs.p[i]), path, pathlen, 0)); + if (stat(a->file->path, &a->file->st) != -1) { a->lastmodifiedstr = FormatUnixHttpDateTime( FreeLater(xmalloc(30)), (a->lastmodified = a->file->st.st_mtim.tv_sec)); return a; + } else { + LockInc(&shared->statfails); } } } return NULL; } -static struct Asset *LocateAsset(const char *path, size_t pathlen) { +static struct Asset *GetAsset(const char *path, size_t pathlen) { + char *path2; struct Asset *a; - if (!(a = LocateAssetFile(path, pathlen))) { - a = LocateAssetZip(path, pathlen); + if (!(a = GetAssetFile(path, pathlen))) { + if (!(a = GetAssetZip(path, pathlen))) { + if (pathlen > 1 && path[pathlen - 1] != '/' && + pathlen + 1 <= sizeof(slashpath)) { + memcpy(mempcpy(slashpath, path, pathlen), "/", 1); + a = GetAssetZip(slashpath, pathlen + 1); + } + } } return a; } -static void EmitParamKey(struct Parser *u, struct Params *h) { - h->p = xrealloc(h->p, ++h->n * sizeof(*h->p)); - h->p[h->n - 1].key.p = u->q; - h->p[h->n - 1].key.n = u->p - u->q; - u->q = u->p; -} - -static void EmitParamVal(struct Parser *u, struct Params *h, bool t) { - if (!t) { - if (u->p > u->q) { - EmitParamKey(u, h); - h->p[h->n - 1].val.p = NULL; - h->p[h->n - 1].val.n = SIZE_MAX; - } - } else { - h->p[h->n - 1].val.p = u->q; - h->p[h->n - 1].val.n = u->p - u->q; - u->q = u->p; - } -} - -static void ParseLatin1(struct Parser *u) { - *u->p++ = 0300 | u->c >> 6; - *u->p++ = 0200 | u->c & 077; -} - -static void ParseEscape(struct Parser *u) { - int a, b; - a = u->i < u->size ? u->data[u->i++] & 0xff : 0; - b = u->i < u->size ? u->data[u->i++] & 0xff : 0; - *u->p++ = kHexToInt[a] << 4 | kHexToInt[b]; -} - -static void ParsePath(struct Parser *u, struct Buffer *h) { - while (u->i < u->size) { - u->c = u->data[u->i++] & 0xff; - if (u->c == '#' || u->c == '?') { - break; - } else if (u->c == '%') { - ParseEscape(u); - } else if (u->c >= 0200 && u->islatin1) { - ParseLatin1(u); - } else { - *u->p++ = u->c; - } - } - h->p = u->q; - h->n = u->p - u->q; - u->q = u->p; -} - -static void ParseParams(struct Parser *u, struct Params *h) { - bool t = false; - while (u->i < u->size) { - u->c = u->data[u->i++] & 0xff; - if (u->c == '#') { - break; - } else if (u->c == '%') { - ParseEscape(u); - } else if (u->c == '+') { - *u->p++ = u->isform ? ' ' : '+'; - } else if (u->c == '&') { - EmitParamVal(u, h, t); - t = false; - } else if (u->c == '=') { - if (!t) { - if (u->p > u->q) { - EmitParamKey(u, h); - t = true; - } - } else { - *u->p++ = '='; - } - } else if (u->c >= 0200 && u->islatin1) { - ParseLatin1(u); - } else { - *u->p++ = u->c; - } - } - EmitParamVal(u, h, t); -} - -static void ParseFragment(struct Parser *u, struct Buffer *h) { - while (u->i < u->size) { - u->c = u->data[u->i++] & 0xff; - if (u->c == '%') { - ParseEscape(u); - } else if (u->c >= 0200 && u->islatin1) { - ParseLatin1(u); - } else { - *u->p++ = u->c; - } - } - h->p = u->q; - h->n = u->p - u->q; - u->q = u->p; -} - -static void ParseRequestUri(void) { - struct Parser u; - u.i = 0; - u.c = 0; - u.isform = false; - u.islatin1 = true; - u.data = inbuf.p + msg.uri.a; - u.size = msg.uri.b - msg.uri.a; - memset(&request, 0, sizeof(request)); - if (u.size > 8 && !memcmp(u.data, "http", 4)) { - /* - * convert http://www.foo.com/index.html -> /www.foo.com/index.html - */ - if (u.data[4] == ':' && u.data[5] == '/' && u.data[6] == '/') { - u.data += 6; - u.size -= 6; - } else if (u.data[4] == 's' && u.data[5] == ':' && u.data[6] == '/' && - u.data[7] == '/') { - u.data += 7; - u.size -= 7; - } - } - u.q = u.p = FreeLater(xmalloc(u.size * 2)); - ParsePath(&u, &request.path); - if (u.c == '?') ParseParams(&u, &request.params); - if (u.c == '#') ParseFragment(&u, &request.fragment); -} - -static void ParseFormParams(void) { - struct Parser u; - u.i = 0; - u.c = 0; - u.isform = true; - u.islatin1 = false; - u.data = inbuf.p + hdrsize; - u.size = msgsize - hdrsize; - u.q = u.p = FreeLater(xmalloc(u.size)); - ParseParams(&u, &request.params); -} - -static void *AddRange(char *content, long start, long length) { - intptr_t mend, mstart; - if (!__builtin_add_overflow((intptr_t)content, start, &mstart) || - !__builtin_add_overflow(mstart, length, &mend) || - ((intptr_t)zmap <= mstart && mstart <= (intptr_t)zmap + zsize) || - ((intptr_t)zmap <= mend && mend <= (intptr_t)zmap + zsize)) { - return (void *)mstart; - } else { - abort(); - } -} - -static char *AppendCrlf(char *p) { - p[0] = '\r'; - p[1] = '\n'; - return p + 2; -} - static bool MustNotIncludeMessageBody(void) { /* RFC2616 § 4.4 */ return msg.method == kHttpHead || (100 <= statuscode && statuscode <= 199) || statuscode == 204 || statuscode == 304; } -static char *SetStatus(int code, const char *reason) { - char *p; +static char *SetStatus(unsigned code, const char *reason) { statuscode = code; - p = hdrbuf.p; - p = stpcpy(p, "HTTP/1."); - *p++ = httpversion == 100 ? '0' : '1'; - *p++ = ' '; - p += uint64toarray_radix10(code, p); - *p++ = ' '; - p = stpcpy(p, reason); - return AppendCrlf(p); + stpcpy(hdrbuf.p, "HTTP/1.0 000 "); + hdrbuf.p[7] += msg.version & 1; + hdrbuf.p[9] += code / 100; + hdrbuf.p[10] += code / 10 % 10; + hdrbuf.p[11] += code % 10; + return AppendCrlf(stpcpy(hdrbuf.p + 13, reason)); } static char *AppendHeader(char *p, const char *k, const char *v) { @@ -1189,27 +1516,15 @@ static char *AppendHeader(char *p, const char *k, const char *v) { static char *AppendContentType(char *p, const char *ct) { p = stpcpy(p, "Content-Type: "); p = stpcpy(p, ct); - if (startswith(ct, "text/") && !strchr(ct, ';')) { - p = stpcpy(p, "; charset=utf-8"); + if (startswith(ct, "text/")) { istext = true; + if (!strchr(ct, ';')) { + p = stpcpy(p, "; charset=utf-8"); + } } return AppendCrlf(p); } -static char *ServeError(int code, const char *reason) { - char *p; - size_t reasonlen; - reasonlen = strlen(reason); - p = SetStatus(code, reason); - p = AppendContentType(p, "text/plain"); - content = FreeLater(xmalloc(reasonlen + 3)); - contentlength = reasonlen + 2; - stpcpy(stpcpy(content, reason), "\r\n"); - WARNF("%s %s %`'.*s %d %s", clientaddrstr, kHttpMethod[msg.method], - msg.uri.b - msg.uri.a, inbuf.p + msg.uri.a, code, reason); - return p; -} - static char *AppendExpires(char *p, int64_t t) { struct tm tm; gmtime_r(&t, &tm); @@ -1219,14 +1534,22 @@ static char *AppendExpires(char *p, int64_t t) { } static char *AppendCache(char *p, int64_t seconds) { - struct tm tm; if (seconds < 0) return p; - p = stpcpy(p, "Cache-Control: "); - p = stpcpy(p, "max-age="); + p = stpcpy(p, "Cache-Control: max-age="); p += uint64toarray_radix10(seconds, p); - if (seconds) p = stpcpy(p, ", public"); + if (seconds) { + p = stpcpy(p, ", public"); + } else { + p = stpcpy(p, ", no-store"); + } p = AppendCrlf(p); - return AppendExpires(p, (int64_t)nowish + seconds); + return AppendExpires(p, (int64_t)shared->nowish + seconds); +} + +static char *AppendServer(char *p, const char *s) { + p = stpcpy(p, "Server: "); + p = stpcpy(p, s); + return AppendCrlf(p); } static char *AppendContentLength(char *p, size_t n) { @@ -1235,26 +1558,23 @@ static char *AppendContentLength(char *p, size_t n) { return AppendCrlf(p); } -static char *AppendContentRange(char *p, long rangestart, long rangelength, - long contentlength) { - long endrange; - CHECK_GT(rangelength, 0); - CHECK_GT(rangestart + rangelength, rangestart); - CHECK_LE(rangestart + rangelength, contentlength); - endrange = rangestart + rangelength - 1; +static char *AppendContentRange(char *p, long a, long b, long c) { p = stpcpy(p, "Content-Range: bytes "); - p += uint64toarray_radix10(rangestart, p); - *p++ = '-'; - p += uint64toarray_radix10(endrange, p); + if (a >= 0 && b > 0) { + p += uint64toarray_radix10(a, p); + *p++ = '-'; + p += uint64toarray_radix10(a + b - 1, p); + } else { + *p++ = '*'; + } *p++ = '/'; - p += uint64toarray_radix10(contentlength, p); + p += uint64toarray_radix10(c, p); return AppendCrlf(p); } -static bool Inflate(uint8_t *dp, size_t dn, const uint8_t *sp, size_t sn) { - bool ok; +static bool Inflate(void *dp, size_t dn, const void *sp, size_t sn) { z_stream zs; - ok = false; + LockInc(&shared->inflates); zs.next_in = sp; zs.avail_in = sn; zs.total_in = sn; @@ -1263,31 +1583,43 @@ static bool Inflate(uint8_t *dp, size_t dn, const uint8_t *sp, size_t sn) { zs.total_out = dn; zs.zfree = Z_NULL; zs.zalloc = Z_NULL; - if (inflateInit2(&zs, -MAX_WBITS) == Z_OK) { - switch (inflate(&zs, Z_NO_FLUSH)) { - case Z_STREAM_END: - ok = true; - break; - case Z_MEM_ERROR: - WARNF("Z_MEM_ERROR"); - break; - case Z_DATA_ERROR: - WARNF("Z_DATA_ERROR"); - break; - case Z_NEED_DICT: - WARNF("Z_NEED_DICT"); - break; - default: - abort(); - } - inflateEnd(&zs); + CHECK_EQ(Z_OK, inflateInit2(&zs, -MAX_WBITS)); + switch (inflate(&zs, Z_NO_FLUSH)) { + case Z_STREAM_END: + CHECK_EQ(Z_OK, inflateEnd(&zs)); + return true; + case Z_DATA_ERROR: + inflateEnd(&zs); + WARNF("Z_DATA_ERROR"); + return false; + case Z_NEED_DICT: + inflateEnd(&zs); + WARNF("Z_NEED_DICT"); + return false; + case Z_MEM_ERROR: + FATALF("Z_MEM_ERROR"); + default: + abort(); + } +} + +static bool Verify(void *data, size_t size, uint32_t crc) { + uint32_t got; + LockInc(&shared->verifies); + if (crc == (got = crc32_z(0, data, size))) { + return true; + } else { + LockInc(&shared->thiscorruption); + WARNF("corrupt zip file at %`'.*s had crc 0x%08x but expected 0x%08x", + msg.uri.b - msg.uri.a, inbuf.p + msg.uri.a, got, crc); + return false; } - return ok; } static void *Deflate(const void *data, size_t size, size_t *out_size) { void *res; z_stream zs; + LockInc(&shared->deflates); CHECK_EQ(Z_OK, deflateInit2(memset(&zs, 0, sizeof(zs)), 4, Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY)); zs.next_in = data; @@ -1301,148 +1633,317 @@ static void *Deflate(const void *data, size_t size, size_t *out_size) { } static void *LoadAsset(struct Asset *a, size_t *out_size) { + int mode; size_t size; uint8_t *data; - if (a->file) return FreeLater(xslurp(a->file->path, out_size)); - size = ZIP_LFILE_UNCOMPRESSEDSIZE(zmap + a->lf); - data = xmalloc(size + 1); - if (ZIP_LFILE_COMPRESSIONMETHOD(zmap + a->lf) == kZipCompressionDeflate) { - CHECK(Inflate(data, size, ZIP_LFILE_CONTENT(zmap + a->lf), - ZIP_LFILE_COMPRESSEDSIZE(zmap + a->lf))); - } else { - memcpy(data, ZIP_LFILE_CONTENT(zmap + a->lf), size); + if (S_ISDIR(GetMode(a))) { + WARNF("can't load directory"); + return NULL; + } + if (!a->file) { + size = GetZipLfileUncompressedSize(zmap + a->lf); + if (size == SIZE_MAX || !(data = malloc(size + 1))) return NULL; + if (IsCompressed(a)) { + if (!Inflate(data, size, ZIP_LFILE_CONTENT(zmap + a->lf), + GetZipLfileCompressedSize(zmap + a->lf))) { + free(data); + return NULL; + } + } else { + memcpy(data, ZIP_LFILE_CONTENT(zmap + a->lf), size); + } + if (!Verify(data, size, ZIP_LFILE_CRC32(zmap + a->lf))) { + free(data); + return NULL; + } + data[size] = '\0'; + if (out_size) *out_size = size; + return data; + } else { + LockInc(&shared->slurps); + return xslurp(a->file->path, out_size); } - data[size] = '\0'; - if (out_size) *out_size = size; - return data; } -static ssize_t Send(struct iovec *iov, int iovlen) { +static void AppendLogo(void) { + size_t n; + char *p, *q; + struct Asset *a; + if ((a = GetAsset("/redbean.png", 12)) && (p = LoadAsset(a, &n))) { + q = EncodeBase64(p, n, &n); + Append("\r\n"); + free(q); + free(p); + } +} + +static inline ssize_t Send(struct iovec *iov, int iovlen) { ssize_t rc; if ((rc = WritevAll(client, iov, iovlen)) == -1) { if (errno == ECONNRESET) { - DEBUGF("%s send reset", clientaddrstr); + LockInc(&shared->writeresets); + DEBUGF("%s write reset", DescribeClient()); + } else if (errno == EAGAIN) { + LockInc(&shared->writetimeouts); + WARNF("%s write timeout", DescribeClient()); } else { - WARNF("%s send error %s", clientaddrstr, strerror(errno)); + LockInc(&shared->writeerrors); + WARNF("%s write error %s", DescribeClient(), strerror(errno)); } connectionclose = true; } return rc; } -static char *ServeAsset(struct Asset *a, const char *path, size_t pathlen) { +static char *CommitOutput(char *p) { + uint32_t crc; + if (!contentlength) { + if (istext && outbuf.n >= 100) { + p = stpcpy(p, "Vary: Accept-Encoding\r\n"); + if (ClientAcceptsGzip()) { + gzipped = true; + crc = crc32_z(0, outbuf.p, outbuf.n); + WRITE32LE(gzip_footer + 0, crc); + WRITE32LE(gzip_footer + 4, outbuf.n); + content = FreeLater(Deflate(outbuf.p, outbuf.n, &contentlength)); + DropOutput(); + } else { + UseOutput(); + } + } else { + UseOutput(); + } + } else { + DropOutput(); + } + return p; +} + +static char *ServeDefaultErrorPage(char *p, unsigned code, const char *reason) { + p = AppendContentType(p, "text/html; charset=ISO-8859-1"); + reason = FreeLater(EscapeHtml(reason, -1, 0)); + Append("\ +\r\n\ +"); + Append("%d %s", code, reason); + Append("\ +\r\n\ +\r\n\ +

\r\n"); + AppendLogo(); + Append("%d %s\r\n", code, reason); + Append("

\r\n"); + UseOutput(); + return p; +} + +static char *ServeErrorImpl(unsigned code, const char *reason) { + size_t n; + char *p, *s; + struct Asset *a; + LockInc(&shared->errors); + ClearOutput(); + p = SetStatus(code, reason); + s = xasprintf("/%d.html", code); + a = GetAsset(s, strlen(s)); + free(s); + if (!a) { + return ServeDefaultErrorPage(p, code, reason); + } else if (a->file) { + LockInc(&shared->slurps); + content = FreeLater(xslurp(a->file->path, &contentlength)); + return AppendContentType(p, "text/html; charset=utf-8"); + } else { + content = (char *)ZIP_LFILE_CONTENT(zmap + a->lf); + contentlength = GetZipLfileCompressedSize(zmap + a->lf); + if (IsCompressed(a)) { + n = GetZipLfileUncompressedSize(zmap + a->lf); + if ((s = FreeLater(malloc(n))) && Inflate(s, n, content, contentlength)) { + content = s; + contentlength = n; + } else { + return ServeDefaultErrorPage(p, code, reason); + } + } + if (Verify(content, contentlength, ZIP_LFILE_CRC32(zmap + a->lf))) { + return AppendContentType(p, "text/html; charset=utf-8"); + } else { + return ServeDefaultErrorPage(p, code, reason); + } + } +} + +static char *ServeError(unsigned code, const char *reason) { + LOGF("ERROR %d %s", code, reason); + return ServeErrorImpl(code, reason); +} + +static char *ServeFailure(unsigned code, const char *reason) { + LOGF("FAILURE %d %s %s HTTP%02d %.*s %`'.*s %`'.*s %`'.*s %`'.*s", code, + reason, DescribeClient(), msg.version, msg.xmethod.b - msg.xmethod.a, + inbuf.p + msg.xmethod.a, HeaderLength(kHttpHost), HeaderData(kHttpHost), + msg.uri.b - msg.uri.a, inbuf.p + msg.uri.a, HeaderLength(kHttpReferer), + HeaderData(kHttpReferer), HeaderLength(kHttpUserAgent), + HeaderData(kHttpUserAgent)); + return ServeErrorImpl(code, reason); +} + +static char *ServeAssetCompressed(struct Asset *a) { + uint32_t crc; + LockInc(&shared->compressedresponses); + DEBUGF("ServeAssetCompressed()"); + gzipped = true; + crc = crc32_z(0, content, contentlength); + WRITE32LE(gzip_footer + 0, crc); + WRITE32LE(gzip_footer + 4, contentlength); + content = FreeLater(Deflate(content, contentlength, &contentlength)); + return SetStatus(200, "OK"); +} + +static char *ServeAssetPrecompressed(struct Asset *a) { + char *buf; + size_t size; + uint32_t crc; + crc = ZIP_LFILE_CRC32(zmap + a->lf); + size = GetZipLfileUncompressedSize(zmap + a->lf); + if (ClientAcceptsGzip()) { + LockInc(&shared->precompressedresponses); + DEBUGF("ServeAssetPrecompressed()"); + gzipped = true; + WRITE32LE(gzip_footer + 0, crc); + WRITE32LE(gzip_footer + 4, size); + return SetStatus(200, "OK"); + } else { + LockInc(&shared->decompressedresponses); + DEBUGF("ServeAssetDecompressed()"); + if ((buf = FreeLater(malloc(size))) && + Inflate(buf, size, content, contentlength) && Verify(buf, size, crc)) { + content = buf; + contentlength = size; + return SetStatus(200, "OK"); + } else { + return ServeError(500, "Internal Server Error"); + } + } +} + +static char *ServeAssetRange(struct Asset *a) { char *p; long rangestart, rangelength; + DEBUGF("ServeAssetRange()"); + if (ParseHttpRange(HeaderData(kHttpRange), HeaderLength(kHttpRange), + contentlength, &rangestart, &rangelength) && + rangestart >= 0 && rangelength >= 0 && rangestart < contentlength && + rangestart + rangelength <= contentlength) { + LockInc(&shared->partialresponses); + p = SetStatus(206, "Partial Content"); + p = AppendContentRange(p, rangestart, rangelength, contentlength); + content += rangestart; + contentlength = rangelength; + return p; + } else { + LockInc(&shared->badranges); + LOGF("bad range %`'.*s", HeaderLength(kHttpRange), HeaderData(kHttpRange)); + p = SetStatus(416, "Range Not Satisfiable"); + p = AppendContentRange(p, -1, -1, contentlength); + content = ""; + contentlength = 0; + return p; + } +} + +static char *ServeAsset(struct Asset *a, const char *path, size_t pathlen) { + int fd; + char *p; + void *data; + size_t size; + uint32_t crc; + const char *ct; + ct = GetContentType(a, path, pathlen); if (IsNotModified(a)) { - DEBUGF("%s %s %`'.*s not modified", clientaddrstr, kHttpMethod[msg.method], - pathlen, path); + LockInc(&shared->notmodifieds); p = SetStatus(304, "Not Modified"); } else { if (!a->file) { - content = ZIP_LFILE_CONTENT(zmap + a->lf); - contentlength = ZIP_LFILE_COMPRESSEDSIZE(zmap + a->lf); + content = (char *)ZIP_LFILE_CONTENT(zmap + a->lf); + contentlength = GetZipLfileCompressedSize(zmap + a->lf); + } else if (a->file->st.st_size) { + size = a->file->st.st_size; + if ((fd = open(a->file->path, O_RDONLY)) != -1) { + data = mmap(0, size, PROT_READ, MAP_PRIVATE, fd, 0); + if (data != MAP_FAILED) { + LockInc(&shared->maps); + UnmapLater(fd, data, size); + content = data; + contentlength = size; + } else { + LockInc(&shared->mapfails); + WARNF("mmap(%`'s) failed %s", a->file->path, strerror(errno)); + close(fd); + return ServeError(500, "Internal Server Error"); + } + } else { + LockInc(&shared->openfails); + WARNF("open(%`'s) failed %s", a->file->path, strerror(errno)); + if (errno == ENFILE) { + LockInc(&shared->enfiles); + return ServeError(503, "Service Unavailable"); + } else if (errno == EMFILE) { + LockInc(&shared->emfiles); + return ServeError(503, "Service Unavailable"); + } else { + return ServeError(500, "Internal Server Error"); + } + } } else { - /* TODO(jart): Use sendfile(). */ - content = FreeLater(xslurp(a->file->path, &contentlength)); + content = ""; + contentlength = 0; } if (IsCompressed(a)) { - if (ClientAcceptsGzip()) { - gzipped = true; - memcpy(gzip_footer + 0, zmap + a->lf + kZipLfileOffsetCrc32, 4); - memcpy(gzip_footer + 4, zmap + a->lf + kZipLfileOffsetUncompressedsize, - 4); + p = ServeAssetPrecompressed(a); + } else if (msg.version >= 11 && HasHeader(kHttpRange)) { + p = ServeAssetRange(a); + } else if (!a->file) { + LockInc(&shared->identityresponses); + DEBUGF("ServeAssetZipIdentity(%`'s)", ct); + if (Verify(content, contentlength, ZIP_LFILE_CRC32(zmap + a->lf))) { p = SetStatus(200, "OK"); - p = AppendHeader(p, "Content-Encoding", "gzip"); } else { - CHECK(Inflate( - (content = - FreeLater(xmalloc(ZIP_LFILE_UNCOMPRESSEDSIZE(zmap + a->lf)))), - (contentlength = ZIP_LFILE_UNCOMPRESSEDSIZE(zmap + a->lf)), - ZIP_LFILE_CONTENT(zmap + a->lf), - ZIP_LFILE_COMPRESSEDSIZE(zmap + a->lf))); - p = SetStatus(200, "OK"); - } - } else if (httpversion >= 101 && HasHeader(kHttpRange)) { - if (ParseHttpRange(inbuf.p + msg.headers[kHttpRange].a, - msg.headers[kHttpRange].b - msg.headers[kHttpRange].a, - contentlength, &rangestart, &rangelength)) { - LOGF("rangestart = %ld rangelength = %ld", rangestart, rangelength); - p = SetStatus(206, "Partial Content"); - p = AppendContentRange(p, rangestart, rangelength, contentlength); - content = AddRange(content, rangestart, rangelength); - contentlength = rangelength; - } else { - WARNF("%s %s %`'.*s bad range %`'.*s", clientaddrstr, - kHttpMethod[msg.method], pathlen, path, - msg.headers[kHttpRange].b - msg.headers[kHttpRange].a, - inbuf.p + msg.headers[kHttpRange].a); - p = SetStatus(416, "Range Not Satisfiable"); - p = AppendContentRange(p, rangestart, rangelength, contentlength); - content = ""; - contentlength = 0; + return ServeError(500, "Internal Server Error"); } + } else if (ClientAcceptsGzip() && + (strlen(ct) >= 5 && !memcasecmp(ct, "text/", 5)) && + contentlength < 1024 * 1024 * 1024) { + p = ServeAssetCompressed(a); } else { + LockInc(&shared->identityresponses); + DEBUGF("ServeAssetIdentity(%`'s)", ct); p = SetStatus(200, "OK"); } } - if (httpversion >= 100) { - p = AppendHeader(p, "Last-Modified", a->lastmodifiedstr); - p = AppendContentType(p, GetContentType(a, path, pathlen)); - if (httpversion >= 101) { - p = AppendCache(p, cacheseconds); - if (!IsCompressed(a)) { - p = AppendHeader(p, "Accept-Ranges", "bytes"); - } else { - p = AppendHeader(p, "Vary", "Accept-Encoding"); - } + p = AppendContentType(p, ct); + p = stpcpy(p, "Vary: Accept-Encoding\r\n"); + p = AppendHeader(p, "Last-Modified", a->lastmodifiedstr); + if (msg.version >= 11) { + p = AppendCache(p, cacheseconds); + if (!IsCompressed(a)) { + p = stpcpy(p, "Accept-Ranges: bytes\r\n"); } } return p; } -static void AppendData(const char *data, size_t size) { - outbuf.p = xrealloc(outbuf.p, outbuf.n + size); - memcpy(outbuf.p + outbuf.n, data, size); - outbuf.n += size; -} - -static void AppendString(const char *s) { - AppendData(s, strlen(s)); -} - -static void AppendFmt(const char *fmt, ...) { - int size; - char *data; - va_list va; - data = NULL; - va_start(va, fmt); - CHECK_NE(-1, (size = vasprintf(&data, fmt, va))); - va_end(va); - AppendData(data, size); - free(data); -} - -static char *CommitOutput(char *p) { - if (istext && outbuf.n >= 100 && ClientAcceptsGzip()) { - gzipped = true; - p = AppendHeader(p, "Content-Encoding", "gzip"); - p = AppendHeader(p, "Vary", "Accept-Encoding"); - WRITE32LE(gzip_footer + 0, crc32_z(0, outbuf.p, outbuf.n)); - WRITE32LE(gzip_footer + 4, outbuf.n); - content = FreeLater(Deflate(outbuf.p, outbuf.n, &contentlength)); - } else { - content = outbuf.p; - contentlength = outbuf.n; - } - return p; -} - -static char *GetAssetPath(uint32_t cf, size_t *out_size) { +static char *GetAssetPath(uint64_t cf, size_t *out_size) { char *p1, *p2; size_t n1, n2; p1 = ZIP_CFILE_NAME(zmap + cf); n1 = ZIP_CFILE_NAMESIZE(zmap + cf); - p2 = malloc(1 + n1 + 1); + p2 = xmalloc(1 + n1 + 1); n2 = 1 + n1 + 1; p2[0] = '/'; memcpy(p2 + 1, p1, n1); @@ -1461,26 +1962,626 @@ static bool IsHiddenPath(const char *s) { return false; } +static char *GetBasicAuthorization(size_t *z) { + size_t n; + const char *p, *q; + p = inbuf.p + msg.headers[kHttpAuthorization].a; + n = msg.headers[kHttpAuthorization].b - msg.headers[kHttpAuthorization].a; + if ((q = memchr(p, ' ', n)) && SlicesEqualCase(p, q - p, "Basic", 5)) { + return DecodeBase64(q + 1, n - (q + 1 - p), z); + } else { + return NULL; + } +} + +static void LaunchBrowser() { + char openbrowsercommand[255]; + char *prog; + if (IsWindows()) { + prog = "explorer"; + } else if (IsXnu()) { + prog = "open"; + } else { + prog = "xdg-open"; + } + struct in_addr addr = serveraddr.sin_addr; + if (addr.s_addr == INADDR_ANY) addr.s_addr = htonl(INADDR_LOOPBACK); + snprintf(openbrowsercommand, sizeof(openbrowsercommand), "%s http://%s:%d", + prog, inet_ntoa(addr), ntohs(serveraddr.sin_port)); + DEBUGF("Opening browser with command %s\n", openbrowsercommand); + system(openbrowsercommand); +} + +static char *BadMethod(void) { + LockInc(&shared->badmethods); + return stpcpy(ServeError(405, "Method Not Allowed"), "Allow: GET, HEAD\r\n"); +} + +static int GetDecimalWidth(int x) { + int w = x ? ceil(log10(x)) : 1; + return w + (w - 1) / 3; +} + +static int GetOctalWidth(int x) { + return !x ? 1 : x < 8 ? 2 : 1 + bsr(x) / 3; +} + +static const char *DescribeCompressionRatio(char rb[8], uint64_t lf) { + long percent; + if (ZIP_LFILE_COMPRESSIONMETHOD(zmap + lf) == kZipCompressionNone) { + return "n/a"; + } else { + percent = lround(100 - (double)GetZipLfileCompressedSize(zmap + lf) / + GetZipLfileUncompressedSize(zmap + lf) * 100); + sprintf(rb, "%ld%%", MIN(999, MAX(-999, percent))); + return rb; + } +} + +static char *ServeListing(void) { + long x; + ldiv_t y; + int w[3]; + struct tm tm; + const char *and; + int64_t lastmod; + uint64_t cf, lf; + struct rusage ru; + char *p, *q, *path; + char rb[8], tb[64], *rp[6]; + size_t i, n, pathlen, rn[6]; + LockInc(&shared->listingrequests); + if (msg.method != kHttpGet && msg.method != kHttpHead) return BadMethod(); + Append("\ +\r\n\ +\r\n\ +redbean zip listing\r\n\ +\r\n\ +

\r\n"); + AppendLogo(); + rp[0] = EscapeHtml(brand, -1, &rn[0]); + AppendData(rp[0], rn[0]); + free(rp[0]); + Append("

\r\n" + "
%.*s
\r\n" + "
\r\n" + "
\r\n" + "
\r\n",
+         strnlen(GetZipCdirComment(cdir), GetZipCdirCommentSize(cdir)),
+         GetZipCdirComment(cdir));
+  memset(w, 0, sizeof(w));
+  n = GetZipCdirRecords(cdir);
+  for (cf = GetZipCdirOffset(cdir); n--; cf += ZIP_CFILE_HDRSIZE(zmap + cf)) {
+    CHECK_EQ(kZipCfileHdrMagic, ZIP_CFILE_MAGIC(zmap + cf));
+    lf = GetZipCfileOffset(zmap + cf);
+    path = GetAssetPath(cf, &pathlen);
+    if (!IsHiddenPath(path)) {
+      w[0] = min(80, max(w[0], strwidth(path, 0) + 2));
+      w[1] = max(w[1], GetOctalWidth(GetZipCfileMode(zmap + cf)));
+      w[2] = max(w[2], GetDecimalWidth(GetZipLfileUncompressedSize(zmap + lf)));
+    }
+    free(path);
+  }
+  n = GetZipCdirRecords(cdir);
+  for (cf = GetZipCdirOffset(cdir); n--; cf += ZIP_CFILE_HDRSIZE(zmap + cf)) {
+    CHECK_EQ(kZipCfileHdrMagic, ZIP_CFILE_MAGIC(zmap + cf));
+    lf = GetZipCfileOffset(zmap + cf);
+    path = GetAssetPath(cf, &pathlen);
+    if (!IsHiddenPath(path)) {
+      rp[0] = VisualizeControlCodes(path, pathlen, &rn[0]);
+      rp[1] = EscapePath(path, pathlen, &rn[1]);
+      rp[2] = EscapeHtml(rp[1], rn[1], &rn[2]);
+      rp[3] = VisualizeControlCodes(ZIP_CFILE_COMMENT(zmap + cf),
+                                    strnlen(ZIP_CFILE_COMMENT(zmap + cf),
+                                            ZIP_CFILE_COMMENTSIZE(zmap + cf)),
+                                    &rn[3]);
+      rp[4] = EscapeHtml(rp[0], rn[0], &rn[4]);
+      lastmod = GetZipCfileLastModified(zmap + cf);
+      localtime_r(&lastmod, &tm);
+      strftime(tb, sizeof(tb), "%Y-%m-%d %H:%M:%S %Z", &tm);
+      if (IsCompressionMethodSupported(
+              ZIP_LFILE_COMPRESSIONMETHOD(zmap + lf)) &&
+          IsAcceptablePath(path, pathlen)) {
+        Append("%-*.*s %s  %0*o %4s  %,*ld  %'s\r\n",
+               rn[2], rp[2], w[0], rn[4], rp[4], tb, w[1],
+               GetZipCfileMode(zmap + cf), DescribeCompressionRatio(rb, lf),
+               w[2], GetZipLfileUncompressedSize(zmap + lf), rp[3]);
+      } else {
+        Append("%-*.*s %s  %0*o %4s  %,*ld  %'s\r\n", w[0], rn[4], rp[4], tb,
+               w[1], GetZipCfileMode(zmap + cf),
+               DescribeCompressionRatio(rb, lf), w[2],
+               GetZipLfileUncompressedSize(zmap + lf), rp[3]);
+      }
+      free(rp[4]);
+      free(rp[3]);
+      free(rp[2]);
+      free(rp[1]);
+      free(rp[0]);
+    }
+    free(path);
+  }
+  Append("
\r\n"); + Append("\r\n"); + Append("
\r\n"); + Append("/statusz\r\n"); + if (shared->connectionshandled) { + Append("says your redbean
\r\n"); + AppendResourceReport(&shared->children, "
\r\n"); + } + Append("		\r\n"); + and = ""; + x = nowl() - startserver; + y = ldiv(x, 24L * 60 * 60); + if (y.quot) { + Append("%,ld day%s ", y.quot, y.quot == 1 ? "" : "s"); + and = "and "; + } + y = ldiv(y.rem, 60 * 60); + if (y.quot) { + Append("%,ld hour%s ", y.quot, y.quot == 1 ? "" : "s"); + and = "and "; + } + y = ldiv(y.rem, 60); + if (y.quot) { + Append("%,ld minute%s ", y.quot, y.quot == 1 ? "" : "s"); + and = "and "; + } + Append("%s%,ld second%s of operation
\r\n", and, y.rem, + y.rem == 1 ? "" : "s"); + x = shared->messageshandled; + Append("%,ld message%s handled
\r\n", x, x == 1 ? "" : "s"); + x = shared->connectionshandled; + Append("%,ld connection%s handled
\r\n", x, x == 1 ? "" : "s"); + x = shared->workers; + Append("%,ld connection%s active
\r\n", x, x == 1 ? "" : "s"); + Append("
\r\n"); + Append("
\r\n"); + p = SetStatus(200, "OK"); + p = AppendContentType(p, "text/html"); + p = AppendCache(p, 0); + return CommitOutput(p); +} + +static const char *MergeNames(const char *a, const char *b) { + return FreeLater(xasprintf("%s.ru_utime", a)); +} + +static void AppendLong1(const char *a, long x) { + if (x) Append("%s: %ld\r\n", a, x); +} + +static void AppendLong2(const char *a, const char *b, long x) { + if (x) Append("%s.%s: %ld\r\n", a, b, x); +} + +static void AppendTimeval(const char *a, struct timeval *tv) { + AppendLong2(a, "tv_sec", tv->tv_sec); + AppendLong2(a, "tv_usec", tv->tv_usec); +} + +static void AppendRusage(const char *a, struct rusage *ru) { + AppendTimeval(MergeNames(a, "ru_utime"), &ru->ru_utime); + AppendTimeval(MergeNames(a, "ru_stime"), &ru->ru_stime); + AppendLong2(a, "ru_maxrss", ru->ru_maxrss); + AppendLong2(a, "ru_ixrss", ru->ru_ixrss); + AppendLong2(a, "ru_idrss", ru->ru_idrss); + AppendLong2(a, "ru_isrss", ru->ru_isrss); + AppendLong2(a, "ru_minflt", ru->ru_minflt); + AppendLong2(a, "ru_majflt", ru->ru_majflt); + AppendLong2(a, "ru_nswap", ru->ru_nswap); + AppendLong2(a, "ru_inblock", ru->ru_inblock); + AppendLong2(a, "ru_oublock", ru->ru_oublock); + AppendLong2(a, "ru_msgsnd", ru->ru_msgsnd); + AppendLong2(a, "ru_msgrcv", ru->ru_msgrcv); + AppendLong2(a, "ru_nsignals", ru->ru_nsignals); + AppendLong2(a, "ru_nvcsw", ru->ru_nvcsw); + AppendLong2(a, "ru_nivcsw", ru->ru_nivcsw); +} + +static char *ServeStatusz(void) { + char *p; + LockInc(&shared->statuszrequests); + if (msg.method != kHttpGet && msg.method != kHttpHead) return BadMethod(); + AppendLong1("pid", getpid()); + AppendLong1("ppid", getppid()); + AppendLong1("now", nowl()); + AppendLong1("nowish", shared->nowish); + AppendLong1("heartless", heartless); + AppendLong1("gmtoff", gmtoff); + AppendLong1("CLK_TCK", CLK_TCK); + AppendLong1("startserver", startserver); + AppendLong1("lastmeltdown", shared->lastmeltdown); + AppendLong1("workers", shared->workers); + AppendLong1("assets.n", assets.n); + AppendLong1("accepterrors", shared->accepterrors); + AppendLong1("acceptinterrupts", shared->acceptinterrupts); + AppendLong1("acceptresets", shared->acceptresets); + AppendLong1("badlengths", shared->badlengths); + AppendLong1("badmessages", shared->badmessages); + AppendLong1("badmethods", shared->badmethods); + AppendLong1("badranges", shared->badranges); + AppendLong1("closeerrors", shared->closeerrors); + AppendLong1("compressedresponses", shared->compressedresponses); + AppendLong1("connectionshandled", shared->connectionshandled); + AppendLong1("connectsrefused", shared->connectsrefused); + AppendLong1("continues", shared->continues); + AppendLong1("decompressedresponses", shared->decompressedresponses); + AppendLong1("deflates", shared->deflates); + AppendLong1("dropped", shared->dropped); + AppendLong1("dynamicrequests", shared->dynamicrequests); + AppendLong1("emfiles", shared->emfiles); + AppendLong1("enetdowns", shared->enetdowns); + AppendLong1("enfiles", shared->enfiles); + AppendLong1("enobufs", shared->enobufs); + AppendLong1("enomems", shared->enomems); + AppendLong1("enonets", shared->enonets); + AppendLong1("errors", shared->errors); + AppendLong1("expectsrefused", shared->expectsrefused); + AppendLong1("failedchildren", shared->failedchildren); + AppendLong1("forbiddens", shared->forbiddens); + AppendLong1("forkerrors", shared->forkerrors); + AppendLong1("frags", shared->frags); + AppendLong1("fumbles", shared->fumbles); + AppendLong1("http09", shared->http09); + AppendLong1("http10", shared->http10); + AppendLong1("http11", shared->http11); + AppendLong1("http12", shared->http12); + AppendLong1("hugepayloads", shared->hugepayloads); + AppendLong1("identityresponses", shared->identityresponses); + AppendLong1("inflates", shared->inflates); + AppendLong1("listingrequests", shared->listingrequests); + AppendLong1("loops", shared->loops); + AppendLong1("mapfails", shared->mapfails); + AppendLong1("maps", shared->maps); + AppendLong1("meltdowns", shared->meltdowns); + AppendLong1("messageshandled", shared->messageshandled); + AppendLong1("missinglengths", shared->missinglengths); + AppendLong1("netafrinic", shared->netafrinic); + AppendLong1("netanonymous", shared->netanonymous); + AppendLong1("netapnic", shared->netapnic); + AppendLong1("netapple", shared->netapple); + AppendLong1("netarin", shared->netarin); + AppendLong1("netatt", shared->netatt); + AppendLong1("netcogent", shared->netcogent); + AppendLong1("netcomcast", shared->netcomcast); + AppendLong1("netdod", shared->netdod); + AppendLong1("netford", shared->netford); + AppendLong1("netlacnic", shared->netlacnic); + AppendLong1("netloopback", shared->netloopback); + AppendLong1("netother", shared->netother); + AppendLong1("netprivate", shared->netprivate); + AppendLong1("netprudential", shared->netprudential); + AppendLong1("netripe", shared->netripe); + AppendLong1("nettestnet", shared->nettestnet); + AppendLong1("netusps", shared->netusps); + AppendLong1("notfounds", shared->notfounds); + AppendLong1("notmodifieds", shared->notmodifieds); + AppendLong1("openfails", shared->openfails); + AppendLong1("partialresponses", shared->partialresponses); + AppendLong1("payloaddisconnects", shared->payloaddisconnects); + AppendLong1("pipelinedrequests", shared->pipelinedrequests); + AppendLong1("precompressedresponses", shared->precompressedresponses); + AppendLong1("readerrors", shared->readerrors); + AppendLong1("readinterrupts", shared->readinterrupts); + AppendLong1("readresets", shared->readresets); + AppendLong1("readtimeouts", shared->readtimeouts); + AppendLong1("redirects", shared->redirects); + AppendLong1("reloads", shared->reloads); + AppendLong1("rewrites", shared->rewrites); + AppendLong1("serveroptions", shared->serveroptions); + AppendLong1("shutdowns", shared->shutdowns); + AppendLong1("slowloris", shared->slowloris); + AppendLong1("slurps", shared->slurps); + AppendLong1("statfails", shared->statfails); + AppendLong1("staticrequests", shared->staticrequests); + AppendLong1("stats", shared->stats); + AppendLong1("statuszrequests", shared->statuszrequests); + AppendLong1("synchronizationfailures", shared->synchronizationfailures); + AppendLong1("terminatedchildren", shared->terminatedchildren); + AppendLong1("thiscorruption", shared->thiscorruption); + AppendLong1("transfersrefused", shared->transfersrefused); + AppendLong1("urisrefused", shared->urisrefused); + AppendLong1("verifies", shared->verifies); + AppendLong1("writeerrors", shared->writeerrors); + AppendLong1("writeinterruputs", shared->writeinterruputs); + AppendLong1("writeresets", shared->writeresets); + AppendLong1("writetimeouts", shared->writetimeouts); + AppendRusage("server", &shared->server); + AppendRusage("children", &shared->children); + p = SetStatus(200, "OK"); + p = AppendContentType(p, "text/plain"); + p = AppendCache(p, 0); + return CommitOutput(p); +} + +static char *RedirectSlash(void) { + size_t n; + char *p, *e; + LockInc(&shared->redirects); + p = SetStatus(307, "Temporary Redirect"); + p = stpcpy(p, "Location: "); + e = EscapePath(url.path.p, url.path.n, &n); + p = mempcpy(p, e, n); + p = stpcpy(p, "/\r\n"); + free(e); + return p; +} + +static char *RoutePath(const char *, size_t); +static char *ServeIndex(const char *path, size_t pathlen) { + size_t i, n; + char *p, *q; + p = NULL; + for (i = 0; !p && i < ARRAYLEN(kIndexPaths); ++i) { + q = MergePaths(path, pathlen, kIndexPaths[i], strlen(kIndexPaths[i]), &n); + p = RoutePath(q, n); + free(q); + } + return p; +} + +static bool IsLua(struct Asset *a) { + if (a->file) return endswith(a->file->path, ".lua"); + return ZIP_LFILE_NAMESIZE(zmap + a->lf) >= 4 && + !memcmp(ZIP_LFILE_NAME(zmap + a->lf) + + ZIP_LFILE_NAMESIZE(zmap + a->lf) - 4, + ".lua", 4); +} + +static char *GetLuaResponse(void) { + char *p; + if (!(p = luaheaderp)) { + p = SetStatus(200, "OK"); + p = AppendContentType(p, "text/html"); + } + return p; +} + +static char *ServeLua(struct Asset *a, const char *path, size_t pathlen) { + char *code; + effectivepath.p = path; + effectivepath.n = pathlen; + if ((code = FreeLater(LoadAsset(a, NULL)))) { + if (luaL_dostring(L, code) == LUA_OK) { + return CommitOutput(GetLuaResponse()); + } else { + WARNF("%s", lua_tostring(L, -1)); + lua_pop(L, 1); + } + } + return ServeError(500, "Internal Server Error"); +} + +static char *HandleAsset(struct Asset *a, const char *path, size_t pathlen) { +#ifndef STATIC + if (IsLua(a)) { + LockInc(&shared->dynamicrequests); + return ServeLua(a, path, pathlen); + } +#endif + if (msg.method == kHttpGet || msg.method == kHttpHead) { + LockInc(&shared->staticrequests); + return stpcpy(ServeAsset(a, path, pathlen), + "X-Content-Type-Options: nosniff\r\n"); + } else { + return BadMethod(); + } +} + +static char *HandleRedirect(struct Redirect *r) { + int code; + struct Asset *a; + if (!r->code && (a = GetAsset(r->location, strlen(r->location)))) { + LockInc(&shared->rewrites); + DEBUGF("rewriting to %`'s", r->location); + if (!HasString(&loops, r->location)) { + AddString(&loops, r->location); + return RoutePath(r->location, strlen(r->location)); + } else { + LockInc(&shared->loops); + return SetStatus(508, "Loop Detected"); + } + } else if (msg.version < 10) { + return ServeError(505, "HTTP Version Not Supported"); + } else { + LockInc(&shared->redirects); + code = r->code; + if (!code) code = 307; + DEBUGF("%d redirecting %`'s", code, r->location); + return AppendHeader(SetStatus(code, GetHttpReason(code)), "Location", + FreeLater(EncodeHttpHeaderValue(r->location, -1, 0))); + } +} + +static char *HandleFolder(const char *path, size_t pathlen) { + char *p; + if (url.path.n && url.path.p[url.path.n - 1] != '/' && + SlicesEqual(path, pathlen, url.path.p, url.path.n)) { + return RedirectSlash(); + } + if ((p = ServeIndex(path, pathlen))) { + return p; + } else { + LockInc(&shared->forbiddens); + LOGF("directory %`'.*s lacks index page", pathlen, path); + return ServeError(403, "Forbidden"); + } +} + +static char *RoutePath(const char *path, size_t pathlen) { + int m; + long r; + char *p; + struct Asset *a; + DEBUGF("RoutePath(%`'.*s)", pathlen, path); + if ((a = GetAsset(path, pathlen))) { + if ((m = GetMode(a)) & 0004) { + if (!S_ISDIR(m)) { + return HandleAsset(a, path, pathlen); + } else { + return HandleFolder(path, pathlen); + } + } else { + LockInc(&shared->forbiddens); + LOGF("asset %`'.*s %#o isn't readable", pathlen, path, m); + return ServeError(403, "Forbidden"); + } + } else if ((r = FindRedirect(path, pathlen)) != -1) { + return HandleRedirect(redirects.p + r); + } else { + return NULL; + } +} + +static char *RouteHost(const char *host, size_t hostlen, const char *path, + size_t pathlen) { + size_t hn; + char *hp, *p; + hn = 1 + hostlen + url.path.n; + hp = FreeLater(xmalloc(3 + 1 + hn)); + hp[0] = '/'; + mempcpy(mempcpy(hp + 1, host, hostlen), path, pathlen); + if ((p = RoutePath(hp, hn))) return p; + if (ParseIp(host, hostlen) == -1) { + if (hostlen > 4 && !memcmp(host, "www.", 4)) { + mempcpy(mempcpy(hp + 1, host + 4, hostlen - 4), path, pathlen); + if ((p = RoutePath(hp, hn - 4))) return p; + } else { + mempcpy(mempcpy(mempcpy(hp + 1, "www.", 4), host, hostlen), path, + pathlen); + if ((p = RoutePath(hp, hn + 4))) return p; + } + } + return NULL; +} + +static char *Route(const char *host, size_t hostlen, const char *path, + size_t pathlen) { + char *p; + if (hostlen && (p = RouteHost(host, hostlen, path, pathlen))) { + return p; + } + if (SlicesEqual(path, pathlen, "/", 1)) { + if ((p = ServeIndex("/", 1))) return p; + return ServeListing(); + } else if ((p = RoutePath(path, pathlen))) { + return p; + } else if (SlicesEqual(path, pathlen, "/statusz", 8)) { + return ServeStatusz(); + } else { + LockInc(&shared->notfounds); + return ServeError(404, "Not Found"); + } +} + +static const char *LuaCheckPath(lua_State *L, int idx, size_t *pathlen) { + const char *path; + if (lua_isnoneornil(L, idx)) { + path = url.path.p; + *pathlen = url.path.n; + } else { + path = luaL_checklstring(L, idx, pathlen); + if (!IsReasonablePath(path, *pathlen)) { + WARNF("bad path %`'.*s", *pathlen, path); + luaL_argerror(L, idx, "bad path"); + unreachable; + } + } + return path; +} + +static const char *LuaCheckHost(lua_State *L, int idx, size_t *hostlen) { + const char *host; + if (lua_isnoneornil(L, idx)) { + host = url.host.p; + *hostlen = url.host.n; + } else { + host = luaL_checklstring(L, idx, hostlen); + if (!IsAcceptableHost(host, *hostlen)) { + WARNF("bad host %`'.*s", *hostlen, host); + luaL_argerror(L, idx, "bad host"); + unreachable; + } + } + return host; +} + +static int LuaServeListing(lua_State *L) { + luaheaderp = ServeListing(); + return 0; +} + +static int LuaServeStatusz(lua_State *L) { + luaheaderp = ServeStatusz(); + return 0; +} + static int LuaServeAsset(lua_State *L) { size_t pathlen; struct Asset *a; const char *path; - path = luaL_checklstring(L, 1, &pathlen); - if (!(a = LocateAsset(path, pathlen))) { - return luaL_argerror(L, 1, "not found"); + path = LuaCheckPath(L, 1, &pathlen); + if ((a = GetAsset(path, pathlen)) && !S_ISDIR(GetMode(a))) { + luaheaderp = ServeAsset(a, path, pathlen); + lua_pushboolean(L, true); + } else { + lua_pushboolean(L, false); } - luaheaderp = ServeAsset(a, path, pathlen); - return 0; + return 1; } -static int LuaRespond(lua_State *L, char *respond(int, const char *)) { +static int LuaServeIndex(lua_State *L) { + size_t pathlen; + const char *path; + path = LuaCheckPath(L, 1, &pathlen); + lua_pushboolean(L, !!(luaheaderp = ServeIndex(path, pathlen))); + return 1; +} + +static int LuaRoutePath(lua_State *L) { + size_t pathlen; + const char *path; + path = LuaCheckPath(L, 1, &pathlen); + lua_pushboolean(L, !!(luaheaderp = RoutePath(path, pathlen))); + return 1; +} + +static int LuaRouteHost(lua_State *L) { + size_t hostlen, pathlen; + const char *host, *path; + host = LuaCheckHost(L, 1, &hostlen); + path = LuaCheckPath(L, 2, &pathlen); + lua_pushboolean(L, !!(luaheaderp = RouteHost(host, hostlen, path, pathlen))); + return 1; +} + +static int LuaRoute(lua_State *L) { + size_t hostlen, pathlen; + const char *host, *path; + host = LuaCheckHost(L, 1, &hostlen); + path = LuaCheckPath(L, 2, &pathlen); + lua_pushboolean(L, !!(luaheaderp = Route(host, hostlen, path, pathlen))); + return 1; +} + +static int LuaRespond(lua_State *L, char *respond(unsigned, const char *)) { char *p; int code; size_t reasonlen; const char *reason; code = luaL_checkinteger(L, 1); if (!(100 <= code && code <= 999)) { - return luaL_argerror(L, 1, "bad status code"); + luaL_argerror(L, 1, "bad status code"); + unreachable; } if (lua_isnoneornil(L, 2)) { luaheaderp = respond(code, GetHttpReason(code)); @@ -1490,7 +2591,8 @@ static int LuaRespond(lua_State *L, char *respond(int, const char *)) { luaheaderp = respond(code, p); free(p); } else { - return luaL_argerror(L, 2, "invalid"); + luaL_argerror(L, 2, "invalid"); + unreachable; } } return 0; @@ -1505,51 +2607,194 @@ static int LuaServeError(lua_State *L) { } static int LuaLoadAsset(lua_State *L) { - char *data; + void *data; struct Asset *a; const char *path; size_t size, pathlen; - path = luaL_checklstring(L, 1, &pathlen); - if ((a = LocateAsset(path, pathlen))) { - data = LoadAsset(a, &size); - lua_pushlstring(L, data, size); - free(data); + path = LuaCheckPath(L, 1, &pathlen); + if ((a = GetAsset(path, pathlen))) { + if (!a->file && !IsCompressed(a)) { + /* fast path: this avoids extra copy */ + data = ZIP_LFILE_CONTENT(zmap + a->lf); + size = GetZipLfileUncompressedSize(zmap + a->lf); + if (Verify(data, size, ZIP_LFILE_CRC32(zmap + a->lf))) { + lua_pushlstring(L, data, size); + return 1; + } + } else if ((data = LoadAsset(a, &size))) { + lua_pushlstring(L, data, size); + free(data); + return 1; + } + } + return 0; +} + +static int LuaGetDate(lua_State *L) { + lua_pushinteger(L, shared->nowish); + return 1; +} + +static int LuaGetVersion(lua_State *L) { + lua_pushinteger(L, msg.version); + return 1; +} + +static int LuaGetMethod(lua_State *L) { + if (msg.method) { + lua_pushstring(L, kHttpMethod[msg.method]); + } else { + lua_pushlstring(L, inbuf.p + msg.xmethod.a, msg.xmethod.b - msg.xmethod.a); + } + return 1; +} + +static int LuaGetAddr(lua_State *L, void GetAddr(uint32_t *, uint16_t *)) { + uint32_t ip; + uint16_t port; + GetAddr(&ip, &port); + lua_pushinteger(L, ip); + lua_pushinteger(L, port); + return 2; +} + +static int LuaGetServerAddr(lua_State *L) { + return LuaGetAddr(L, GetServerAddr); +} + +static int LuaGetClientAddr(lua_State *L) { + return LuaGetAddr(L, GetClientAddr); +} + +static int LuaGetRemoteAddr(lua_State *L) { + return LuaGetAddr(L, GetRemoteAddr); +} + +static int LuaFormatIp(lua_State *L) { + char b[16]; + uint32_t ip; + ip = htonl(luaL_checkinteger(L, 1)); + inet_ntop(AF_INET, &ip, b, sizeof(b)); + lua_pushstring(L, b); + return 1; +} + +static int LuaParseIp(lua_State *L) { + size_t n; + const char *s; + s = luaL_checklstring(L, 1, &n); + lua_pushinteger(L, ParseIp(s, n)); + return 1; +} + +static int LuaIsIp(lua_State *L, bool IsIp(uint32_t)) { + lua_pushboolean(L, IsIp(luaL_checkinteger(L, 1))); + return 1; +} + +static int LuaIsPublicIp(lua_State *L) { + return LuaIsIp(L, IsPublicIp); +} + +static int LuaIsPrivateIp(lua_State *L) { + return LuaIsIp(L, IsPrivateIp); +} + +static int LuaIsLoopbackIp(lua_State *L) { + return LuaIsIp(L, IsLoopbackIp); +} + +static int LuaCategorizeIp(lua_State *L) { + lua_pushstring(L, GetIpCategoryName(CategorizeIp(luaL_checkinteger(L, 1)))); + return 1; +} + +static int LuaGetUrl(lua_State *L) { + char *p; + size_t n; + p = EncodeUrl(&url, &n); + lua_pushlstring(L, p, n); + free(p); + return 1; +} + +static void LuaPushUrlView(lua_State *L, struct UrlView *v) { + if (v->p) { + lua_pushlstring(L, v->p, v->n); + } else { + lua_pushnil(L); + } +} + +static int LuaGetScheme(lua_State *L) { + LuaPushUrlView(L, &url.scheme); + return 1; +} + +static int LuaGetPath(lua_State *L) { + LuaPushUrlView(L, &url.path); + return 1; +} + +static int LuaGetEffectivePath(lua_State *L) { + lua_pushlstring(L, effectivepath.p, effectivepath.n); + return 1; +} + +static int LuaGetFragment(lua_State *L) { + LuaPushUrlView(L, &url.fragment); + return 1; +} + +static int LuaGetUser(lua_State *L) { + size_t n; + const char *p, *q; + if (url.user.p) { + LuaPushUrlView(L, &url.user); + } else if ((p = GetBasicAuthorization(&n))) { + if (!(q = memchr(p, ':', n))) q = p + n; + lua_pushlstring(L, p, q - p); + free(p); } else { lua_pushnil(L); } return 1; } -static int LuaGetDate(lua_State *L) { - lua_pushinteger(L, nowish); +static int LuaGetPass(lua_State *L) { + size_t n; + const char *p, *q; + if (url.user.p) { + LuaPushUrlView(L, &url.pass); + } else if ((p = GetBasicAuthorization(&n))) { + if ((q = memchr(p, ':', n))) { + lua_pushlstring(L, q + 1, p + n - (q + 1)); + } else { + lua_pushnil(L); + } + free(p); + } else { + lua_pushnil(L); + } return 1; } -static int LuaGetVersion(lua_State *L) { - lua_pushinteger(L, httpversion); +static int LuaGetHost(lua_State *L) { + char b[16]; + if (url.host.n) { + lua_pushlstring(L, url.host.p, url.host.n); + } else { + inet_ntop(AF_INET, &serveraddr.sin_addr.s_addr, b, sizeof(b)); + lua_pushstring(L, b); + } return 1; } -static int LuaGetMethod(lua_State *L) { - lua_pushstring(L, kHttpMethod[msg.method]); - return 1; -} - -static int LuaGetPath(lua_State *L) { - lua_pushlstring(L, request.path.p, request.path.n); - return 1; -} - -static void LuaPushLatin1(lua_State *L, const char *s, size_t n) { - char *t; - size_t m; - t = DecodeLatin1(s, n, &m); - lua_pushlstring(L, t, m); - free(t); -} - -static int LuaGetUri(lua_State *L) { - LuaPushLatin1(L, inbuf.p + msg.uri.a, msg.uri.b - msg.uri.a); +static int LuaGetPort(lua_State *L) { + int i, x = 0; + for (i = 0; i < url.port.n; ++i) x = url.port.p[i] - '0' + x * 10; + if (!x) x = ntohs(serveraddr.sin_port); + lua_pushinteger(L, x); return 1; } @@ -1567,40 +2812,68 @@ static int LuaParseHttpDateTime(lua_State *L) { return 1; } -static int LuaGetClientAddr(lua_State *L) { - lua_pushstring(L, clientaddrstr); - return 1; -} - -static int LuaGetServerAddr(lua_State *L) { - lua_pushstring(L, serveraddrstr); - return 1; -} - static int LuaGetPayload(lua_State *L) { lua_pushlstring(L, inbuf.p + hdrsize, msgsize - hdrsize); return 1; } -static int LuaGetHeader(lua_State *L) { - int h; - const char *key; - size_t i, keylen; - key = luaL_checklstring(L, 1, &keylen); - if ((h = GetHttpHeader(key, keylen)) != -1) { - LuaPushLatin1(L, inbuf.p + msg.headers[h].a, - msg.headers[h].b - msg.headers[h].a); - return 1; - } +static void LuaPushLatin1(lua_State *L, const char *s, size_t n) { + char *t; + size_t m; + t = DecodeLatin1(s, n, &m); + lua_pushlstring(L, t, m); + free(t); +} + +static char *FoldHeader(int h, size_t *z) { + char *p; + size_t i, n, m; + struct HttpRequestHeader *x; + n = msg.headers[h].b - msg.headers[h].a; + p = xmalloc(n); + memcpy(p, inbuf.p + msg.headers[h].a, n); for (i = 0; i < msg.xheaders.n; ++i) { - if (!CompareSlicesCase(key, keylen, inbuf.p + msg.xheaders.p[i].k.a, - msg.xheaders.p[i].k.b - msg.xheaders.p[i].k.a)) { - LuaPushLatin1(L, inbuf.p + msg.xheaders.p[i].v.a, - msg.xheaders.p[i].v.b - msg.xheaders.p[i].v.a); - return 1; + x = msg.xheaders.p + i; + if (GetHttpHeader(inbuf.p + x->k.a, x->k.b - x->k.a) == h) { + m = x->v.b - x->v.a; + p = xrealloc(p, n + 2 + m); + memcpy(mempcpy(p + n, ", ", 2), inbuf.p + x->v.a, m); + n += 2 + m; } } - lua_pushstring(L, ""); + *z = n; + return p; +} + +static int LuaGetHeader(lua_State *L) { + int h; + char *val; + const char *key; + size_t i, keylen, vallen; + key = luaL_checklstring(L, 1, &keylen); + if ((h = GetHttpHeader(key, keylen)) != -1) { + if (msg.headers[h].a) { + if (!kHttpRepeatable[h]) { + LuaPushLatin1(L, inbuf.p + msg.headers[h].a, + msg.headers[h].b - msg.headers[h].a); + } else { + val = FoldHeader(h, &vallen); + LuaPushLatin1(L, val, vallen); + free(val); + } + return 1; + } + } else { + for (i = 0; i < msg.xheaders.n; ++i) { + if (SlicesEqualCase(key, keylen, inbuf.p + msg.xheaders.p[i].k.a, + msg.xheaders.p[i].k.b - msg.xheaders.p[i].k.a)) { + LuaPushLatin1(L, inbuf.p + msg.xheaders.p[i].v.a, + msg.xheaders.p[i].v.b - msg.xheaders.p[i].v.a); + return 1; + } + } + } + lua_pushnil(L); return 1; } @@ -1609,7 +2882,7 @@ static int LuaGetHeaders(lua_State *L) { char *name; lua_newtable(L); for (i = 0; i < kHttpHeadersMax; ++i) { - if (msg.headers[i].b - msg.headers[i].a) { + if (msg.headers[i].a) { LuaPushLatin1(L, inbuf.p + msg.headers[i].a, msg.headers[i].b - msg.headers[i].a); lua_setfield(L, -2, GetHttpHeaderName(i)); @@ -1629,40 +2902,34 @@ static int LuaGetHeaders(lua_State *L) { static int LuaSetHeader(lua_State *L) { int h; - char *p; ssize_t rc; + char *p, *q; const char *key, *val, *eval; size_t i, keylen, vallen, evallen; key = luaL_checklstring(L, 1, &keylen); val = luaL_checklstring(L, 2, &vallen); if ((h = GetHttpHeader(key, keylen)) == -1) { if (!IsValidHttpToken(key, keylen)) { - return luaL_argerror(L, 1, "invalid"); + luaL_argerror(L, 1, "invalid"); + unreachable; } } if (!(eval = EncodeHttpHeaderValue(val, vallen, &evallen))) { - return luaL_argerror(L, 2, "invalid"); + luaL_argerror(L, 2, "invalid"); + unreachable; } - if (!luaheaderp) { - p = SetStatus(200, "OK"); - } else { - while (luaheaderp - hdrbuf.p + keylen + 2 + evallen + 2 + 512 > hdrbuf.n) { - hdrbuf.n += hdrbuf.n >> 1; - p = xrealloc(hdrbuf.p, hdrbuf.n); - luaheaderp = p + (luaheaderp - hdrbuf.p); - hdrbuf.p = p; - } - p = luaheaderp; + p = GetLuaResponse(); + while (p - hdrbuf.p + keylen + 2 + evallen + 2 + 512 > hdrbuf.n) { + hdrbuf.n += hdrbuf.n >> 1; + q = xrealloc(hdrbuf.p, hdrbuf.n); + luaheaderp = p = q + (p - hdrbuf.p); + hdrbuf.p = q; } switch (h) { - case kHttpDate: - case kHttpContentRange: - case kHttpContentLength: - case kHttpContentEncoding: - return luaL_argerror(L, 1, "abstracted"); case kHttpConnection: if (evallen != 5 || memcmp(eval, "close", 5)) { - return luaL_argerror(L, 2, "unsupported"); + luaL_argerror(L, 2, "unsupported"); + unreachable; } connectionclose = true; break; @@ -1683,12 +2950,11 @@ static int LuaSetHeader(lua_State *L) { } static int LuaHasParam(lua_State *L) { - const char *key; - size_t i, keylen; - key = luaL_checklstring(L, 1, &keylen); - for (i = 0; i < request.params.n; ++i) { - if (request.params.p[i].key.n == keylen && - !memcmp(request.params.p[i].key.p, key, keylen)) { + size_t i, n; + const char *s; + s = luaL_checklstring(L, 1, &n); + for (i = 0; i < url.params.n; ++i) { + if (SlicesEqual(s, n, url.params.p[i].key.p, url.params.p[i].key.n)) { lua_pushboolean(L, true); return 1; } @@ -1698,104 +2964,329 @@ static int LuaHasParam(lua_State *L) { } static int LuaGetParam(lua_State *L) { - const char *key; - size_t i, keylen; - key = luaL_checklstring(L, 1, &keylen); - for (i = 0; i < request.params.n; ++i) { - if (request.params.p[i].key.n == keylen && - !memcmp(request.params.p[i].key.p, key, keylen)) { - if (request.params.p[i].val.n == SIZE_MAX) break; - lua_pushlstring(L, request.params.p[i].val.p, request.params.p[i].val.n); - return 1; + size_t i, n; + const char *s; + s = luaL_checklstring(L, 1, &n); + for (i = 0; i < url.params.n; ++i) { + if (SlicesEqual(s, n, url.params.p[i].key.p, url.params.p[i].key.n)) { + if (url.params.p[i].val.p) { + lua_pushlstring(L, url.params.p[i].val.p, url.params.p[i].val.n); + return 1; + } else { + break; + } } } lua_pushnil(L); return 1; } -static int LuaGetParams(lua_State *L) { +static void LuaPushUrlParams(lua_State *L, struct UrlParams *h) { size_t i; - lua_newtable(L); - for (i = 0; i < request.params.n; ++i) { + if (h->p) { lua_newtable(L); - lua_pushlstring(L, request.params.p[i].key.p, request.params.p[i].key.n); - lua_seti(L, -2, 1); - if (request.params.p[i].val.n != SIZE_MAX) { - lua_pushlstring(L, request.params.p[i].val.p, request.params.p[i].val.n); - lua_seti(L, -2, 2); + for (i = 0; i < h->n; ++i) { + lua_newtable(L); + lua_pushlstring(L, h->p[i].key.p, h->p[i].key.n); + lua_seti(L, -2, 1); + if (h->p[i].val.p) { + lua_pushlstring(L, h->p[i].val.p, h->p[i].val.n); + lua_seti(L, -2, 2); + } + lua_seti(L, -2, i + 1); } - lua_seti(L, -2, i + 1); + } else { + lua_pushnil(L); + } +} + +static int LuaGetParams(lua_State *L) { + LuaPushUrlParams(L, &url.params); + return 1; +} + +static int LuaParseParams(lua_State *L) { + void *m; + size_t size; + const char *data; + struct UrlParams h; + data = luaL_checklstring(L, 1, &size); + memset(&h, 0, sizeof(h)); + m = ParseParams(data, size, &h); + LuaPushUrlParams(L, &h); + free(h.p); + free(m); + return 1; +} + +static void LuaSetUrlView(lua_State *L, struct UrlView *v, const char *k) { + LuaPushUrlView(L, v); + lua_setfield(L, -2, k); +} + +static int LuaParseUrl(lua_State *L) { + void *m; + size_t n; + struct Url h; + const char *p; + p = luaL_checklstring(L, 1, &n); + m = ParseUrl(p, n, &h); + lua_newtable(L); + LuaSetUrlView(L, &h.scheme, "scheme"); + LuaSetUrlView(L, &h.user, "user"); + LuaSetUrlView(L, &h.pass, "pass"); + LuaSetUrlView(L, &h.host, "host"); + LuaSetUrlView(L, &h.port, "port"); + LuaSetUrlView(L, &h.path, "path"); + LuaSetUrlView(L, &h.fragment, "fragment"); + LuaPushUrlParams(L, &h.params); + lua_setfield(L, -2, "params"); + free(h.params.p); + free(m); + return 1; +} + +static int LuaParseHost(lua_State *L) { + void *m; + size_t n; + struct Url h; + const char *p; + memset(&h, 0, sizeof(h)); + p = luaL_checklstring(L, 1, &n); + m = ParseHost(p, n, &h); + lua_newtable(L); + LuaPushUrlView(L, &h.host); + LuaPushUrlView(L, &h.port); + free(m); + return 1; +} + +static int LuaEncodeUrl(lua_State *L) { + void *m; + size_t size; + struct Url h; + int i, j, k, n; + const char *data; + if (!lua_isnil(L, 1)) { + memset(&h, 0, sizeof(h)); + luaL_checktype(L, 1, LUA_TTABLE); + if (lua_getfield(L, 1, "scheme")) + h.scheme.p = lua_tolstring(L, -1, &h.scheme.n); + if (lua_getfield(L, 1, "fragment")) + h.fragment.p = lua_tolstring(L, -1, &h.fragment.n); + if (lua_getfield(L, 1, "user")) h.user.p = lua_tolstring(L, -1, &h.user.n); + if (lua_getfield(L, 1, "pass")) h.pass.p = lua_tolstring(L, -1, &h.pass.n); + if (lua_getfield(L, 1, "host")) h.host.p = lua_tolstring(L, -1, &h.host.n); + if (lua_getfield(L, 1, "port")) h.port.p = lua_tolstring(L, -1, &h.port.n); + if (lua_getfield(L, 1, "path")) h.path.p = lua_tolstring(L, -1, &h.path.n); + if (lua_getfield(L, 1, "params")) { + luaL_checktype(L, -1, LUA_TTABLE); + lua_len(L, -1); + n = lua_tointeger(L, -1); + for (i = -2, k = 0, j = 1; j <= n; ++j) { + if (lua_geti(L, i--, j)) { + luaL_checktype(L, -1, LUA_TTABLE); + if (lua_geti(L, -1, 1)) { + h.params.p = + xrealloc(h.params.p, ++h.params.n * sizeof(*h.params.p)); + h.params.p[h.params.n - 1].key.p = + lua_tolstring(L, -1, &h.params.p[h.params.n - 1].key.n); + if (lua_geti(L, -2, 2)) { + h.params.p[h.params.n - 1].val.p = + lua_tolstring(L, -1, &h.params.p[h.params.n - 1].val.n); + } else { + h.params.p[h.params.n - 1].val.p = 0; + h.params.p[h.params.n - 1].val.n = 0; + } + } + i--; + } + i--; + } + } + data = EncodeUrl(&h, &size); + lua_pushlstring(L, data, size); + free(data); + } else { + lua_pushnil(L); } return 1; } static int LuaWrite(lua_State *L) { - int h; size_t size; const char *data; - data = luaL_checklstring(L, 1, &size); - AppendData(data, size); + if (!lua_isnil(L, 1)) { + data = luaL_checklstring(L, 1, &size); + AppendData(data, size); + } return 0; } -static int LuaEscaper(lua_State *L, - struct EscapeResult escape(const char *, size_t)) { - size_t size; - const char *data; - struct EscapeResult r; - data = luaL_checklstring(L, 1, &size); - r = escape(data, size); - lua_pushlstring(L, r.data, r.size); - free(r.data); +static int LuaCheckControlFlags(lua_State *L, int idx) { + int f = luaL_checkinteger(L, idx); + if (f & ~(kControlWs | kControlC0 | kControlC1)) { + luaL_argerror(L, idx, "invalid control flags"); + unreachable; + } + return f; +} + +static int LuaHasControlCodes(lua_State *L) { + int f; + size_t n; + const char *p; + p = luaL_checklstring(L, 1, &n); + f = LuaCheckControlFlags(L, 2); + lua_pushboolean(L, HasControlCodes(p, n, f)); return 1; } -static int LuaEscapeHtml(lua_State *L) { - return LuaEscaper(L, EscapeHtml); +static int LuaIsValid(lua_State *L, bool IsValid(const char *, size_t)) { + size_t size; + const char *data; + data = luaL_checklstring(L, 1, &size); + lua_pushboolean(L, IsValid(data, size)); + return 1; } -static int LuaEscapeParam(lua_State *L) { - return LuaEscaper(L, EscapeUrlParam); +static int LuaIsValidHttpToken(lua_State *L) { + return LuaIsValid(L, IsValidHttpToken); } -static int LuaEscapePath(lua_State *L) { - return LuaEscaper(L, EscapeUrlPath); +static int LuaIsAcceptablePath(lua_State *L) { + return LuaIsValid(L, IsAcceptablePath); } -static int LuaEscapeSegment(lua_State *L) { - return LuaEscaper(L, EscapeUrlPathSegment); +static int LuaIsReasonablePath(lua_State *L) { + return LuaIsValid(L, IsReasonablePath); } -static int LuaEscapeFragment(lua_State *L) { - return LuaEscaper(L, EscapeUrlFragment); +static int LuaIsAcceptableHost(lua_State *L) { + return LuaIsValid(L, IsAcceptableHost); } -static int LuaEscapeLiteral(lua_State *L) { - return LuaEscaper(L, EscapeJsStringLiteral); +static int LuaIsAcceptablePort(lua_State *L) { + return LuaIsValid(L, IsAcceptablePort); +} + +static noinline int LuaCoderImpl(lua_State *L, + char *Coder(const char *, size_t, size_t *)) { + void *p; + size_t n; + p = luaL_checklstring(L, 1, &n); + p = Coder(p, n, &n); + lua_pushlstring(L, p, n); + free(p); + return 1; +} + +static noinline int LuaCoder(lua_State *L, + char *Coder(const char *, size_t, size_t *)) { + return LuaCoderImpl(L, Coder); +} + +static int LuaUnderlong(lua_State *L) { + return LuaCoder(L, Underlong); } static int LuaEncodeBase64(lua_State *L) { + return LuaCoder(L, EncodeBase64); +} + +static int LuaDecodeBase64(lua_State *L) { + return LuaCoder(L, DecodeBase64); +} + +static int LuaDecodeLatin1(lua_State *L) { + return LuaCoder(L, DecodeLatin1); +} + +static int LuaEscapeHtml(lua_State *L) { + return LuaCoder(L, EscapeHtml); +} + +static int LuaEscapeParam(lua_State *L) { + return LuaCoder(L, EscapeParam); +} + +static int LuaEscapePath(lua_State *L) { + return LuaCoder(L, EscapePath); +} + +static int LuaEscapeHost(lua_State *L) { + return LuaCoder(L, EscapeHost); +} + +static int LuaEscapeIp(lua_State *L) { + return LuaCoder(L, EscapeIp); +} + +static int LuaEscapeUser(lua_State *L) { + return LuaCoder(L, EscapeUser); +} + +static int LuaEscapePass(lua_State *L) { + return LuaCoder(L, EscapePass); +} + +static int LuaEscapeSegment(lua_State *L) { + return LuaCoder(L, EscapeSegment); +} + +static int LuaEscapeFragment(lua_State *L) { + return LuaCoder(L, EscapeFragment); +} + +static int LuaEscapeLiteral(lua_State *L) { + return LuaCoder(L, EscapeJsStringLiteral); +} + +static int LuaVisualizeControlCodes(lua_State *L) { + return LuaCoder(L, VisualizeControlCodes); +} + +static int LuaEncodeLatin1(lua_State *L) { + int f; char *p; - size_t size, n; - const char *data; - data = luaL_checklstring(L, 1, &size); - p = EncodeBase64(data, size, &n); + size_t n; + p = luaL_checklstring(L, 1, &n); + f = LuaCheckControlFlags(L, 2); + p = EncodeLatin1(p, n, &n, f); lua_pushlstring(L, p, n); free(p); return 1; } -static int LuaDecodeBase64(lua_State *L) { - char *p; - size_t size, n; - const char *data; - data = luaL_checklstring(L, 1, &size); - p = DecodeBase64(data, size, &n); +static int LuaIndentLines(lua_State *L) { + void *p; + size_t n, j; + p = luaL_checklstring(L, 1, &n); + j = luaL_optinteger(L, 2, 1); + if (!(0 <= j && j <= 65535)) { + luaL_argerror(L, 2, "not in range 0..65535"); + unreachable; + } + p = IndentLines(p, n, &n, j); lua_pushlstring(L, p, n); free(p); return 1; } +static int LuaGetMonospaceWidth(lua_State *L) { + int w; + if (lua_isinteger(L, 1)) { + w = wcwidth(lua_tointeger(L, 1)); + } else if (lua_isstring(L, 1)) { + w = strwidth(luaL_checkstring(L, 1), luaL_optinteger(L, 2, 0) & 7); + } else { + luaL_argerror(L, 1, "not integer or string"); + unreachable; + } + lua_pushinteger(L, w); + return 1; +} + static int LuaPopcnt(lua_State *L) { lua_pushinteger(L, popcnt(luaL_checkinteger(L, 1))); return 1; @@ -1807,7 +3298,8 @@ static int LuaBsr(lua_State *L) { lua_pushinteger(L, bsr(x)); return 1; } else { - return luaL_argerror(L, 1, "zero"); + luaL_argerror(L, 1, "zero"); + unreachable; } } @@ -1817,38 +3309,48 @@ static int LuaBsf(lua_State *L) { lua_pushinteger(L, bsf(x)); return 1; } else { - return luaL_argerror(L, 1, "zero"); + luaL_argerror(L, 1, "zero"); + unreachable; } } -static int LuaCrc32(lua_State *L) { +static int LuaHash(lua_State *L, uint32_t H(uint32_t, const void *, size_t)) { long i; size_t n; const char *p; i = luaL_checkinteger(L, 1); p = luaL_checklstring(L, 2, &n); - lua_pushinteger(L, crc32_z(i, p, n)); + lua_pushinteger(L, H(i, p, n)); return 1; } +static int LuaCrc32(lua_State *L) { + return LuaHash(L, crc32_z); +} + static int LuaCrc32c(lua_State *L) { - long i; - size_t n; - const char *p; - i = luaL_checkinteger(L, 1); - p = luaL_checklstring(L, 2, &n); - lua_pushinteger(L, crc32c(i, p, n)); - return 1; + return LuaHash(L, crc32c); +} + +static noinline int LuaProgramInt(lua_State *L, void Program(long)) { + Program(luaL_checkinteger(L, 1)); + return 0; } static int LuaProgramPort(lua_State *L) { - ProgramPort(luaL_checkinteger(L, 1)); - return 0; + return LuaProgramInt(L, ProgramPort); } static int LuaProgramCache(lua_State *L) { - ProgramCache(luaL_checkinteger(L, 1)); - return 0; + return LuaProgramInt(L, ProgramCache); +} + +static int LuaProgramLinger(lua_State *L) { + return LuaProgramInt(L, ProgramLinger); +} + +static int LuaProgramTimeout(lua_State *L) { + return LuaProgramInt(L, ProgramTimeout); } static int LuaProgramBrand(lua_State *L) { @@ -1856,6 +3358,14 @@ static int LuaProgramBrand(lua_State *L) { return 0; } +static int LuaProgramHeader(lua_State *L) { + char *s; + s = xasprintf("%s: %s", luaL_checkstring(L, 1), luaL_checkstring(L, 2)); + ProgramHeader(s); + free(s); + return 0; +} + static int LuaProgramRedirect(lua_State *L) { ProgramRedirect(luaL_checkinteger(L, 1), luaL_checkstring(L, 2), luaL_checkstring(L, 3)); @@ -1873,21 +3383,30 @@ static int LuaSetLogLevel(lua_State *L) { } static int LuaHidePath(lua_State *L) { - AddString(&hidepaths, strdup(luaL_checkstring(L, 1))); + size_t pathlen; + const char *path; + path = luaL_checklstring(L, 1, &pathlen); + AddString(&hidepaths, strndup(path, pathlen)); return 0; } static int LuaLog(lua_State *L) { int level; + char *module; lua_Debug ar; - const char *msg, *module; + const char *msg; level = luaL_checkinteger(L, 1); if (LOGGABLE(level)) { msg = luaL_checkstring(L, 2); lua_getstack(L, 1, &ar); lua_getinfo(L, "nSl", &ar); - module = !strcmp(ar.name, "main") ? sauce : ar.name; - flogf(level, module, ar.currentline, NULL, "%s", msg); + if (!strcmp(ar.name, "main")) { + module = strndup(effectivepath.p, effectivepath.n); + flogf(level, module, ar.currentline, NULL, "%s", msg); + free(module); + } else { + flogf(level, ar.name, ar.currentline, NULL, "%s", msg); + } } return 0; } @@ -1899,13 +3418,12 @@ static int LuaIsHiddenPath(lua_State *L) { static int LuaGetZipPaths(lua_State *L) { char *path; - uint32_t cf; + uint64_t cf; size_t i, n, pathlen; lua_newtable(L); i = 0; - n = ZIP_CDIR_RECORDS(zdir); - CHECK_EQ(kZipCdirHdrMagic, ZIP_CDIR_MAGIC(zdir)); - for (cf = ZIP_CDIR_OFFSET(zdir); n--; cf += ZIP_CFILE_HDRSIZE(zmap + cf)) { + n = GetZipCdirRecords(cdir); + for (cf = GetZipCdirOffset(cdir); n--; cf += ZIP_CFILE_HDRSIZE(zmap + cf)) { CHECK_EQ(kZipCfileHdrMagic, ZIP_CFILE_MAGIC(zmap + cf)); path = GetAssetPath(cf, &pathlen); lua_pushlstring(L, path, pathlen); @@ -1915,65 +3433,341 @@ static int LuaGetZipPaths(lua_State *L) { return 1; } -static void LuaRun(const char *path) { +static int LuaGetAssetMode(lua_State *L) { + size_t pathlen; + struct Asset *a; + const char *path; + path = LuaCheckPath(L, 1, &pathlen); + if ((a = GetAsset(path, pathlen))) { + lua_pushinteger(L, GetMode(a)); + } else { + lua_pushnil(L); + } + return 1; +} + +static int LuaGetLastModifiedTime(lua_State *L) { + size_t pathlen; + struct Asset *a; + const char *path; + path = LuaCheckPath(L, 1, &pathlen); + if ((a = GetAsset(path, pathlen))) { + if (a->file) { + lua_pushinteger(L, a->file->st.st_mtim.tv_sec); + } else { + lua_pushinteger(L, GetZipCfileLastModified(zmap + a->cf)); + } + } else { + lua_pushnil(L); + } + return 1; +} + +static int LuaGetAssetSize(lua_State *L) { + size_t pathlen; + struct Asset *a; + const char *path; + path = LuaCheckPath(L, 1, &pathlen); + if ((a = GetAsset(path, pathlen))) { + if (a->file) { + lua_pushinteger(L, a->file->st.st_size); + } else { + lua_pushinteger(L, GetZipLfileUncompressedSize(zmap + a->lf)); + } + } else { + lua_pushnil(L); + } + return 1; +} + +static int LuaIsCompressed(lua_State *L) { + size_t pathlen; + struct Asset *a; + const char *path; + path = LuaCheckPath(L, 1, &pathlen); + if ((a = GetAsset(path, pathlen))) { + lua_pushboolean(L, IsCompressed(a)); + } else { + lua_pushnil(L); + } + return 1; +} + +static int LuaGetComment(lua_State *L) { + struct Asset *a; + const char *path; + size_t pathlen, m; + path = LuaCheckPath(L, 1, &pathlen); + if ((a = GetAssetZip(path, pathlen)) && + (m = strnlen(ZIP_CFILE_COMMENT(zmap + a->cf), + ZIP_CFILE_COMMENTSIZE(zmap + a->cf)))) { + lua_pushlstring(L, ZIP_CFILE_COMMENT(zmap + a->cf), m); + } else { + lua_pushnil(L); + } + return 1; +} + +static void LuaSetIntField(lua_State *L, const char *k, lua_Integer v) { + lua_pushinteger(L, v); + lua_setfield(L, -2, k); +} + +static int LuaLaunchBrowser(lua_State *L) { + LaunchBrowser(); + return 1; +} + +static regex_t *LuaReCompileImpl(lua_State *L, const char *p, int f) { + int e; + regex_t *r; + r = xmalloc(sizeof(regex_t)); + f &= REG_EXTENDED | REG_ICASE | REG_NEWLINE | REG_NOSUB; + f ^= REG_EXTENDED; + if ((e = regcomp(r, p, f)) != REG_OK) { + free(r); + luaL_error(L, "regcomp(%s) → REG_%s", p, + kRegCode[MAX(0, MIN(ARRAYLEN(kRegCode) - 1, e))]); + unreachable; + } + return r; +} + +static int LuaReSearchImpl(lua_State *L, regex_t *r, const char *s, int f) { + int i, n; + regmatch_t *m; + n = r->re_nsub + 1; + m = xcalloc(n, sizeof(regmatch_t)); + if (regexec(r, s, n, m, f >> 8) == REG_OK) { + for (i = 0; i < n; ++i) { + lua_pushlstring(L, s + m[i].rm_so, m[i].rm_eo - m[i].rm_so); + } + } else { + n = 0; + } + free(m); + return n; +} + +static int LuaReSearch(lua_State *L) { + regex_t *r; + int i, e, n, f; + const char *p, *s; + p = luaL_checkstring(L, 1); + s = luaL_checkstring(L, 2); + f = luaL_optinteger(L, 3, 0); + if (f & ~(REG_EXTENDED | REG_ICASE | REG_NEWLINE | REG_NOSUB | + REG_NOTBOL << 8 | REG_NOTEOL << 8)) { + luaL_argerror(L, 3, "invalid flags"); + unreachable; + } + r = LuaReCompileImpl(L, p, f); + n = LuaReSearchImpl(L, r, s, f); + regfree(r); + free(r); + return n; +} + +static int LuaReCompile(lua_State *L) { + int f, e; + const char *p; + regex_t *r, **u; + p = luaL_checkstring(L, 1); + f = luaL_optinteger(L, 2, 0); + if (f & ~(REG_EXTENDED | REG_ICASE | REG_NEWLINE | REG_NOSUB)) { + luaL_argerror(L, 3, "invalid flags"); + unreachable; + } + r = LuaReCompileImpl(L, p, f); + u = lua_newuserdata(L, sizeof(regex_t *)); + luaL_setmetatable(L, "regex_t*"); + *u = r; + return 1; +} + +static int LuaReRegexSearch(lua_State *L) { + int f; + regex_t **u; + const char *s; + u = luaL_checkudata(L, 1, "regex_t*"); + s = luaL_checkstring(L, 2); + f = luaL_optinteger(L, 3, 0); + if (!*u) { + luaL_argerror(L, 1, "destroyed"); + unreachable; + } + if (f & ~(REG_NOTBOL << 8 | REG_NOTEOL << 8)) { + luaL_argerror(L, 3, "invalid flags"); + unreachable; + } + return LuaReSearchImpl(L, *u, s, f); +} + +static int LuaReRegexGc(lua_State *L) { + regex_t **u; + u = luaL_checkudata(L, 1, "regex_t*"); + if (*u) { + regfree(*u); + free(*u); + *u = NULL; + } + return 0; +} + +static const luaL_Reg kLuaRe[] = { + {"compile", LuaReCompile}, // + {"search", LuaReSearch}, // + {NULL, NULL}, // +}; + +static const luaL_Reg kLuaReRegexMeth[] = { + {"search", LuaReRegexSearch}, // + {NULL, NULL}, // +}; + +static const luaL_Reg kLuaReRegexMeta[] = { + {"__gc", LuaReRegexGc}, // + {NULL, NULL}, // +}; + +static void LuaReRegex(lua_State *L) { + luaL_newmetatable(L, "regex_t*"); + luaL_setfuncs(L, kLuaReRegexMeta, 0); + luaL_newlibtable(L, kLuaReRegexMeth); + luaL_setfuncs(L, kLuaReRegexMeth, 0); + lua_setfield(L, -2, "__index"); + lua_pop(L, 1); +} + +static int LuaRe(lua_State *L) { + luaL_newlib(L, kLuaRe); + LuaSetIntField(L, "BASIC", REG_EXTENDED); + LuaSetIntField(L, "ICASE", REG_ICASE); + LuaSetIntField(L, "NEWLINE", REG_NEWLINE); + LuaSetIntField(L, "NOSUB", REG_NOSUB); + LuaSetIntField(L, "NOTBOL", REG_NOTBOL << 8); + LuaSetIntField(L, "NOTEOL", REG_NOTEOL << 8); + LuaReRegex(L); + return 1; +} + +static bool LuaRun(const char *path) { + size_t pathlen; struct Asset *a; const char *code; - if ((a = LocateAsset(path, strlen(path)))) { - code = LoadAsset(a, NULL); - sauce = path + 1; - if (luaL_dostring(L, code) != LUA_OK) { - WARNF("%s %s", path, lua_tostring(L, -1)); + pathlen = strlen(path); + if ((a = GetAsset(path, pathlen))) { + if ((code = LoadAsset(a, NULL))) { + effectivepath.p = path; + effectivepath.n = pathlen; + DEBUGF("LuaRun(%`'s)", path); + if (luaL_dostring(L, code) != LUA_OK) { + WARNF("%s %s", path, lua_tostring(L, -1)); + } + free(code); } - free(code); - } else { - DEBUGF("%s not found", path); } + return !!a; } static const luaL_Reg kLuaFuncs[] = { - {"DecodeBase64", LuaDecodeBase64}, // - {"EncodeBase64", LuaEncodeBase64}, // - {"EscapeFragment", LuaEscapeFragment}, // - {"EscapeHtml", LuaEscapeHtml}, // - {"EscapeLiteral", LuaEscapeLiteral}, // - {"EscapeParam", LuaEscapeParam}, // - {"EscapePath", LuaEscapePath}, // - {"EscapeSegment", LuaEscapeSegment}, // - {"FormatHttpDateTime", LuaFormatHttpDateTime}, // - {"GetClientAddr", LuaGetClientAddr}, // - {"GetDate", LuaGetDate}, // - {"GetHeader", LuaGetHeader}, // - {"GetHeaders", LuaGetHeaders}, // - {"GetLogLevel", LuaGetLogLevel}, // - {"GetMethod", LuaGetMethod}, // - {"GetParam", LuaGetParam}, // - {"GetParams", LuaGetParams}, // - {"GetPath", LuaGetPath}, // - {"GetPayload", LuaGetPayload}, // - {"GetServerAddr", LuaGetServerAddr}, // - {"GetUri", LuaGetUri}, // - {"GetVersion", LuaGetVersion}, // - {"GetZipPaths", LuaGetZipPaths}, // - {"HasParam", LuaHasParam}, // - {"HidePath", LuaHidePath}, // - {"LoadAsset", LuaLoadAsset}, // - {"Log", LuaLog}, // - {"ParseHttpDateTime", LuaParseHttpDateTime}, // - {"ProgramBrand", LuaProgramBrand}, // - {"ProgramCache", LuaProgramCache}, // - {"ProgramPort", LuaProgramPort}, // - {"ProgramRedirect", LuaProgramRedirect}, // - {"ServeAsset", LuaServeAsset}, // - {"ServeError", LuaServeError}, // - {"SetHeader", LuaSetHeader}, // - {"SetLogLevel", LuaSetLogLevel}, // - {"SetStatus", LuaSetStatus}, // - {"Write", LuaWrite}, // - {"bsf", LuaBsf}, // - {"bsr", LuaBsr}, // - {"crc32", LuaCrc32}, // - {"crc32c", LuaCrc32c}, // - {"popcnt", LuaPopcnt}, // + {"CategorizeIp", LuaCategorizeIp}, // + {"DecodeBase64", LuaDecodeBase64}, // + {"DecodeLatin1", LuaDecodeLatin1}, // + {"EncodeBase64", LuaEncodeBase64}, // + {"EncodeLatin1", LuaEncodeLatin1}, // + {"EncodeUrl", LuaEncodeUrl}, // + {"EscapeFragment", LuaEscapeFragment}, // + {"EscapeHost", LuaEscapeHost}, // + {"EscapeHtml", LuaEscapeHtml}, // + {"EscapeIp", LuaEscapeIp}, // + {"EscapeLiteral", LuaEscapeLiteral}, // + {"EscapeParam", LuaEscapeParam}, // + {"EscapePass", LuaEscapePass}, // + {"EscapePath", LuaEscapePath}, // + {"EscapeSegment", LuaEscapeSegment}, // + {"EscapeUser", LuaEscapeUser}, // + {"FormatHttpDateTime", LuaFormatHttpDateTime}, // + {"FormatIp", LuaFormatIp}, // + {"GetAssetMode", LuaGetAssetMode}, // + {"GetAssetSize", LuaGetAssetSize}, // + {"GetClientAddr", LuaGetClientAddr}, // + {"GetComment", LuaGetComment}, // + {"GetDate", LuaGetDate}, // + {"GetEffectivePath", LuaGetEffectivePath}, // + {"GetFragment", LuaGetFragment}, // + {"GetHeader", LuaGetHeader}, // + {"GetHeaders", LuaGetHeaders}, // + {"GetHost", LuaGetHost}, // + {"GetLastModifiedTime", LuaGetLastModifiedTime}, // + {"GetLogLevel", LuaGetLogLevel}, // + {"GetMethod", LuaGetMethod}, // + {"GetMonospaceWidth", LuaGetMonospaceWidth}, // + {"GetParam", LuaGetParam}, // + {"GetParams", LuaGetParams}, // + {"GetPass", LuaGetPass}, // + {"GetPath", LuaGetPath}, // + {"GetPayload", LuaGetPayload}, // + {"GetPort", LuaGetPort}, // + {"GetRemoteAddr", LuaGetRemoteAddr}, // + {"GetScheme", LuaGetScheme}, // + {"GetServerAddr", LuaGetServerAddr}, // + {"GetUrl", LuaGetUrl}, // + {"GetUser", LuaGetUser}, // + {"GetVersion", LuaGetVersion}, // + {"GetZipPaths", LuaGetZipPaths}, // + {"HasControlCodes", LuaHasControlCodes}, // + {"HasParam", LuaHasParam}, // + {"HidePath", LuaHidePath}, // + {"IndentLines", LuaIndentLines}, // + {"IsAcceptableHost", LuaIsAcceptableHost}, // + {"IsAcceptablePath", LuaIsAcceptablePath}, // + {"IsAcceptablePort", LuaIsAcceptablePort}, // + {"IsCompressed", LuaIsCompressed}, // + {"IsHiddenPath", LuaIsHiddenPath}, // + {"IsLoopbackIp", LuaIsLoopbackIp}, // + {"IsPrivateIp", LuaIsPrivateIp}, // + {"IsPublicIp", LuaIsPublicIp}, // + {"IsReasonablePath", LuaIsReasonablePath}, // + {"IsValidHttpToken", LuaIsValidHttpToken}, // + {"LaunchBrowser", LuaLaunchBrowser}, // + {"LoadAsset", LuaLoadAsset}, // + {"Log", LuaLog}, // + {"ParseHost", LuaParseHost}, // + {"ParseHttpDateTime", LuaParseHttpDateTime}, // + {"ParseIp", LuaParseIp}, // + {"ParseParams", LuaParseParams}, // + {"ParseUrl", LuaParseUrl}, // + {"ProgramBrand", LuaProgramBrand}, // + {"ProgramCache", LuaProgramCache}, // + {"ProgramHeader", LuaProgramHeader}, // + {"ProgramLinger", LuaProgramLinger}, // + {"ProgramPort", LuaProgramPort}, // + {"ProgramRedirect", LuaProgramRedirect}, // + {"ProgramTimeout", LuaProgramTimeout}, // + {"Route", LuaRoute}, // + {"RouteHost", LuaRouteHost}, // + {"RoutePath", LuaRoutePath}, // + {"ServeAsset", LuaServeAsset}, // + {"ServeError", LuaServeError}, // + {"ServeIndex", LuaServeIndex}, // + {"ServeListing", LuaServeListing}, // + {"ServeStatusz", LuaServeStatusz}, // + {"SetHeader", LuaSetHeader}, // + {"SetLogLevel", LuaSetLogLevel}, // + {"SetStatus", LuaSetStatus}, // + {"Underlong", LuaUnderlong}, // + {"VisualizeControlCodes", LuaVisualizeControlCodes}, // + {"Write", LuaWrite}, // + {"bsf", LuaBsf}, // + {"bsr", LuaBsr}, // + {"crc32", LuaCrc32}, // + {"crc32c", LuaCrc32c}, // + {"popcnt", LuaPopcnt}, // +}; + +static const luaL_Reg kLuaLibs[] = { + {"re", LuaRe}, // }; static void LuaSetArgv(lua_State *L) { @@ -1992,9 +3786,14 @@ static void LuaSetConstant(lua_State *L, const char *s, long x) { } static void LuaInit(void) { +#ifndef STATIC size_t i; L = luaL_newstate(); luaL_openlibs(L); + for (i = 0; i < ARRAYLEN(kLuaLibs); ++i) { + luaL_requiref(L, kLuaLibs[i].name, kLuaLibs[i].func, 1); + lua_pop(L, 1); + } for (i = 0; i < ARRAYLEN(kLuaFuncs); ++i) { lua_pushcfunction(L, kLuaFuncs[i].func); lua_setglobal(L, kLuaFuncs[i].name); @@ -2006,88 +3805,44 @@ static void LuaInit(void) { LuaSetConstant(L, "kLogWarn", kLogWarn); LuaSetConstant(L, "kLogError", kLogError); LuaSetConstant(L, "kLogFatal", kLogFatal); - LuaRun("/tool/net/.init.lua"); + if (LuaRun("/.init.lua")) { + hasluaglobalhandler = !!lua_getglobal(L, "OnHttpRequest"); + lua_pop(L, 1); + } else { + DEBUGF("no /.init.lua defined"); + } +#endif } static void LuaReload(void) { - LuaRun("/tool/net/.reload.lua"); -} - -static char *ServeLua(struct Asset *a) { - char *p; - luaheaderp = NULL; - sauce = FreeLater(strndup(request.path.p + 1, request.path.n - 1)); - if (luaL_dostring(L, FreeLater(LoadAsset(a, NULL))) == LUA_OK) { - if (!(p = luaheaderp)) { - p = SetStatus(200, "OK"); - p = AppendContentType(p, "text/html"); - } - if (outbuf.n) { - p = CommitOutput(p); - } - return p; - } else { - WARNF("%s %s", clientaddrstr, lua_tostring(L, -1)); - lua_pop(L, 1); /* remove message */ - connectionclose = true; - return ServeError(500, "Internal Server Error"); +#ifndef STATIC + if (!LuaRun("/.reload.lua")) { + DEBUGF("no /.reload.lua defined"); } +#endif } -static bool IsLua(struct Asset *a) { - if (a->file) return endswith(a->file->path, ".lua"); - return ZIP_LFILE_NAMESIZE(zmap + a->lf) >= 4 && - !memcmp(ZIP_LFILE_NAME(zmap + a->lf) + - ZIP_LFILE_NAMESIZE(zmap + a->lf) - 4, - ".lua", 4); +static void HandleReload(void) { + LOGF("reloading"); + LuaReload(); } -static char *HandleAsset(struct Asset *a, const char *path, size_t pathlen) { - char *p; - if (IsLua(a)) { - p = ServeLua(a); - } else if (msg.method == kHttpGet || msg.method == kHttpHead) { - p = ServeAsset(a, path, pathlen); - p = AppendHeader(p, "X-Content-Type-Options", "nosniff"); - } else { - p = ServeError(405, "Method Not Allowed"); - } - return p; -} - -static char *HandleRedirect(struct Redirect *r) { - struct Asset *a; - if (!r->code) { - if ((a = LocateAsset(r->location, strlen(r->location)))) { - DEBUGF("%s %s %`'.*s rewritten %`'s", clientaddrstr, - kHttpMethod[msg.method], request.path.n, request.path.p, - r->location); - return HandleAsset(a, r->location, strlen(r->location)); - } else { - return ServeError(505, "HTTP Version Not Supported"); - } - } else if (httpversion == 9) { - return ServeError(505, "HTTP Version Not Supported"); - } else { - DEBUGF("%s %s %`'.*s %d redirecting %`'s", clientaddrstr, - kHttpMethod[msg.method], request.path.n, request.path.p, r->code, - r->location); - return AppendHeader(SetStatus(r->code, GetHttpReason(r->code)), "Location", - FreeLater(EncodeHttpHeaderValue(r->location, -1, 0))); - } +static void HandleHeartbeat(void) { + if (nowl() - lastrefresh > 60 * 60) RefreshTime(); + UpdateCurrentDate(nowl()); + getrusage(RUSAGE_SELF, &shared->server); +#ifndef STATIC + LuaRun("/.heartbeat.lua"); +#endif } static void LogMessage(const char *d, const char *s, size_t n) { - size_t n2, n3, n4; - char *s2, *s3, *s4; - if (!logmessages) return; + size_t n2, n3; + char *s2, *s3; while (n && (s[n - 1] == '\r' || s[n - 1] == '\n')) --n; if ((s2 = DecodeLatin1(s, n, &n2))) { - if ((s3 = VisualizeControlCodes(s2, n2, &n3))) { - if ((s4 = IndentLines(s3, n3, &n4, 1))) { - LOGF("%s %s %,ld byte message\n%.*s", clientaddrstr, d, n, n4, s4); - free(s4); - } + if ((s3 = IndentLines(s2, n2, &n3, 1))) { + LOGF("%s %,ld byte message\n%.*s", d, n, n3, s3); free(s3); } free(s2); @@ -2097,23 +3852,22 @@ static void LogMessage(const char *d, const char *s, size_t n) { static void LogBody(const char *d, const char *s, size_t n) { char *s2, *s3; size_t n2, n3; - if (!n || !logbodies) return; + if (!n) return; while (n && (s[n - 1] == '\r' || s[n - 1] == '\n')) --n; if ((s2 = VisualizeControlCodes(s, n, &n2))) { if ((s3 = IndentLines(s2, n2, &n3, 1))) { - LOGF("%s %s %,ld byte payload\n%.*s", clientaddrstr, d, n, n3, s3); + LOGF("%s %,ld byte payload\n%.*s", d, n, n3, s3); free(s3); } free(s2); } } -static ssize_t SendMessageString(const char *s) { +static ssize_t SendString(const char *s) { size_t n; ssize_t rc; n = strlen(s); - LogMessage("sending", s, n); - return 0; + if (logmessages) LogMessage("sending", s, n); for (;;) { if ((rc = write(client, s, n)) != -1 || errno != EINTR) { return rc; @@ -2122,13 +3876,13 @@ static ssize_t SendMessageString(const char *s) { } static ssize_t SendContinue(void) { - return SendMessageString("\ + return SendString("\ HTTP/1.1 100 Continue\r\n\ \r\n"); } static ssize_t SendTimeout(void) { - return SendMessageString("\ + return SendString("\ HTTP/1.1 408 Request Timeout\r\n\ Connection: close\r\n\ Content-Length: 0\r\n\ @@ -2136,7 +3890,7 @@ Content-Length: 0\r\n\ } static ssize_t SendServiceUnavailable(void) { - return SendMessageString("\ + return SendString("\ HTTP/1.1 503 Service Unavailable\r\n\ Connection: close\r\n\ Content-Length: 0\r\n\ @@ -2144,10 +3898,13 @@ Content-Length: 0\r\n\ } static void LogClose(const char *reason) { - if (amtread) { - WARNF("%s %s with %,ld bytes unprocessed", clientaddrstr, reason, amtread); + if (amtread || meltdown || killed) { + LockInc(&shared->fumbles); + LOGF("%s %s with %,ld unprocessed and %,d handled (%,d workers)", + DescribeClient(), reason, amtread, messageshandled, shared->workers); } else { - DEBUGF("%s %s", clientaddrstr, reason); + DEBUGF("%s %s with %,d requests handled", DescribeClient(), reason, + messageshandled); } } @@ -2159,282 +3916,302 @@ static const char *DescribeClose(void) { return "destroyed"; } -static const char *DescribeCompressionRatio(char rb[8], uint32_t cf) { - long percent; - if (ZIP_CFILE_COMPRESSIONMETHOD(zmap + cf) == kZipCompressionNone) { - return "n/a"; - } else { - percent = lround(100 - (double)ZIP_CFILE_COMPRESSEDSIZE(zmap + cf) / - ZIP_CFILE_UNCOMPRESSEDSIZE(zmap + cf) * 100); - sprintf(rb, "%ld%%", MIN(999, MAX(-999, percent))); - return rb; +static void RecordNetworkOrigin(void) { + uint32_t ip; + GetRemoteAddr(&ip, 0); + switch (CategorizeIp(ip)) { + case kIpLoopback: + LockInc(&shared->netloopback); + break; + case kIpPrivate: + LockInc(&shared->netprivate); + break; + case kIpTestnet: + LockInc(&shared->nettestnet); + break; + case kIpAfrinic: + LockInc(&shared->netafrinic); + break; + case kIpLacnic: + LockInc(&shared->netlacnic); + break; + case kIpApnic: + LockInc(&shared->netapnic); + break; + case kIpArin: + LockInc(&shared->netarin); + break; + case kIpRipe: + LockInc(&shared->netripe); + break; + case kIpDod: + LockInc(&shared->netdod); + break; + case kIpAtt: + LockInc(&shared->netatt); + break; + case kIpApple: + LockInc(&shared->netapple); + break; + case kIpFord: + LockInc(&shared->netford); + break; + case kIpCogent: + LockInc(&shared->netcogent); + break; + case kIpPrudential: + LockInc(&shared->netprudential); + break; + case kIpUsps: + LockInc(&shared->netusps); + break; + case kIpComcast: + LockInc(&shared->netcomcast); + break; + case kIpAnonymous: + LockInc(&shared->netanonymous); + break; + default: + LockInc(&shared->netother); + break; } } -static void LoadLogo(void) { - char *p; - size_t n; - struct Asset *a; - const char *logopath; - logopath = "/tool/net/redbean.png"; - if ((a = LocateAsset(logopath, strlen(logopath)))) { - p = LoadAsset(a, &n); - logo.p = EncodeBase64(p, n, &logo.n); - free(p); - } -} - -static char *ServeListing(void) { - char rb[8]; - char tb[64]; - int w, x, y; - struct tm tm; - char *p, *path; - int64_t lastmod; - uint32_t cf, lf; - size_t i, n, pathlen; - struct EscapeResult r[3]; - AppendString("\ -\n\ -\n\ -redbean zip listing\n\ -\n\ -

\n"); - if (logo.n) { - AppendString("\n"); - } - r[0] = EscapeHtml(brand, strlen(brand)); - AppendData(r[0].data, r[0].size); - free(r[0].data); - AppendString("

\n");
-  w = x = 0;
-  n = ZIP_CDIR_RECORDS(zdir);
-  CHECK_EQ(kZipCdirHdrMagic, ZIP_CDIR_MAGIC(zdir));
-  for (cf = ZIP_CDIR_OFFSET(zdir); n--; cf += ZIP_CFILE_HDRSIZE(zmap + cf)) {
-    CHECK_EQ(kZipCfileHdrMagic, ZIP_CFILE_MAGIC(zmap + cf));
-    if (!IsHiddenPath((path = GetAssetPath(cf, &pathlen)))) {
-      y = strwidth(path, 0);
-      w = MIN(80, MAX(w, y + 2));
-      y = ZIP_CFILE_UNCOMPRESSEDSIZE(zmap + cf);
-      y = y ? llog10(y) : 1;
-      x = MIN(80, MAX(x, y + (y - 1) / 3 + 2));
-    }
-  }
-  n = ZIP_CDIR_RECORDS(zdir);
-  for (cf = ZIP_CDIR_OFFSET(zdir); n--; cf += ZIP_CFILE_HDRSIZE(zmap + cf)) {
-    CHECK_EQ(kZipCfileHdrMagic, ZIP_CFILE_MAGIC(zmap + cf));
-    path = GetAssetPath(cf, &pathlen);
-    if (!IsHiddenPath(path)) {
-      r[0] = EscapeHtml(path, pathlen);
-      r[1] = EscapeUrlPath(path, pathlen);
-      r[2] = EscapeHtml(r[1].data, r[1].size);
-      lastmod = GetLastModifiedZip(zmap + cf);
-      localtime_r(&lastmod, &tm);
-      strftime(tb, sizeof(tb), "%Y-%m-%d %H:%M:%S", &tm);
-      if (IsCompressionMethodSupported(
-              ZIP_CFILE_COMPRESSIONMETHOD(zmap + cf)) &&
-          IsAcceptableHttpRequestPath(path, pathlen)) {
-        AppendFmt("%-*.*s %s %4s %,*ld\n", r[2].size,
-                  r[2].data, w, r[0].size, r[0].data, tb,
-                  DescribeCompressionRatio(rb, cf), x,
-                  ZIP_CFILE_UNCOMPRESSEDSIZE(zmap + cf));
-      } else {
-        AppendFmt("%-*.*s %s %4s %,*ld\n", w, r[0].size, r[0].data, tb,
-                  DescribeCompressionRatio(rb, cf), x,
-                  ZIP_CFILE_UNCOMPRESSEDSIZE(zmap + cf));
-      }
-      free(r[2].data);
-      free(r[1].data);
-      free(r[0].data);
-    }
-    free(path);
-  }
-  AppendString("

\n"); - if (!unbranded) { - AppendString("\ -this listing is for /\n\ -when there's no /index.lua or /index.html in your zip
\n\ -redbean is based on\n\ -cosmopolitan and\n\ -αcτµαlly\n\ -pδrταblε εxεcµταblε
\n\ -redbean is authored by Justine Tunney who's on\n\ -GitHub and\n\ -Twitter
\n\ -your redbean is "); - } - w = shared->workers; - AppendFmt("currently servicing %,d connection%s\n", w, w == 1 ? "" : "s"); - AppendString("

\n"); - p = SetStatus(200, "OK"); - p = AppendCache(p, 0); - return CommitOutput(p); -} - -static char *ServeServerOptions(void) { +char *ServeServerOptions(void) { char *p; p = SetStatus(200, "OK"); - p = AppendHeader(p, "Accept", "*/*"); - p = AppendHeader(p, "Accept-Charset", "utf-8"); - p = AppendHeader(p, "Allow", "GET, HEAD, POST, PUT, DELETE, OPTIONS"); - VERBOSEF("%s pinged our server with OPTIONS *", clientaddrstr); +#ifdef STATIC + p = stpcpy(p, "Allow: GET, HEAD, OPTIONS\r\n"); +#else + p = stpcpy(p, "Accept: */*\r\n" + "Accept-Charset: utf-8\r\n" + "Allow: GET, HEAD, POST, PUT, DELETE, OPTIONS\r\n"); +#endif return p; } +static bool HasAtMostThisElement(int h, const char *s) { + size_t i, n; + struct HttpRequestHeader *x; + if (HasHeader(h)) { + n = strlen(s); + if (!SlicesEqualCase(s, n, inbuf.p + msg.headers[h].a, + msg.headers[h].b - msg.headers[h].a)) { + return false; + } + for (i = 0; i < msg.xheaders.n; ++i) { + x = msg.xheaders.p + i; + if (GetHttpHeader(inbuf.p + x->k.a, x->k.b - x->k.a) == h && + !SlicesEqualCase(inbuf.p + x->v.a, x->v.b - x->v.a, s, n)) { + return false; + } + } + } + return true; +} -static char *HandleMessage(void) { - long r; - ssize_t cl, rc; - struct Asset *a; - size_t got, need; - httpversion = - ParseHttpVersion(inbuf.p + msg.version.a, msg.version.b - msg.version.a); - if (httpversion > 101) { - return ServeError(505, "HTTP Version Not Supported"); - } - if (HasHeader(kHttpExpect) && !HeaderEquals(kHttpExpect, "100-continue")) { - return ServeError(417, "Expectation Failed"); - } - if (msg.method == kHttpConnect || - (HasHeader(kHttpTransferEncoding) && - !HeaderEquals(kHttpTransferEncoding, "identity"))) { - return ServeError(501, "Not Implemented"); - } - if (!HasHeader(kHttpContentLength) && - (msg.method == kHttpPost || msg.method == kHttpPut)) { - return ServeError(411, "Length Required"); - } - if ((cl = ParseContentLength(inbuf.p + msg.headers[kHttpContentLength].a, - msg.headers[kHttpContentLength].b - - msg.headers[kHttpContentLength].a)) == -1) { - return ServeError(400, "Bad Request"); - } - need = hdrsize + cl; /* synchronization is possible */ - if (need > inbuf.n) { - return ServeError(413, "Payload Too Large"); - } - if (HeaderEquals(kHttpExpect, "100-continue") && httpversion >= 101) { - SendContinue(); - } - while (amtread < need) { - if (++frags == 64) { - LogClose("payload fragged!"); - return ServeError(408, "Request Timeout"); - } - if ((rc = read(client, inbuf.p + amtread, inbuf.n - amtread)) != -1) { - if (!(got = rc)) { - LogClose("payload disconnect"); - return ServeError(400, "Bad Request"); - } - amtread += got; - } else if (errno == ECONNRESET) { - LogClose("payload reset"); - return ServeError(400, "Bad Request"); - } else if (errno == EINTR) { - if (killed || ((meltdown || terminated) && nowl() - startread > 1)) { - LogClose(DescribeClose()); - return ServeError(503, "Service Unavailable"); - } +static char *SynchronizeStream(void) { + size_t got; + ssize_t rc; + int64_t cl; + if ((cl = ParseContentLength(HeaderData(kHttpContentLength), + HeaderLength(kHttpContentLength))) == -1) { + if (HasHeader(kHttpContentLength)) { + LockInc(&shared->badlengths); + LOGF("bad content length"); + return ServeFailure(400, "Bad Request"); + } else if (msg.method == kHttpPost || msg.method == kHttpPut) { + LockInc(&shared->missinglengths); + return ServeFailure(411, "Length Required"); } else { - WARNF("%s payload recv %s", clientaddrstr, strerror(errno)); - return ServeError(500, "Internal Server Error"); + cl = 0; } } - msgsize = need; /* we are now synchronized */ - LogBody("received", inbuf.p + hdrsize, msgsize - hdrsize); - if (httpversion != 101 || !CompareHeader(kHttpConnection, "close")) { - connectionclose = true; + if (hdrsize + cl > amtread) { + if (hdrsize + cl > inbuf.n) { + LockInc(&shared->hugepayloads); + return ServeFailure(413, "Payload Too Large"); + } + if (msg.version >= 11 && HeaderEqualCase(kHttpExpect, "100-continue")) { + LockInc(&shared->continues); + SendContinue(); + } + while (amtread < hdrsize + cl) { + LockInc(&shared->frags); + if (++frags == 64) { + LockInc(&shared->slowloris); + LogClose("payload slowloris"); + return ServeFailure(408, "Request Timeout"); + } + if ((rc = read(client, inbuf.p + amtread, inbuf.n - amtread)) != -1) { + if (!(got = rc)) { + LockInc(&shared->payloaddisconnects); + LogClose("payload disconnect"); + return ServeFailure(400, "Bad Request"); /* XXX */ + } + amtread += got; + } else if (errno == ECONNRESET) { + LockInc(&shared->readresets); + LogClose("payload reset"); + return ServeFailure(400, "Bad Request"); /* XXX */ + } else if (errno == EAGAIN || errno == EWOULDBLOCK) { + LockInc(&shared->readtimeouts); + LogClose("payload read timeout"); + return ServeFailure(408, "Request Timeout"); + } else if (errno == EINTR) { + LockInc(&shared->readinterrupts); + if (killed || ((meltdown || terminated) && nowl() - startread > 1)) { + LockInc(&shared->dropped); + LogClose(DescribeClose()); + return ServeFailure(503, "Service Unavailable"); + } + } else { + LockInc(&shared->readerrors); + LOGF("%s payload read error %s", DescribeClient(), strerror(errno)); + return ServeFailure(500, "Internal Server Error"); + } + } } - ParseRequestUri(); - if (msg.method == kHttpOptions && - !CompareSlices(request.path.p, request.path.n, "*", 1)) { - return ServeServerOptions(); + msgsize = hdrsize + cl; + return NULL; +} + +static void ParseRequestParameters(void) { + uint32_t ip; + FreeLater(ParseRequestUri(inbuf.p + msg.uri.a, msg.uri.b - msg.uri.a, &url)); + if (!url.host.p) { + GetRemoteAddr(&ip, 0); + if (HasHeader(kHttpXForwardedHost) && + (IsPrivateIp(ip) || IsLoopbackIp(ip))) { + FreeLater(ParseHost(HeaderData(kHttpXForwardedHost), + HeaderLength(kHttpXForwardedHost), &url)); + } else if (HasHeader(kHttpHost)) { + FreeLater( + ParseHost(HeaderData(kHttpHost), HeaderLength(kHttpHost), &url)); + } + } else if (!url.path.n) { + url.path.p = "/"; + url.path.n = 1; } - if (!IsAcceptableHttpRequestPath(request.path.p, request.path.n)) { - WARNF("%s could not parse request %`'.*s", clientaddrstr, - msg.uri.b - msg.uri.a, inbuf.p + msg.uri.a); - connectionclose = true; - return ServeError(400, "Bad Request"); + if (HasHeader(kHttpContentType) && + IsMimeType(HeaderData(kHttpContentType), HeaderLength(kHttpContentType), + "application/x-www-form-urlencoded")) { + FreeLater(ParseParams(inbuf.p + hdrsize, msgsize - hdrsize, &url.params)); } - if (HeaderEquals(kHttpContentType, "application/x-www-form-urlencoded")) { - ParseFormParams(); - } - VERBOSEF("%s %s %`'.*s referrer %`'.*s", clientaddrstr, - kHttpMethod[msg.method], request.path.n, request.path.p, - msg.headers[kHttpReferer].b - msg.headers[kHttpReferer].a, - inbuf.p + msg.headers[kHttpReferer].a); - if ((a = LocateAsset(request.path.p, request.path.n))) { - return HandleAsset(a, request.path.p, request.path.n); - } else if ((r = FindRedirect(request.path.p, request.path.n)) != -1) { - return HandleRedirect(redirects.p + r); - } else if (!CompareSlices(request.path.p, request.path.n, "/", 1)) { - return ServeListing(); + FreeLater(url.params.p); +} + +static char *OnHttpRequest(void) { + effectivepath.p = url.path.p; + effectivepath.n = url.path.n; + lua_getglobal(L, "OnHttpRequest"); + if (lua_pcall(L, 0, 0, 0) == LUA_OK) { + return CommitOutput(GetLuaResponse()); } else { - return ServeError(404, "Not Found"); + WARNF("%s", lua_tostring(L, -1)); + lua_pop(L, 1); + return ServeError(500, "Internal Server Error"); } } -static bool HandleRequest(void) { - int rc; +static char *HandleRequest(void) { char *p; + if (msg.version < 10) { + LockInc(&shared->http09); + } else if (msg.version == 10) { + LockInc(&shared->http10); + } else if (msg.version == 11) { + LockInc(&shared->http11); + } else { + LockInc(&shared->http12); + return ServeFailure(505, "HTTP Version Not Supported"); + } + if ((p = SynchronizeStream())) return p; + if (logbodies) LogBody("received", inbuf.p + hdrsize, msgsize - hdrsize); + if (msg.version < 11 || HeaderEqualCase(kHttpConnection, "close")) { + connectionclose = true; + } + if (msg.method == kHttpOptions && + SlicesEqual(inbuf.p + msg.uri.a, msg.uri.b - msg.uri.a, "*", 1)) { + LockInc(&shared->serveroptions); + return ServeServerOptions(); + } + if (msg.method == kHttpConnect) { + LockInc(&shared->connectsrefused); + return ServeFailure(501, "Not Implemented"); + } + if (!HasAtMostThisElement(kHttpExpect, "100-continue")) { + LockInc(&shared->expectsrefused); + return ServeFailure(417, "Expectation Failed"); + } + if (!HasAtMostThisElement(kHttpTransferEncoding, "identity")) { + LockInc(&shared->transfersrefused); + return ServeFailure(501, "Not Implemented"); + } + ParseRequestParameters(); + if (!url.path.n || url.path.p[0] != '/' || + !IsAcceptablePath(url.path.p, url.path.n) || + !IsAcceptableHost(url.host.p, url.host.n) || + !IsAcceptablePort(url.port.p, url.port.n)) { + LockInc(&shared->urisrefused); + return ServeFailure(400, "Bad Request"); + } + LOGF("RECEIVED %s HTTP%02d %.*s %s %`'.*s %`'.*s", DescribeClient(), + msg.version, msg.xmethod.b - msg.xmethod.a, inbuf.p + msg.xmethod.a, + FreeLater(EncodeUrl(&url, 0)), HeaderLength(kHttpReferer), + HeaderData(kHttpReferer), HeaderLength(kHttpUserAgent), + HeaderData(kHttpUserAgent)); + if (hasluaglobalhandler) return OnHttpRequest(); + return Route(url.host.p, url.host.n, url.path.p, url.path.n); +} + +static bool HandleMessage(void) { + int rc; int iovlen; + char *p, *s; struct iovec iov[4]; long actualcontentlength; + g_syscount = 0; if ((rc = ParseHttpRequest(&msg, inbuf.p, amtread)) != -1) { if (!rc) return false; hdrsize = rc; - LogMessage("received", inbuf.p, hdrsize); - p = HandleMessage(); + if (logmessages) LogMessage("received", inbuf.p, hdrsize); + RecordNetworkOrigin(); + p = HandleRequest(); } else { - httpversion = 101; + LockInc(&shared->badmessages); connectionclose = true; - p = ServeError(400, "Bad Request"); - DEBUGF("%s received garbage %`'.*s", clientaddrstr, amtread, inbuf.p); + LOGF("%s sent garbage %`'s", DescribeClient(), + VisualizeControlCodes(inbuf.p, MIN(128, amtread), 0)); + p = ServeError(400, "Bad Message"); } if (!msgsize) { amtread = 0; connectionclose = true; - DEBUGF("%s could not synchronize message stream", clientaddrstr); - } else if (msgsize < amtread) { - DEBUGF("%s has %,ld pipelined bytes", clientaddrstr, amtread - msgsize); - memmove(inbuf.p, inbuf.p + msgsize, amtread - msgsize); - amtread -= msgsize; - } else { - amtread = 0; + LockInc(&shared->synchronizationfailures); + DEBUGF("could not synchronize message stream"); } - if (httpversion >= 100) { - p = AppendHeader(p, "Date", currentdate); - if (!branded) { - p = AppendHeader(p, "Server", serverheader); - } + if (0 && connectionclose) { + LockInc(&shared->shutdowns); + shutdown(client, SHUT_RD); + } + if (msg.version >= 10) { + p = AppendCrlf(stpcpy(stpcpy(p, "Date: "), shared->currentdate)); + if (!branded) p = AppendServer(p, serverheader); + if (extrahdrs) p = stpcpy(p, extrahdrs); if (connectionclose) { - p = AppendHeader(p, "Connection", "close"); - } else if (encouragekeepalive && httpversion >= 101) { - p = AppendHeader(p, "Connection", "keep-alive"); + p = stpcpy(p, "Connection: close\r\n"); + } else if (encouragekeepalive && msg.version >= 11) { + p = stpcpy(p, "Connection: keep-alive\r\n"); } actualcontentlength = contentlength; if (gzipped) { actualcontentlength += sizeof(kGzipHeader) + sizeof(gzip_footer); + p = stpcpy(p, "Content-Encoding: gzip\r\n"); } p = AppendContentLength(p, actualcontentlength); p = AppendCrlf(p); CHECK_LE(p - hdrbuf.p, hdrbuf.n); - LogMessage("sending", hdrbuf.p, p - hdrbuf.p); + if (logmessages) LogMessage("sending", hdrbuf.p, p - hdrbuf.p); iov[0].iov_base = hdrbuf.p; iov[0].iov_len = p - hdrbuf.p; iovlen = 1; @@ -2458,48 +4235,59 @@ static bool HandleRequest(void) { iov[0].iov_len = contentlength; iovlen = 1; } + if (loglatency || LOGGABLE(kLogDebug)) { + flogf(kLogDebug, __FILE__, __LINE__, NULL, "%`'.*s latency %,ldµs", + msg.uri.b - msg.uri.a, inbuf.p + msg.uri.a, + (long)((nowl() - startrequest) * 1e6L)); + } Send(iov, iovlen); - CollectGarbage(); + LockInc(&shared->messageshandled); + ++messageshandled; return true; } static void InitRequest(void) { frags = 0; + gzipped = 0; + branded = 0; + content = 0; msgsize = 0; - outbuf.p = 0; + loops.n = 0; outbuf.n = 0; - content = NULL; - gzipped = false; - branded = false; + luaheaderp = 0; contentlength = 0; InitHttpRequest(&msg); } -static void ProcessRequests(void) { +static void HandleMessages(void) { ssize_t rc; size_t got; - long double now; for (;;) { InitRequest(); startread = nowl(); for (;;) { - if (!msg.i && amtread && HandleRequest()) break; + if (!msg.i && amtread) { + startrequest = nowl(); + if (HandleMessage()) break; + } if ((rc = read(client, inbuf.p + amtread, inbuf.n - amtread)) != -1) { - startrequest = now = nowl(); - if (now - nowish > 1) UpdateCurrentDate(now); + startrequest = nowl(); got = rc; amtread += got; if (amtread) { - if (HandleRequest()) { + DEBUGF("%s read %,zd bytes", DescribeClient(), got); + if (HandleMessage()) { break; } else if (got) { + LockInc(&shared->frags); if (++frags == 32) { SendTimeout(); - LogClose("fragged!"); + LogClose("slowloris"); + LockInc(&shared->slowloris); return; } else { - DEBUGF("%s fragmented msg %,ld %,ld", clientaddrstr, amtread, - got); + DEBUGF("%s fragged msg added %,ld bytes to %,ld byte buffer", + DescribeClient(), amtread, got); } } } @@ -2507,40 +4295,74 @@ static void ProcessRequests(void) { LogClose("disconnect"); return; } + } else if (errno == EINTR) { + LockInc(&shared->readinterrupts); + } else if (errno == EAGAIN) { + LockInc(&shared->readtimeouts); + if (amtread) SendTimeout(); + LogClose("timeout"); + return; } else if (errno == ECONNRESET) { + LockInc(&shared->readresets); LogClose("reset"); return; - } else if (errno != EINTR) { - WARNF("%s recv msg %s", clientaddrstr, strerror(errno)); + } else { + LockInc(&shared->readerrors); + WARNF("%s read failed %s", DescribeClient(), strerror(errno)); return; } if (killed || (terminated && !amtread) || (meltdown && (!amtread || nowl() - startread > 1))) { - if (amtread) SendServiceUnavailable(); + if (amtread) { + LockInc(&shared->dropped); + SendServiceUnavailable(); + } LogClose(DescribeClose()); return; } } - if (connectionclose || killed || ((terminated || meltdown) && !amtread)) { - LogClose(DescribeClose()); - return; + if (msgsize == amtread) { + amtread = 0; + if (connectionclose || killed || terminated || meltdown) { + LogClose(DescribeClose()); + return; + } + } else { + CHECK_LT(msgsize, amtread); + LockInc(&shared->pipelinedrequests); + DEBUGF("%,ld pipelined bytes", amtread - msgsize); + memmove(inbuf.p, inbuf.p + msgsize, amtread - msgsize); + amtread -= msgsize; + if (connectionclose || killed) { + LogClose(DescribeClose()); + return; + } } + CollectGarbage(); } } static void EnterMeltdownMode(void) { - if (lastmeltdown && nowl() - lastmeltdown < 1) return; - WARNF("redbean is entering meltdown mode with %,d workers", shared->workers); + if (shared->lastmeltdown && nowl() - shared->lastmeltdown < 1) return; + WARNF("redbean is melting down (%,d workers)", shared->workers); LOGIFNEG1(kill(0, SIGUSR2)); - lastmeltdown = nowl(); + shared->lastmeltdown = nowl(); + ++shared->meltdowns; } -static void ProcessConnection(void) { +static void EmergencyClose(int fd) { + struct linger nolinger = {0}; + setsockopt(fd, SOL_SOCKET, SO_LINGER, &nolinger, sizeof(nolinger)); + close(fd); +} + +static void HandleConnection(void) { int pid; clientaddrsize = sizeof(clientaddr); if ((client = accept4(server, &clientaddr, &clientaddrsize, SOCK_CLOEXEC)) != -1) { startconnection = nowl(); + messageshandled = 0; if (uniprocess) { pid = -1; connectionclose = true; @@ -2549,46 +4371,128 @@ static void ProcessConnection(void) { case 0: meltdown = false; connectionclose = false; + if (funtrace && !IsTiny()) { + ftrace_install(); + } break; case -1: + FATALF("%s too many processes %s", DescribeServer(), strerror(errno)); + ++shared->forkerrors; + LockInc(&shared->dropped); EnterMeltdownMode(); SendServiceUnavailable(); - /* fallthrough */ + EmergencyClose(client); + return; default: ++shared->workers; close(client); return; } } - DescribeAddress(clientaddrstr, &clientaddr); - DEBUGF("%s accept", clientaddrstr); - ProcessRequests(); - LOGIFNEG1(close(client)); - if (!pid) _exit(0); - } else if (errno != EINTR) { - FATALF("%s accept error %s", serveraddrstr, strerror(errno)); + if (!pid) close(server); + DEBUGF("%s accepted", DescribeClient()); + HandleMessages(); + DEBUGF("%s closing after %,ldµs", DescribeClient(), + (long)((nowl() - startconnection) * 1e6L)); + if (close(client) == -1) { + LockInc(&shared->closeerrors); + WARNF("%s close failed", DescribeClient()); + } + if (!pid) { + _exit(0); + } else { + CollectGarbage(); + } + } else if (errno == EINTR || errno == EAGAIN) { + ++shared->acceptinterrupts; + } else if (errno == ENFILE) { + LockInc(&shared->enfiles); + WARNF("%s too many open files", DescribeServer()); + EnterMeltdownMode(); + } else if (errno == EMFILE) { + LockInc(&shared->emfiles); + WARNF("%s ran out of open file quota", DescribeServer()); + EnterMeltdownMode(); + } else if (errno == ENOMEM) { + LockInc(&shared->enomems); + WARNF("%s ran out of memory"); + EnterMeltdownMode(); + } else if (errno == ENOBUFS) { + LockInc(&shared->enobufs); + WARNF("%s ran out of buffer"); + EnterMeltdownMode(); + } else if (errno == ENONET) { + ++shared->enonets; + WARNF("%s network gone", DescribeServer()); + sleep(1); + } else if (errno == ENETDOWN) { + ++shared->enetdowns; + WARNF("%s network down", DescribeServer()); + sleep(1); + } else if (errno == ECONNABORTED) { + ++shared->acceptresets; + WARNF("%s connection reset before accept"); + } else if (errno == ENETUNREACH || errno == EHOSTUNREACH || + errno == EOPNOTSUPP || errno == ENOPROTOOPT || errno == EPROTO) { + ++shared->accepterrors; + WARNF("%s ephemeral accept error %s", DescribeServer(), strerror(errno)); + } else { + FATALF("%s accept error %s", DescribeServer(), strerror(errno)); } } -static void TuneServerSocket(void) { - int yes = 1; - LOGIFNEG1(setsockopt(server, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes))); - LOGIFNEG1(setsockopt(server, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(yes))); - LOGIFNEG1(setsockopt(server, IPPROTO_TCP, TCP_NODELAY, &yes, sizeof(yes))); - LOGIFNEG1(setsockopt(server, IPPROTO_TCP, TCP_FASTOPEN, &yes, sizeof(yes))); - LOGIFNEG1(setsockopt(server, IPPROTO_TCP, TCP_QUICKACK, &yes, sizeof(yes))); +static void Tune(int a, int b, int x, const char *as, const char *bs) { +#define Tune(A, B, X) Tune(A, B, X, #A, #B) + if (!b) return; + if (setsockopt(server, a, b, &x, sizeof(x)) == -1) { + WARNF("setsockopt(server, %s, %s, %d) failed %s", as, bs, x, + strerror(errno)); + } } -void RedBean(int argc, char *argv[]) { +static void TuneSockets(void) { + Tune(SOL_SOCKET, SO_REUSEADDR, 1); + Tune(IPPROTO_TCP, TCP_CORK, 0); + Tune(IPPROTO_TCP, TCP_NODELAY, 1); + Tune(IPPROTO_TCP, TCP_FASTOPEN, 1); + Tune(IPPROTO_TCP, TCP_QUICKACK, 1); + setsockopt(server, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger)); + setsockopt(server, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)); + setsockopt(server, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout)); +} + +static void RestoreApe(const char *prog) { + char *p; + size_t n; + struct Asset *a; + extern char ape_rom_vaddr[] __attribute__((__weak__)); + if (IsWindows()) return; /* TODO */ + if (IsOpenbsd()) return; /* TODO */ + if (IsNetbsd()) return; /* TODO */ + if (endswith(prog, ".com.dbg")) return; + close(OpenExecutable()); + if ((a = GetAssetZip("/.ape", 5)) && (p = LoadAsset(a, &n))) { + mprotect(ape_rom_vaddr, PAGESIZE, PROT_READ | PROT_WRITE); + memcpy(ape_rom_vaddr, p, MIN(n, PAGESIZE)); + msync(ape_rom_vaddr, PAGESIZE, MS_ASYNC); + mprotect(ape_rom_vaddr, PAGESIZE, PROT_NONE); + free(p); + } else { + LOGF("/.ape not found"); + } +} + +void RedBean(int argc, char *argv[], const char *prog) { uint32_t addrsize; - gmtoff = GetGmtOffset(); + gmtoff = GetGmtOffset((lastrefresh = startserver = nowl())); + CHECK_GT(CLK_TCK, 0); CHECK_NE(MAP_FAILED, (shared = mmap(NULL, ROUNDUP(sizeof(struct Shared), FRAMESIZE), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0))); - OpenZip((const char *)getauxval(AT_EXECFN)); + OpenZip(prog); IndexAssets(); - LoadLogo(); + RestoreApe(prog); SetDefaults(); GetOpts(argc, argv); LuaInit(); @@ -2601,12 +4505,13 @@ void RedBean(int argc, char *argv[]) { xsigaction(SIGUSR2, OnUsr2, 0, 0, 0); xsigaction(SIGALRM, OnAlrm, 0, 0, 0); xsigaction(SIGPIPE, SIG_IGN, 0, 0, 0); + /* TODO(jart): SIGXCPU and SIGXFSZ */ if (setitimer(ITIMER_REAL, &kHeartbeat, NULL) == -1) { heartless = true; } - CHECK_NE(-1, - (server = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP))); - TuneServerSocket(); + server = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP); + CHECK_NE(-1, server); + TuneSockets(); if (bind(server, &serveraddr, sizeof(serveraddr)) == -1) { if (errno == EADDRINUSE) { fprintf(stderr, "error: address in use\n" @@ -2616,50 +4521,61 @@ void RedBean(int argc, char *argv[]) { } exit(1); } - if (daemonize) Daemonize(); CHECK_NE(-1, listen(server, 10)); addrsize = sizeof(serveraddr); CHECK_NE(-1, getsockname(server, &serveraddr, &addrsize)); - DescribeAddress(serveraddrstr, &serveraddr); - VERBOSEF("%s listen", serveraddrstr); + VERBOSEF("LISTEN %s", DescribeServer()); if (printport) { printf("%d\n", ntohs(serveraddr.sin_port)); fflush(stdout); } + if (daemonize) Daemonize(); UpdateCurrentDate(nowl()); - inbuf.n = 64 * 1024; - inbuf.p = xvalloc(inbuf.n); + freelist.c = 8; + freelist.p = xcalloc(freelist.c, sizeof(*freelist.p)); + unmaplist.c = 1; + unmaplist.p = xcalloc(unmaplist.c, sizeof(*unmaplist.p)); hdrbuf.n = 4 * 1024; hdrbuf.p = xvalloc(hdrbuf.n); + inbuf.n = 64 * 1024; + inbuf.p = xvalloc(inbuf.n); while (!terminated) { if (zombied) { ReapZombies(); } else if (invalidated) { - LuaReload(); + HandleReload(); invalidated = false; } else if (heartbeat) { - UpdateCurrentDate(nowl()); + HandleHeartbeat(); heartbeat = false; + } else if (meltdown) { + EnterMeltdownMode(); + meltdown = false; } else { - if (heartless) { - UpdateCurrentDate(nowl()); - } - ProcessConnection(); + if (heartless) HandleHeartbeat(); + HandleConnection(); } } - VERBOSEF("%s shutting down", serveraddrstr); LOGIFNEG1(close(server)); - if (!keyboardinterrupt) { + if (keyboardinterrupt) { + LOGF("received keyboard interrupt"); + } else { + LOGF("received term signal"); if (!killed) { terminated = false; } + DEBUGF("sending TERM to process group"); LOGIFNEG1(kill(0, SIGTERM)); } WaitAll(); + VERBOSEF("shutdown complete"); } int main(int argc, char *argv[]) { - showcrashreports(); - RedBean(argc, argv); + if (!IsTiny()) { + setenv("GDB", "", true); + showcrashreports(); + } + RedBean(argc, argv, (const char *)getauxval(AT_EXECFN)); return 0; } diff --git a/tool/net/redbean.lua b/tool/net/redbean.lua deleted file mode 100644 index ec8716733..000000000 --- a/tool/net/redbean.lua +++ /dev/null @@ -1,115 +0,0 @@ --- redbean lua server page demo - -local function main() - -- This is the best way to print data to the console or log file. - Log(kLogWarn, "hello from \e[1mlua\e[0m!") - - -- This check is pedantic but might be good to have. - if GetMethod() ~= 'GET' and GetMethod() ~= 'HEAD' then - ServeError(405) - SetHeader('Allow', 'GET, HEAD') - return - end - - -- These two lines are optional. - -- The default behavior is to do this if you don't. - SetStatus(200) -- Shorthand for SetStatus(200, "OK") - SetHeader('Content-Type', 'text/html; charset=utf-8') - - -- Response data is buffered until the script finishes running. - -- Compression is applied automatically, based on your headers. - Write('\n') - Write('redbean\n') - Write('

redbean lua server page demo

\n') - - -- Prevent caching. - -- We need this because we're doing things like putting the client's - -- IP address in the response so we naturally don't want that cached - SetHeader('Expires', FormatHttpDateTime(GetDate())) - SetHeader('Cache-Control', 'no-cache, must-revalidate, max-age=0') - - -- GetParams() returns an ordered list of Request-URI query params. - Write('

request uri parameters

\n') - params = GetParams() - if #params > 0 then - Write('
\n') - for i = 1,#params do - Write('
') - Write(EscapeHtml(params[i][1])) - Write('\n') - if params[i][2] then - Write('
') - Write(EscapeHtml(params[i][2])) - Write('\n') - end - end - Write('
\n') - else - Write('

\n') - Write('none
\n') - Write('ProTip: Try clicking here!\n') - end - - -- Access redbean command line arguments. - -- These are the ones that come *after* the redbean server arguments. - Write('

command line arguments

\n') - if #argv > 0 then - Write('
    \n') - for i = 1,#argv do - Write('
  • ') - Write(EscapeHtml(argv[i])) - Write('\n') - end - Write('
\n') - else - Write('

none\n') - end - - Write([[ -

post request html form demo

-
- - -
- - -
- -
- ]]) - - Write([[ -

xmlhttprequest request demo

- -
-
-
- - ]]) - - Write('

extra information

\n') - Write('
GetClientAddr()\n') - Write('
') - Write(GetClientAddr()) - Write('\n') - Write('
GetServerAddr()\n') - Write('
') - Write(GetServerAddr()) - Write('\n') - Write('\n') -end - -main()