From phk at FreeBSD.org Mon Aug 12 07:27:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 12 Aug 2024 07:27:08 +0000 (UTC) Subject: [master] 40db9fcb4 varnishhist: fix help for -P to mention E Message-ID: <20240812072708.40A7711CBA8@lists.varnish-cache.org> commit 40db9fcb42cf5aa327788047553def51c6e46872 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:53:58 2024 -0400 varnishhist: fix help for -P to mention E Followup to 3b74d51ce31755df536ca25e4cf4f7f58de0ee36 diff --git a/bin/varnishhist/varnishhist_options.h b/bin/varnishhist/varnishhist_options.h index c575bc85f..7c22df208 100644 --- a/bin/varnishhist/varnishhist_options.h +++ b/bin/varnishhist/varnishhist_options.h @@ -49,7 +49,7 @@ ) #define HIS_OPT_P \ - VOPT("P:", "[-P <[cb:]tag:[prefix]:field_num[:min:max]>]", \ + VOPT("P:", "[-P <[cbE:]tag:[prefix]:field_num[:min:max]>]", \ "Custom profile definition", \ "Graph the given custom definition defined as: an optional" \ " (c)lient, (b)ackend or (E)SI filter (defaults to client),"\ From nils.goroll at uplex.de Mon Aug 12 13:19:07 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Mon, 12 Aug 2024 13:19:07 +0000 (UTC) Subject: [master] b1b8947c9 Revert "vrb: Turn BS_TAKEN into a request flag" Message-ID: <20240812131907.512F51004AB@lists.varnish-cache.org> commit b1b8947c92fd7fe6d6d4af26c36fb7bf0fc16259 Author: Nils Goroll Date: Wed Jul 31 20:19:47 2024 +0200 Revert "vrb: Turn BS_TAKEN into a request flag" This reverts commit f0e9df843d28bb55e9acea9b73ae4ccc658d033f. diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c index ef11def8f..185ed67eb 100644 --- a/bin/varnishd/cache/cache_fetch.c +++ b/bin/varnishd/cache/cache_fetch.c @@ -141,8 +141,11 @@ Bereq_Rollback(VRT_CTX) bo = ctx->bo; CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC); - if (bo->htc != NULL && bo->htc->body_status != BS_NONE) - bo->htc->doclose = SC_RESP_CLOSE; + if (bo->htc != NULL) { + assert(bo->htc->body_status != BS_TAKEN); + if (bo->htc->body_status != BS_NONE) + bo->htc->doclose = SC_RESP_CLOSE; + } vbf_cleanup(bo); VCL_TaskLeave(ctx, bo->privs); diff --git a/bin/varnishd/cache/cache_req_body.c b/bin/varnishd/cache/cache_req_body.c index 49179a9d9..fa4b4062b 100644 --- a/bin/varnishd/cache/cache_req_body.c +++ b/bin/varnishd/cache/cache_req_body.c @@ -207,7 +207,7 @@ VRB_Iterate(struct worker *wrk, struct vsl_log *vsl, } if (req->req_body_status == BS_NONE) return (0); - if (req->req_body_taken) { + if (req->req_body_status == BS_TAKEN) { VSLb(vsl, SLT_VCL_Error, "Uncached req.body can only be consumed once."); return (-1); @@ -219,7 +219,7 @@ VRB_Iterate(struct worker *wrk, struct vsl_log *vsl, } Lck_Lock(&req->sp->mtx); if (req->req_body_status->avail > 0) { - req->req_body_taken = 1; + req->req_body_status = BS_TAKEN; i = 0; } else i = -1; @@ -277,7 +277,6 @@ VRB_Free(struct req *req) CHECK_OBJ_NOTNULL(req, REQ_MAGIC); - req->req_body_taken = 0; if (req->body_oc == NULL) { AZ(req->req_body_cached); return; diff --git a/include/tbl/body_status.h b/include/tbl/body_status.h index e9464381f..39c45b4fb 100644 --- a/include/tbl/body_status.h +++ b/include/tbl/body_status.h @@ -38,6 +38,7 @@ BODYSTATUS(ERROR, error, 1, -1, 0) BODYSTATUS(CHUNKED, chunked, 2, 1, 0) BODYSTATUS(LENGTH, length, 3, 1, 1) BODYSTATUS(EOF, eof, 4, 1, 0) +BODYSTATUS(TAKEN, taken, 5, 0, 0) #undef BODYSTATUS /*lint -restore */ diff --git a/include/tbl/req_flags.h b/include/tbl/req_flags.h index cee216749..282bd92ea 100644 --- a/include/tbl/req_flags.h +++ b/include/tbl/req_flags.h @@ -42,7 +42,6 @@ REQ_FLAG(want100cont, 0, 0, "") REQ_FLAG(late100cont, 0, 0, "") REQ_FLAG(req_reset, 0, 0, "") REQ_FLAG(req_body_cached, 0, 0, "") -REQ_FLAG(req_body_taken, 0, 0, "") #define REQ_BEREQ_FLAG(lower, vcl_r, vcl_w, doc) \ REQ_FLAG(lower, vcl_r, vcl_w, doc) #include "tbl/req_bereq_flags.h" From nils.goroll at uplex.de Mon Aug 12 13:19:07 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Mon, 12 Aug 2024 13:19:07 +0000 (UTC) Subject: [master] e5b0ea597 Revert "vrb: Turn BS_CACHED into a request flag" Message-ID: <20240812131907.679E81004AD@lists.varnish-cache.org> commit e5b0ea5976063e3e8b17118a8463e1309507b16c Author: Nils Goroll Date: Wed Jul 31 20:19:50 2024 +0200 Revert "vrb: Turn BS_CACHED into a request flag" This reverts commit 58ed5c9f617d0c11b4cd96f9278e6b5babd833ec. diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c index 185ed67eb..b56cae814 100644 --- a/bin/varnishd/cache/cache_fetch.c +++ b/bin/varnishd/cache/cache_fetch.c @@ -289,15 +289,15 @@ vbf_stp_mkbereq(struct worker *wrk, struct busyobj *bo) bo->ws_bo = WS_Snapshot(bo->ws); HTTP_Clone(bo->bereq, bo->bereq0); - if (bo->req->req_body_cached) { + if (bo->req->req_body_status->avail == 0) { + bo->req = NULL; + ObjSetState(bo->wrk, oc, BOS_REQ_DONE); + } else if (bo->req->req_body_status == BS_CACHED) { AN(bo->req->body_oc); bo->bereq_body = bo->req->body_oc; HSH_Ref(bo->bereq_body); bo->req = NULL; ObjSetState(bo->wrk, oc, BOS_REQ_DONE); - } else if (bo->req->req_body_status->avail == 0) { - bo->req = NULL; - ObjSetState(bo->wrk, oc, BOS_REQ_DONE); } return (F_STP_STARTFETCH); } diff --git a/bin/varnishd/cache/cache_req_body.c b/bin/varnishd/cache/cache_req_body.c index fa4b4062b..f2c894cc0 100644 --- a/bin/varnishd/cache/cache_req_body.c +++ b/bin/varnishd/cache/cache_req_body.c @@ -177,7 +177,7 @@ vrb_pull(struct req *req, ssize_t maxsize, objiterate_f *func, void *priv) (uintmax_t)req_bodybytes); } - req->req_body_cached = 1; + req->req_body_status = BS_CACHED; return (req_bodybytes); } @@ -199,7 +199,7 @@ VRB_Iterate(struct worker *wrk, struct vsl_log *vsl, CHECK_OBJ_NOTNULL(req, REQ_MAGIC); AN(func); - if (req->req_body_cached) { + if (req->req_body_status == BS_CACHED) { AN(req->body_oc); if (ObjIterate(wrk, req->body_oc, priv, func, 0)) return (-1); @@ -277,13 +277,10 @@ VRB_Free(struct req *req) CHECK_OBJ_NOTNULL(req, REQ_MAGIC); - if (req->body_oc == NULL) { - AZ(req->req_body_cached); + if (req->body_oc == NULL) return; - } r = HSH_DerefObjCore(req->wrk, &req->body_oc, 0); - req->req_body_cached = 0; // each busyobj may have gained a reference assert (r >= 0); @@ -315,13 +312,13 @@ VRB_Cache(struct req *req, ssize_t maxsize) * where we know we will have no competition or conflicts for the * updates to req.http.* etc. */ - if (req->restarts > 0 && !req->req_body_cached) { + if (req->restarts > 0 && req->req_body_status != BS_CACHED) { VSLb(req->vsl, SLT_VCL_Error, "req.body must be cached before restarts"); return (-1); } - if (req->req_body_cached) { + if (req->req_body_status == BS_CACHED) { AZ(ObjGetU64(req->wrk, req->body_oc, OA_LEN, &u)); return (u); } diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c index 31929e123..ed97a0110 100644 --- a/bin/varnishd/cache/cache_req_fsm.c +++ b/bin/varnishd/cache/cache_req_fsm.c @@ -813,7 +813,7 @@ cnt_pipe(struct worker *wrk, struct req *req) bo->req = req; bo->wrk = wrk; /* Unless cached, reqbody is not our job */ - if (!req->req_body_cached) + if (req->req_body_status != BS_CACHED) req->req_body_status = BS_NONE; SES_Close(req->sp, VDI_Http1Pipe(req, bo)); nxt = REQ_FSM_DONE; @@ -900,7 +900,6 @@ cnt_recv_prep(struct req *req, const char *ci) req->client_identity = NULL; req->storage = NULL; req->trace = FEATURE(FEATURE_TRACE); - AZ(req->req_body_cached); } req->is_hit = 0; diff --git a/bin/varnishd/http1/cache_http1_fetch.c b/bin/varnishd/http1/cache_http1_fetch.c index b1918253d..4ea37e1d3 100644 --- a/bin/varnishd/http1/cache_http1_fetch.c +++ b/bin/varnishd/http1/cache_http1_fetch.c @@ -119,7 +119,7 @@ V1F_SendReq(struct worker *wrk, struct busyobj *bo, uint64_t *ctr_hdrbytes, V1L_Chunked(wrk); i = VRB_Iterate(wrk, bo->vsl, bo->req, vbf_iter_req_body, bo); - if (!bo->req->req_body_cached) + if (bo->req->req_body_status != BS_CACHED) bo->no_retry = "req.body not cached"; if (bo->req->req_body_status == BS_ERROR) { diff --git a/include/tbl/body_status.h b/include/tbl/body_status.h index 39c45b4fb..108345c6c 100644 --- a/include/tbl/body_status.h +++ b/include/tbl/body_status.h @@ -39,6 +39,7 @@ BODYSTATUS(CHUNKED, chunked, 2, 1, 0) BODYSTATUS(LENGTH, length, 3, 1, 1) BODYSTATUS(EOF, eof, 4, 1, 0) BODYSTATUS(TAKEN, taken, 5, 0, 0) +BODYSTATUS(CACHED, cached, 6, 2, 1) #undef BODYSTATUS /*lint -restore */ diff --git a/include/tbl/req_flags.h b/include/tbl/req_flags.h index 282bd92ea..6a9e6acbb 100644 --- a/include/tbl/req_flags.h +++ b/include/tbl/req_flags.h @@ -41,7 +41,6 @@ REQ_FLAG(waitinglist, 0, 0, "") REQ_FLAG(want100cont, 0, 0, "") REQ_FLAG(late100cont, 0, 0, "") REQ_FLAG(req_reset, 0, 0, "") -REQ_FLAG(req_body_cached, 0, 0, "") #define REQ_BEREQ_FLAG(lower, vcl_r, vcl_w, doc) \ REQ_FLAG(lower, vcl_r, vcl_w, doc) #include "tbl/req_bereq_flags.h" From nils.goroll at uplex.de Mon Aug 12 13:19:07 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Mon, 12 Aug 2024 13:19:07 +0000 (UTC) Subject: [master] 8c4ae4f0e Revert "fetch: A beresp body cannot be BS_TAKEN" Message-ID: <20240812131907.9FDAA1004B5@lists.varnish-cache.org> commit 8c4ae4f0e1c1990a48884b36e2b3e9acc8d162a1 Author: Nils Goroll Date: Wed Jul 31 20:37:02 2024 +0200 Revert "fetch: A beresp body cannot be BS_TAKEN" correct, but bo->htc->body_status is about the be*req* body This reverts commit f4b045031cbd343fabca4e7d8ef0a7e14c4dbb62. diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c index b56cae814..647201b7a 100644 --- a/bin/varnishd/cache/cache_fetch.c +++ b/bin/varnishd/cache/cache_fetch.c @@ -141,11 +141,10 @@ Bereq_Rollback(VRT_CTX) bo = ctx->bo; CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC); - if (bo->htc != NULL) { - assert(bo->htc->body_status != BS_TAKEN); - if (bo->htc->body_status != BS_NONE) - bo->htc->doclose = SC_RESP_CLOSE; - } + if (bo->htc != NULL && + bo->htc->body_status != BS_NONE && + bo->htc->body_status != BS_TAKEN) + bo->htc->doclose = SC_RESP_CLOSE; vbf_cleanup(bo); VCL_TaskLeave(ctx, bo->privs); From nils.goroll at uplex.de Mon Aug 12 13:19:07 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Mon, 12 Aug 2024 13:19:07 +0000 (UTC) Subject: [master] db83e6d20 Revert "vrb: Don't cache an empty body" Message-ID: <20240812131907.8550C1004B0@lists.varnish-cache.org> commit db83e6d20b420e55acf31c23c8c4c98016ac67af Author: Nils Goroll Date: Wed Jul 31 20:19:51 2024 +0200 Revert "vrb: Don't cache an empty body" This reverts commit dbd9bd12d7e15bd364d23c0f32b1190154c7cc3f. diff --git a/bin/varnishd/cache/cache_req_body.c b/bin/varnishd/cache/cache_req_body.c index f2c894cc0..51d45471e 100644 --- a/bin/varnishd/cache/cache_req_body.c +++ b/bin/varnishd/cache/cache_req_body.c @@ -66,7 +66,6 @@ vrb_pull(struct req *req, ssize_t maxsize, objiterate_f *func, void *priv) CHECK_OBJ_NOTNULL(req->htc, HTTP_CONN_MAGIC); CHECK_OBJ_NOTNULL(req->vfc, VFP_CTX_MAGIC); vfc = req->vfc; - AN(maxsize); req->body_oc = HSH_Private(req->wrk); AN(req->body_oc); @@ -301,11 +300,7 @@ VRB_Cache(struct req *req, ssize_t maxsize) CHECK_OBJ_NOTNULL(req, REQ_MAGIC); assert (req->req_step == R_STP_RECV); - - if (maxsize <= 0) { - VSLb(req->vsl, SLT_VCL_Error, "Cannot cache an empty req.body"); - return (-1); - } + assert(maxsize >= 0); /* * We only allow caching to happen the first time through vcl_recv{} diff --git a/bin/varnishtest/tests/c00055.vtc b/bin/varnishtest/tests/c00055.vtc index 1656baa61..048421967 100644 --- a/bin/varnishtest/tests/c00055.vtc +++ b/bin/varnishtest/tests/c00055.vtc @@ -17,8 +17,7 @@ varnish v1 -vcl+backend { import std; sub vcl_recv { - set req.http.stored = std.cache_req_body( - std.bytes(req.http.cache, 1KB)); + set req.http.stored = std.cache_req_body(1KB); return (pass); } @@ -75,45 +74,3 @@ client c5 { txreq -req POST -hdr "Content-Length: 1025" expect_close } -run - -server s1 { - rxreq - expect req.body == chunked_body - txresp -} -start - -client c6 { - txreq -req POST -nolen -hdr "Transfer-Encoding: chunked" - chunked chunked - chunked _ - chunked body - chunkedlen 0 - rxresp - expect resp.http.stored == true -} -run - -server s1 { - rxreq - expect req.bodylen == 0 - txresp -} -start - -client c7 { - txreq -req POST -nolen -hdr "Transfer-Encoding: chunked" - chunkedlen 0 - rxresp - expect resp.http.stored == true -} -run - -server s1 { - rxreq - expect req.bodylen == 0 - txresp -} -start - -client c8 { - txreq -req POST -nolen -hdr "cache: 0B" -hdr "Transfer-Encoding: chunked" - chunkedlen 0 - rxresp - expect resp.http.stored == false -} -run From nils.goroll at uplex.de Mon Aug 12 13:54:08 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Mon, 12 Aug 2024 13:54:08 +0000 (UTC) Subject: [master] 830525b63 jail: Add a Linux jail Message-ID: <20240812135408.7FE9C101C23@lists.varnish-cache.org> commit 830525b63e5f4d42c52f1ea11c7c095a1b0edb20 Author: Thibaut Artis Date: Tue Jul 2 15:46:31 2024 +0200 jail: Add a Linux jail For now this jail delegates its work to the UNIX jail It is chosen as default on Linux systems diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am index aabfce050..14067b466 100644 --- a/bin/varnishd/Makefile.am +++ b/bin/varnishd/Makefile.am @@ -84,6 +84,7 @@ varnishd_SOURCES = \ mgt/mgt_jail_solaris.c \ mgt/mgt_jail_solaris_tbl.h \ mgt/mgt_jail_unix.c \ + mgt/mgt_jail_linux.c \ mgt/mgt_main.c \ mgt/mgt_param.c \ mgt/mgt_param_tcp.c \ diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h index 5b75a2da3..4c40e7ccf 100644 --- a/bin/varnishd/mgt/mgt.h +++ b/bin/varnishd/mgt/mgt.h @@ -163,6 +163,7 @@ void VJ_rmdir(const char *); extern const struct jail_tech jail_tech_unix; extern const struct jail_tech jail_tech_solaris; +extern const struct jail_tech jail_tech_linux; /* mgt_main.c */ extern struct vsb *vident; diff --git a/bin/varnishd/mgt/mgt_jail.c b/bin/varnishd/mgt/mgt_jail.c index 93711799c..769e854a1 100644 --- a/bin/varnishd/mgt/mgt_jail.c +++ b/bin/varnishd/mgt/mgt_jail.c @@ -85,6 +85,9 @@ static const struct jail_tech *vjt; static const struct choice vj_choice[] = { #ifdef HAVE_SETPPRIV { "solaris", &jail_tech_solaris }, +#endif +#ifdef __linux__ + { "linux", &jail_tech_linux }, #endif { "unix", &jail_tech_unix }, { "none", &jail_tech_none }, diff --git a/bin/varnishd/mgt/mgt_jail_linux.c b/bin/varnishd/mgt/mgt_jail_linux.c new file mode 100644 index 000000000..f6c2a515b --- /dev/null +++ b/bin/varnishd/mgt/mgt_jail_linux.c @@ -0,0 +1,83 @@ +/*- + * Copyright (c) 2024 Varnish Software AS + * All rights reserved. + * + * Author: Thibaut Artis + * + * SPDX-License-Identifier: BSD-2-Clause + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include "config.h" + +#ifdef __linux__ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "mgt/mgt.h" +#include "common/heritage.h" + +static int vjl_init(char **args) { + return jail_tech_unix.init(args); +} + +static void vjl_master(enum jail_master_e jme) { + jail_tech_unix.master(jme); +} + +static void vjl_subproc(enum jail_subproc_e jse) { + jail_tech_unix.subproc(jse); +} + +static int vjl_make_subdir(const char *dname, const char *what, struct vsb *vsb) { + return jail_tech_unix.make_subdir(dname, what, vsb); +} + +static int vjl_make_workdir(const char *dname, const char *what, struct vsb *vsb) { + return jail_tech_unix.make_workdir(dname, what, vsb); +} + +static void vjl_fixfd(int fd, enum jail_fixfd_e what) { + return jail_tech_unix.fixfd(fd, what); +} + +const struct jail_tech jail_tech_linux = { + .magic = JAIL_TECH_MAGIC, + .name = "linux", + .init = vjl_init, + .master = vjl_master, + .make_subdir = vjl_make_subdir, + .make_workdir = vjl_make_workdir, + .fixfd = vjl_fixfd, + .subproc = vjl_subproc, +}; + +#endif /* __linux__ */ diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c index d6fe6bef3..2efd43d23 100644 --- a/bin/varnishd/mgt/mgt_main.c +++ b/bin/varnishd/mgt/mgt_main.c @@ -176,6 +176,9 @@ usage(void) printf(FMT, "-j jail[,options]", "Jail specification"); #ifdef HAVE_SETPPRIV printf(FMT, "", " -j solaris"); +#endif +#ifdef __linux__ + printf(FMT, "", " -j linux"); #endif printf(FMT, "", " -j unix"); printf(FMT, "", " -j none"); diff --git a/doc/sphinx/reference/varnishd.rst b/doc/sphinx/reference/varnishd.rst index 7db93dcf2..9132b3bea 100644 --- a/doc/sphinx/reference/varnishd.rst +++ b/doc/sphinx/reference/varnishd.rst @@ -445,6 +445,11 @@ specific options. Available jails are: -j solaris,worker=basic +-j + + Default on Linux platforms, it overloads the UNIX jail with + Linux-specific mechanisms. + -j Default on all other platforms when `varnishd` is started with an From nils.goroll at uplex.de Mon Aug 12 13:54:08 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Mon, 12 Aug 2024 13:54:08 +0000 (UTC) Subject: [master] 200f3060d jail: Move linux specific code from unix to linux jail Message-ID: <20240812135408.B04BC101C26@lists.varnish-cache.org> commit 200f3060daa5bf93e0ca821fec140dce30aa3a02 Author: Thibaut Artis Date: Tue Jul 2 16:03:38 2024 +0200 jail: Move linux specific code from unix to linux jail diff --git a/bin/varnishd/mgt/mgt_jail_linux.c b/bin/varnishd/mgt/mgt_jail_linux.c index f6c2a515b..1b18cf15b 100644 --- a/bin/varnishd/mgt/mgt_jail_linux.c +++ b/bin/varnishd/mgt/mgt_jail_linux.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include "mgt/mgt.h" @@ -55,6 +56,14 @@ static void vjl_master(enum jail_master_e jme) { static void vjl_subproc(enum jail_subproc_e jse) { jail_tech_unix.subproc(jse); + /* + * On linux mucking about with uid/gid disables core-dumps, + * reenable them again. + */ + if (prctl(PR_SET_DUMPABLE, 1) != 0) { + MGT_Complain(C_INFO, + "Could not set dumpable bit. Core dumps turned off"); + } } static int vjl_make_subdir(const char *dname, const char *what, struct vsb *vsb) { diff --git a/bin/varnishd/mgt/mgt_jail_unix.c b/bin/varnishd/mgt/mgt_jail_unix.c index ecb51ffac..c6cab790a 100644 --- a/bin/varnishd/mgt/mgt_jail_unix.c +++ b/bin/varnishd/mgt/mgt_jail_unix.c @@ -44,10 +44,6 @@ #include "mgt/mgt.h" #include "common/heritage.h" -#ifdef __linux__ -#include -#endif - static gid_t vju_mgt_gid; static uid_t vju_uid; static gid_t vju_gid; @@ -229,17 +225,6 @@ vju_subproc(enum jail_subproc_e jse) } else { AZ(setuid(vju_uid)); } - -#ifdef __linux__ - /* - * On linux mucking about with uid/gid disables core-dumps, - * reenable them again. - */ - if (prctl(PR_SET_DUMPABLE, 1) != 0) { - MGT_Complain(C_INFO, - "Could not set dumpable bit. Core dumps turned off"); - } -#endif } static int v_matchproto_(jail_make_dir_f) From nils.goroll at uplex.de Mon Aug 12 13:54:08 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Mon, 12 Aug 2024 13:54:08 +0000 (UTC) Subject: [master] f63d00f25 jail: Add tmpfs warning on linux Message-ID: <20240812135408.DC379101C29@lists.varnish-cache.org> commit f63d00f2554df3b2a4b0b741fdd47339b6b2e10e Author: Thibaut Artis Date: Tue Jul 2 17:27:59 2024 +0200 jail: Add tmpfs warning on linux Refs #4123 diff --git a/bin/varnishd/mgt/mgt_jail_linux.c b/bin/varnishd/mgt/mgt_jail_linux.c index 1b18cf15b..4c3d99fe2 100644 --- a/bin/varnishd/mgt/mgt_jail_linux.c +++ b/bin/varnishd/mgt/mgt_jail_linux.c @@ -35,6 +35,7 @@ #include #include +#include #include #include #include @@ -42,6 +43,7 @@ #include #include #include +#include #include "mgt/mgt.h" #include "common/heritage.h" @@ -71,7 +73,26 @@ static int vjl_make_subdir(const char *dname, const char *what, struct vsb *vsb) } static int vjl_make_workdir(const char *dname, const char *what, struct vsb *vsb) { - return jail_tech_unix.make_workdir(dname, what, vsb); + struct statfs info; + + if (jail_tech_unix.make_workdir(dname, what, vsb) != 0) + return (1); + vjl_master(JAIL_MASTER_FILE); + if (statfs(dname, &info) != 0) { + if (vsb) + VSB_printf(vsb, "Could not stat working directory '%s': %s (%d)\n", dname, VAS_errtxt(errno), errno); + else + MGT_Complain(C_ERR, "Could not stat working directory '%s': %s (%d)", dname, VAS_errtxt(errno), errno); + return (1); + } + if (info.f_type != TMPFS_MAGIC) { + if (vsb != NULL) + VSB_printf(vsb, "Working directory not mounted on tmpfs partition\n"); + else + MGT_Complain(C_INFO, "Working directory not mounted on tmpfs partition"); + } + vjl_master(JAIL_MASTER_LOW); + return (0); } static void vjl_fixfd(int fd, enum jail_fixfd_e what) { From nils.goroll at uplex.de Mon Aug 12 14:08:05 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Mon, 12 Aug 2024 14:08:05 +0000 (UTC) Subject: [master] 477a5dd84 builtin.vcl: Delete Content-Range header where it has no meaning Message-ID: <20240812140805.84C83102936@lists.varnish-cache.org> commit 477a5dd84f727e4a3916295ed58cf3a80f7f7f04 Author: Nils Goroll Date: Tue Jul 23 10:31:36 2024 +0200 builtin.vcl: Delete Content-Range header where it has no meaning Since 4ab110047130e3a89936104d74f4729b650676f9 (see also #3246), we fail backend responses with an unexpected Content-Range. Yet RFC9110 states: The Content-Range header field has no meaning for status codes that do not explicitly describe its semantic. https://www.rfc-editor.org/rfc/rfc9110.html#section-14.4 The semantic is described for status codes 206 and 416, so the obvious implementation change would be for core code to only consider Content-Range for these status codes. But there might be scenarios where a stricter-than-RFC check is intended, so we keep that in core code and change builtin.vcl to remove the header where it has no semantic. diff --git a/bin/varnishd/builtin.vcl b/bin/varnishd/builtin.vcl index 770081366..ed459ce13 100644 --- a/bin/varnishd/builtin.vcl +++ b/bin/varnishd/builtin.vcl @@ -210,6 +210,7 @@ sub vcl_backend_response { } sub vcl_builtin_backend_response { + call vcl_beresp_range; if (bereq.uncacheable) { return (deliver); } @@ -245,6 +246,14 @@ sub vcl_beresp_vary { } } +sub vcl_beresp_range { + if (beresp.status != 206 && beresp.status != 416) { + # Content-Range has no meaning for these status codes + # Ref: https://www.rfc-editor.org/rfc/rfc9110.html#section-14.4 + unset beresp.http.Content-Range; + } +} + sub vcl_beresp_hitmiss { set beresp.ttl = 120s; set beresp.uncacheable = true; diff --git a/bin/varnishtest/tests/c00034.vtc b/bin/varnishtest/tests/c00034.vtc index 4858d3967..1331c265d 100644 --- a/bin/varnishtest/tests/c00034.vtc +++ b/bin/varnishtest/tests/c00034.vtc @@ -273,6 +273,18 @@ varnish v1 -vcl+backend { return (pass); } } + + # skip built-in vcl_beresp_range + sub vcl_backend_response { + if (bereq.uncacheable) { + return (deliver); + } + call vcl_beresp_stale; + call vcl_beresp_cookie; + call vcl_beresp_control; + call vcl_beresp_vary; + return (deliver); + } } client c8 { @@ -326,3 +338,44 @@ client c9 { expect resp.status == 200 expect resp.bodylen == 256 } -run + +# built-in vcl has vcl_beresp_range to ignore content-range for responses but +# 206, 416 +# +server s1 { + rxreq + expect req.url == "/?unexpected=content-range" + expect req.http.range == + txresp -hdr "content-range: bytes 0-49/100" -bodylen 40 + + rxreq + expect req.url == "/?unexpected=unsatisfied-range" + expect req.http.range == + txresp -hdr "content-range: bytes */100" -bodylen 100 + + rxreq + expect req.url == "/?invalid=content-range" + expect req.http.range == + txresp -hdr "content-range: bytes=0-99/100" -bodylen 100 + +} -start + +varnish v1 -vcl+backend { + sub vcl_recv { + return (pass); + } +} + +client c10 { + txreq -url "/?unexpected=content-range" + rxresp + expect resp.status == 200 + + txreq -url "/?unexpected=unsatisfied-range" + rxresp + expect resp.status == 200 + + txreq -url "/?invalid=content-range" + rxresp + expect resp.status == 200 +} -run From nils.goroll at uplex.de Fri Aug 16 10:42:05 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Fri, 16 Aug 2024 10:42:05 +0000 (UTC) Subject: [master] 178542568 Teach vcc_strands_edit the empty strands Message-ID: <20240816104205.929A81224A6@lists.varnish-cache.org> commit 1785425680282dab3395d5f52eb28b8d45f948a7 Author: Nils Goroll Date: Thu Aug 1 11:53:13 2024 +0200 Teach vcc_strands_edit the empty strands diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c index e95a4de3e..afff5ce9d 100644 --- a/lib/libvcc/vcc_expr.c +++ b/lib/libvcc/vcc_expr.c @@ -152,13 +152,18 @@ static void vcc_strands_edit(const struct expr *e1, const struct expr *e2) { - if (e2->nstr == 1) { + assert(e2->fmt == STRANDS || e2->fmt == STRINGS); + + if (e2->fmt == STRANDS) + VSB_cat(e1->vsb, VSB_data(e2->vsb)); + else if (e2->nstr == 0) + VSB_printf(e1->vsb, "vrt_null_strands"); + else if (e2->nstr == 1) VSB_printf(e1->vsb, "TOSTRAND(%s)", VSB_data(e2->vsb)); - return; + else { + VSB_printf(e1->vsb, "TOSTRANDS(%d,\v+\n%s\v-)", + e2->nstr, VSB_data(e2->vsb)); } - - VSB_printf(e1->vsb, "TOSTRANDS(%d,\v+\n%s\v-)", - e2->nstr, VSB_data(e2->vsb)); } static struct expr * From nils.goroll at uplex.de Fri Aug 16 10:42:05 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Fri, 16 Aug 2024 10:42:05 +0000 (UTC) Subject: [master] 5a77330d9 libvcc: Fix STRING/STRANDS comparison without STRING folding Message-ID: <20240816104205.BB3F41224A9@lists.varnish-cache.org> commit 5a77330d95602171afdf81ea63c9266349224e40 Author: Nils Goroll Date: Thu Aug 1 10:58:17 2024 +0200 libvcc: Fix STRING/STRANDS comparison without STRING folding Fixes #4146 Reverts 42a7ecdd97a65a3f60408809e726e4160857fb26 Reverts the code change from b77b709510f1e1ff4792ac9bc9c3836d1a5249ec diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c index afff5ce9d..cd4b03c2f 100644 --- a/lib/libvcc/vcc_expr.c +++ b/lib/libvcc/vcc_expr.c @@ -81,6 +81,13 @@ vcc_utype(vcc_type_t t) return (t->name); } +static vcc_type_t +vcc_stringstype(vcc_type_t t) +{ + return (t->stringform ? STRINGS : t); +} + + static void vcc_expr0(struct vcc *tl, struct expr **e, vcc_type_t fmt); static void vcc_expr_cor(struct vcc *tl, struct expr **e, vcc_type_t fmt); static void vcc_expr_typecheck(struct vcc *tl, struct expr **e, vcc_type_t fmt, @@ -1100,10 +1107,6 @@ vcc_expr_add(struct vcc *tl, struct expr **e, vcc_type_t fmt) return; } } - - /* No concatenation, finalize string. */ - if ((*e)->fmt->stringform) - vcc_expr_tostring(tl, e); } /*-------------------------------------------------------------------- @@ -1196,7 +1199,7 @@ cmp_string(struct vcc *tl, struct expr **e, const struct cmps *cp) vcc_NextToken(tl); vcc_expr_add(tl, &e2, STRINGS); ERRCHK(tl); - if (e2->fmt != STRINGS) { + if (vcc_stringstype(e2->fmt) != STRINGS) { VSB_printf(tl->sb, "Comparison of different types: %s '%.*s' %s\n", vcc_utype((*e)->fmt), PF(tk), vcc_utype(e2->fmt)); @@ -1272,7 +1275,7 @@ vcc_expr_cmp(struct vcc *tl, struct expr **e, vcc_type_t fmt) for (cp = vcc_cmps; cp->fmt != VOID; cp++) { if (tl->t->tok != cp->token) continue; - if ((*e)->fmt != cp->fmt) + if (vcc_stringstype((*e)->fmt) != cp->fmt) continue; AN(cp->func); cp->func(tl, e, cp); From nils.goroll at uplex.de Fri Aug 16 10:42:05 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Fri, 16 Aug 2024 10:42:05 +0000 (UTC) Subject: [master] d6e5852e5 Support calling debug.return_strands() from vcl_init {} Message-ID: <20240816104205.E9CFD1224AE@lists.varnish-cache.org> commit d6e5852e50513976af11a5c90dee0daec65eabb5 Author: Nils Goroll Date: Thu Aug 1 12:17:11 2024 +0200 Support calling debug.return_strands() from vcl_init {} diff --git a/vmod/vmod_debug.c b/vmod/vmod_debug.c index e2e42ee51..026ca0dd5 100644 --- a/vmod/vmod_debug.c +++ b/vmod/vmod_debug.c @@ -977,7 +977,10 @@ xyzzy_return_strands(VRT_CTX, VCL_STRANDS strand) { CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC); - VSLbs(ctx->vsl, SLT_Debug, strand); + if (ctx->vsl) + VSLbs(ctx->vsl, SLT_Debug, strand); + else + VSLs(SLT_Debug, NO_VXID, strand); return (strand); } From nils.goroll at uplex.de Fri Aug 16 10:42:06 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Fri, 16 Aug 2024 10:42:06 +0000 (UTC) Subject: [master] f6b81d2a3 For coverage test v19, actually load the non-error vcls Message-ID: <20240816104206.3F5291224B2@lists.varnish-cache.org> commit f6b81d2a32e9adf952525ce1b819348a22f705ff Author: Nils Goroll Date: Thu Aug 1 12:13:29 2024 +0200 For coverage test v19, actually load the non-error vcls diff --git a/bin/varnishtest/tests/v00019.vtc b/bin/varnishtest/tests/v00019.vtc index d7604419a..c3c3d3543 100644 --- a/bin/varnishtest/tests/v00019.vtc +++ b/bin/varnishtest/tests/v00019.vtc @@ -77,7 +77,7 @@ varnish v1 -vcl { return (fail("should compile")); } } -} +} -start varnish v1 -vcl { import debug; From nils.goroll at uplex.de Fri Aug 16 10:42:06 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Fri, 16 Aug 2024 10:42:06 +0000 (UTC) Subject: [master] 270c873ea Add regression-test for #4146 Message-ID: <20240816104206.93E8B1224C0@lists.varnish-cache.org> commit 270c873ea767ee7a259cb448c9f9b2981048fedc Author: Nils Goroll Date: Thu Aug 1 12:08:54 2024 +0200 Add regression-test for #4146 diff --git a/bin/varnishtest/tests/v00019.vtc b/bin/varnishtest/tests/v00019.vtc index c3c3d3543..1e0216a20 100644 --- a/bin/varnishtest/tests/v00019.vtc +++ b/bin/varnishtest/tests/v00019.vtc @@ -109,6 +109,17 @@ varnish v1 -vcl { } } +# regression test #4146 +varnish v1 -vcl { + import debug; + backend be none; + sub vcl_init { + if (! debug.is_null_strands(debug.return_strands(debug.return_null_strands()))) { + return (fail("should load")); + } + } +} + varnish v1 -errvcl {Symbol not found: 'req.http.req.http.foo'} { backend b { .host = "${localhost}"; } sub vcl_recv { diff --git a/vmod/vmod_debug.c b/vmod/vmod_debug.c index 026ca0dd5..c9b05c4db 100644 --- a/vmod/vmod_debug.c +++ b/vmod/vmod_debug.c @@ -984,6 +984,20 @@ xyzzy_return_strands(VRT_CTX, VCL_STRANDS strand) return (strand); } +VCL_STRANDS +xyzzy_return_null_strands(VRT_CTX) +{ + (void)ctx; + return (vrt_null_strands); +} + +VCL_BOOL +xyzzy_is_null_strands(VRT_CTX, VCL_STRANDS s) +{ + (void)ctx; + return (s == vrt_null_strands); +} + VCL_VOID xyzzy_vsl_flush(VRT_CTX) { diff --git a/vmod/vmod_debug.vcc b/vmod/vmod_debug.vcc index f9427a62f..dbadb9d77 100644 --- a/vmod/vmod_debug.vcc +++ b/vmod/vmod_debug.vcc @@ -279,6 +279,10 @@ Test object method with all the fancy stuff. $Function STRANDS return_strands(STRANDS strand) +$Function STRANDS return_null_strands() + +$Function BOOL is_null_strands(STRANDS strand) + $Function VOID vsl_flush() call VSL_Flush(ctx->cts, 0) From nils.goroll at uplex.de Fri Aug 16 10:42:06 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Fri, 16 Aug 2024 10:42:06 +0000 (UTC) Subject: [master] 31cf5f5ff Execute more vcl coverage code at vcl load time Message-ID: <20240816104206.AC7001224C4@lists.varnish-cache.org> commit 31cf5f5ff889dec494866378a9edf67be714ef19 Author: Nils Goroll Date: Fri Aug 16 12:36:20 2024 +0200 Execute more vcl coverage code at vcl load time by moving test VCL from vcl_recv {} to vcl_init {} As suggested by walid here: https://github.com/varnishcache/varnish-cache/pull/4148#discussion_r1716777047 diff --git a/bin/varnishtest/tests/v00019.vtc b/bin/varnishtest/tests/v00019.vtc index 1e0216a20..944405999 100644 --- a/bin/varnishtest/tests/v00019.vtc +++ b/bin/varnishtest/tests/v00019.vtc @@ -72,9 +72,9 @@ varnish v1 -errvcl {Comparison of different types: STRING '==' INT} { varnish v1 -vcl { import debug; backend be none; - sub vcl_recv { - if ("string" == "string") { - return (fail("should compile")); + sub vcl_init { + if ("string" != "string") { + return (fail("should load")); } } } -start @@ -82,9 +82,9 @@ varnish v1 -vcl { varnish v1 -vcl { import debug; backend be none; - sub vcl_recv { - if ("string" == debug.return_strands("string")) { - return (fail("should compile")); + sub vcl_init { + if ("string" != debug.return_strands("string")) { + return (fail("should load")); } } } @@ -92,9 +92,9 @@ varnish v1 -vcl { varnish v1 -vcl { import debug; backend be none; - sub vcl_recv { - if (debug.return_strands("string") == "string") { - return (fail("should compile")); + sub vcl_init { + if (debug.return_strands("string") != "string") { + return (fail("should load")); } } } @@ -102,9 +102,9 @@ varnish v1 -vcl { varnish v1 -vcl { import debug; backend be none; - sub vcl_recv { - if (debug.return_strands("string") == debug.return_strands("string")) { - return (fail("should compile")); + sub vcl_init { + if (debug.return_strands("string") != debug.return_strands("string")) { + return (fail("should load")); } } } From nils.goroll at uplex.de Fri Aug 16 10:42:06 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Fri, 16 Aug 2024 10:42:06 +0000 (UTC) Subject: [master] 808a8dd04 Collapse vcl coverage tests Message-ID: <20240816104206.CD79E1224CD@lists.varnish-cache.org> commit 808a8dd040ceb8466118d54c8cd03bd0bb2ba279 Author: Nils Goroll Date: Fri Aug 16 12:38:35 2024 +0200 Collapse vcl coverage tests this almost halves runtime of the test case diff --git a/bin/varnishtest/tests/v00019.vtc b/bin/varnishtest/tests/v00019.vtc index 944405999..76ce7e85b 100644 --- a/bin/varnishtest/tests/v00019.vtc +++ b/bin/varnishtest/tests/v00019.vtc @@ -76,49 +76,20 @@ varnish v1 -vcl { if ("string" != "string") { return (fail("should load")); } - } -} -start - -varnish v1 -vcl { - import debug; - backend be none; - sub vcl_init { if ("string" != debug.return_strands("string")) { return (fail("should load")); } - } -} - -varnish v1 -vcl { - import debug; - backend be none; - sub vcl_init { if (debug.return_strands("string") != "string") { return (fail("should load")); } - } -} - -varnish v1 -vcl { - import debug; - backend be none; - sub vcl_init { if (debug.return_strands("string") != debug.return_strands("string")) { return (fail("should load")); } - } -} - -# regression test #4146 -varnish v1 -vcl { - import debug; - backend be none; - sub vcl_init { if (! debug.is_null_strands(debug.return_strands(debug.return_null_strands()))) { return (fail("should load")); } } -} +} -start varnish v1 -errvcl {Symbol not found: 'req.http.req.http.foo'} { backend b { .host = "${localhost}"; } From nils.goroll at uplex.de Fri Aug 16 14:40:10 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Fri, 16 Aug 2024 14:40:10 +0000 (UTC) Subject: [master] 3eec7e814 Avoid panic if director is already finalized for invalid range after rollback Message-ID: <20240816144010.04D92101FD0@lists.varnish-cache.org> commit 3eec7e814841425e71e47642bc603097aac7e102 Author: Nils Goroll Date: Thu Aug 15 23:26:00 2024 +0200 Avoid panic if director is already finalized for invalid range after rollback Fixes #4164 diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c index 647201b7a..650ad26cf 100644 --- a/bin/varnishd/cache/cache_fetch.c +++ b/bin/varnishd/cache/cache_fetch.c @@ -499,7 +499,8 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo) bo->htc->doclose = SC_RESP_CLOSE; if (VRG_CheckBo(bo) < 0) { - VDI_Finish(bo); + if (bo->director_state != DIR_S_NULL) + VDI_Finish(bo); return (F_STP_ERROR); } diff --git a/bin/varnishtest/tests/r04164.vtc b/bin/varnishtest/tests/r04164.vtc new file mode 100644 index 000000000..3c3f400d5 --- /dev/null +++ b/bin/varnishtest/tests/r04164.vtc @@ -0,0 +1,26 @@ +varnishtest "pass, rollback, invalid range" + +server s1 { + rxreq + expect req.url == "/baz" + txresp -status 400 +} -start + +varnish v1 -vcl+backend { + import std; + + sub vcl_recv { + return (pass); + } + sub vcl_backend_response { + std.rollback(bereq); + return (retry); + } +} -start + +client c1 { + txreq -url "/baz" -hdr "range: 42" + rxresp +} -run + +server s1 -wait From phk at FreeBSD.org Mon Aug 19 12:40:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:40:06 +0000 (UTC) Subject: [master] 8638c546f spelling: cannot Message-ID: <20240819124006.6883311C435@lists.varnish-cache.org> commit 8638c546f49daa4820bfdcdeb17dbe669f0aa65c Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: cannot Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/vmod/tests/directors_c00015.vtc b/vmod/tests/directors_c00015.vtc index 12af48d03..952d882ac 100644 --- a/vmod/tests/directors_c00015.vtc +++ b/vmod/tests/directors_c00015.vtc @@ -160,7 +160,7 @@ varnish v1 -errvcl {vmod_directors: shard shard: .backend(resolve=LAZY) with oth } } -varnish v1 -errvcl {vmod_directors: shard shard: .backend(resolve=NOW) can not be used in vcl_init{}/vcl_fini{}} { +varnish v1 -errvcl {vmod_directors: shard shard: .backend(resolve=NOW) cannot be used in vcl_init{}/vcl_fini{}} { import directors; import blob; diff --git a/vmod/vmod_debug.c b/vmod/vmod_debug.c index c9b05c4db..076d43d36 100644 --- a/vmod/vmod_debug.c +++ b/vmod/vmod_debug.c @@ -898,7 +898,7 @@ xyzzy_sethdr(VRT_CTX, VCL_HEADER hdr, VCL_STRANDS s) hp = VRT_selecthttp(ctx, hdr->where); if (hp == NULL) { VRT_fail(ctx, "debug.sethdr(): header argument " - "can not be used here"); + "cannot be used here"); return; } AN(hdr->what); diff --git a/vmod/vmod_directors.vcc b/vmod/vmod_directors.vcc index d51f9535e..9275edcff 100644 --- a/vmod/vmod_directors.vcc +++ b/vmod/vmod_directors.vcc @@ -541,14 +541,14 @@ is _not_ the order given when backends are added. * ``NOW``: look up a backend and return it. - Can not be used in ``vcl_init{}``. + Cannot be used in ``vcl_init{}``. * ``LAZY``: return an instance of this director for later backend resolution. ``LAZY`` mode is required for referencing shard director instances, for example as backends for other directors (director layering). - In ``vcl_init{}`` and on the client side, ``LAZY`` mode can not be + In ``vcl_init{}`` and on the client side, ``LAZY`` mode cannot be used with any other argument. On the backend side and in ``vcl_pipe {}``, parameters from @@ -606,7 +606,7 @@ The per-VCL scope defines defaults for the per backend scope. Any changes to a parameter set in backend context and in ``vcl_pipe {}`` only affect the respective backend request. -Parameter sets can not be used in client context except for +Parameter sets cannot be used in client context except for ``vcl_pipe {}``. The following example is a typical use case: A parameter set is diff --git a/vmod/vmod_directors_shard.c b/vmod/vmod_directors_shard.c index 8ef2a4f91..da8743834 100644 --- a/vmod/vmod_directors_shard.c +++ b/vmod/vmod_directors_shard.c @@ -641,7 +641,7 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard, } else if (resolve == VENUM(NOW)) { if (ctx->method & VCL_MET_TASK_H) { shard_fail(ctx, shardd->name, "%s", - ".backend(resolve=NOW) can not be " + ".backend(resolve=NOW) cannot be " "used in vcl_init{}/vcl_fini{}"); return (NULL); } diff --git a/vmod/vmod_std.c b/vmod/vmod_std.c index dde572fae..c0c59122e 100644 --- a/vmod/vmod_std.c +++ b/vmod/vmod_std.c @@ -189,7 +189,7 @@ vmod_collect(VRT_CTX, VCL_HEADER hdr, VCL_STRING sep) hp = VRT_selecthttp(ctx, hdr->where); if (hp == NULL) { VRT_fail(ctx, "std.collect(): header argument " - "can not be used here"); + "cannot be used here"); return; } http_CollectHdrSep(hp, hdr->what, sep); diff --git a/vmod/vmod_std.vcc b/vmod/vmod_std.vcc index 47f319b4d..82e5afbdf 100644 --- a/vmod/vmod_std.vcc +++ b/vmod/vmod_std.vcc @@ -292,7 +292,7 @@ A STRING *s* argument can be quantified with a multiplier (``k`` If the conversion of an *s* argument fails, *fallback* will be returned if provided, or a VCL failure will be triggered. -Other conversions may fail if the argument can not be represented, +Other conversions may fail if the argument cannot be represented, because it is negative, too small or too large. Again, *fallback* will be returned if provided, or a VCL failure will be triggered. diff --git a/vmod/vmod_vtc.vcc b/vmod/vmod_vtc.vcc index 7ac3f6997..fb876d430 100644 --- a/vmod/vmod_vtc.vcc +++ b/vmod/vmod_vtc.vcc @@ -182,7 +182,7 @@ Call ``VSLs()`` with the given parameters. The argument order is chosen to match VSL output. -A VCL error is triggered if `tag` can not be resolved at runtime or +A VCL error is triggered if `tag` cannot be resolved at runtime or if vxid is out of bounds. $Function VOID vsl_replay(STRANDS s) From phk at FreeBSD.org Mon Aug 19 12:40:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:40:06 +0000 (UTC) Subject: [master] a06d8d828 spelling: case-sensitive Message-ID: <20240819124006.94C9C11C43A@lists.varnish-cache.org> commit a06d8d82825d1e608ddb9810c8fc11dc0b24c369 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 18:43:02 2024 -0400 spelling: case-sensitive Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/vmod/vmod_std.vcc b/vmod/vmod_std.vcc index 82e5afbdf..b5ab2a8aa 100644 --- a/vmod/vmod_std.vcc +++ b/vmod/vmod_std.vcc @@ -110,7 +110,7 @@ $Function STRING strstr(STRING s1, STRING s2) Returns a string beginning at the first occurrence of the string *s2* in the string *s1*, or an empty string if *s2* is not found. -Note that the comparison is case sensitive. +Note that the comparison is case-sensitive. Example:: @@ -625,7 +625,7 @@ The format of *STRING* is:: * ``==``: ** and ** are equal * ``!=``: ** and ** are unequal - strings are compared case sensitively + strings are compared case-sensitively * for string fields: From phk at FreeBSD.org Mon Aug 19 12:40:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:40:06 +0000 (UTC) Subject: [master] 34e2347b9 spelling: circle Message-ID: <20240819124006.C8A5611C43F@lists.varnish-cache.org> commit 34e2347b9cee74b1dde63e3023517d5df4dfe19e Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: circle Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/vmod/vmod_directors_shard_cfg.c b/vmod/vmod_directors_shard_cfg.c index aec4a0901..1a9e9fcbe 100644 --- a/vmod/vmod_directors_shard_cfg.c +++ b/vmod/vmod_directors_shard_cfg.c @@ -242,7 +242,7 @@ shardcfg_clear(VRT_CTX, struct sharddir *shardd) /* * ============================================================ - * consistent hashing cirle init + * consistent hashing circle init */ typedef int (*compar)( const void*, const void* ); From phk at FreeBSD.org Mon Aug 19 12:40:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:40:07 +0000 (UTC) Subject: [master] 2e6d816d2 spelling: concurrently Message-ID: <20240819124007.21FBF11C44E@lists.varnish-cache.org> commit 2e6d816d27ac8bce8e3a4c30651dfcec51a2bf89 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: concurrently Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/vmod/tests/blob_b00011.vtc b/vmod/tests/blob_b00011.vtc index 7ba9973ae..0e97cbd0a 100644 --- a/vmod/tests/blob_b00011.vtc +++ b/vmod/tests/blob_b00011.vtc @@ -44,7 +44,7 @@ shell { } # For each type of BLOB codec we may use some of the prepared clients. It is -# important not to run them concurently to ensure we can predictably peek at +# important not to run them concurrently to ensure we can predictably peek at # logs. client c-struct { From phk at FreeBSD.org Mon Aug 19 12:40:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:40:07 +0000 (UTC) Subject: [master] c35c8382e spelling: decoding Message-ID: <20240819124007.520E011C458@lists.varnish-cache.org> commit c35c8382e6bafb2efe1b4ae4daa4d7878e94d319 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: decoding Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/vmod/tests/blob_b00009.vtc b/vmod/tests/blob_b00009.vtc index edad4d479..7f357a8a3 100644 --- a/vmod/tests/blob_b00009.vtc +++ b/vmod/tests/blob_b00009.vtc @@ -38,7 +38,7 @@ varnish v1 -arg "-p http_max_hdr=128" -vcl+backend { = blob.transcode(decoding=BASE64, encoding=HEX, case=UPPER, encoded="YmF6"); - # transcode() can replace other specific encoding/deconding + # transcode() can replace other specific encoding/decoding # vmods - e.g. vmod_urlcode set req.url = blob.transcode(encoded=req.url, decoding=URL); set req.http.url_urlcoded From phk at FreeBSD.org Mon Aug 19 12:40:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:40:07 +0000 (UTC) Subject: [master] e8fe9fee3 spelling: for Message-ID: <20240819124007.819EA11C45D@lists.varnish-cache.org> commit e8fe9fee3ffba3609f2843c06c031a9b28eb033c Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: for Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/vmod/vmod_blob.vcc b/vmod/vmod_blob.vcc index b6256eeac..46899cad5 100644 --- a/vmod/vmod_blob.vcc +++ b/vmod/vmod_blob.vcc @@ -149,7 +149,7 @@ changes to ``BASE64``: ``+`` replaced with ``-``, ``/`` replaced with ``~`` and ``_`` as the padding character. It is used by a certain CDN provider who also inspired the name. -The *case* ENUM MUST be set to ``DEFAULT`` for for all of the +The *case* ENUM MUST be set to ``DEFAULT`` for all of the ``BASE64*`` encodings. HEX From phk at FreeBSD.org Mon Aug 19 12:40:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:40:07 +0000 (UTC) Subject: [master] 3aa3563d2 spelling: healthy Message-ID: <20240819124007.B6D0111C465@lists.varnish-cache.org> commit 3aa3563d203dc8728b9652384f1ad91668fbb982 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: healthy Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/vmod/vmod_directors_shard_dir.c b/vmod/vmod_directors_shard_dir.c index 728cbd294..d30aba071 100644 --- a/vmod/vmod_directors_shard_dir.c +++ b/vmod/vmod_directors_shard_dir.c @@ -270,7 +270,7 @@ init_state(struct shard_state *state, state->idx = UINT32_MAX; state->picklist = picklist; - /* healhy and changed only defined for valid hostids */ + /* healthy and changed only defined for valid hostids */ state->previous.hostid = UINT_MAX; state->last.hostid = UINT_MAX; } From phk at FreeBSD.org Mon Aug 19 12:40:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:40:07 +0000 (UTC) Subject: [master] 064c9f5bb spelling: nonexistent Message-ID: <20240819124007.D7E2F11C469@lists.varnish-cache.org> commit 064c9f5bb80b4d80796cbea094d331bed6ee818a Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: nonexistent Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/vmod/tests/cookie_b00007.vtc b/vmod/tests/cookie_b00007.vtc index 418e91120..0d52c1e76 100644 --- a/vmod/tests/cookie_b00007.vtc +++ b/vmod/tests/cookie_b00007.vtc @@ -7,7 +7,7 @@ varnish v1 -vcl { sub vcl_synth { cookie.set("cookie1", "cookie1value"); set resp.http.does = cookie.isset("cookie1"); - set resp.http.does-not = cookie.isset("non-existent"); + set resp.http.does-not = cookie.isset("nonexistent"); set resp.http.null = cookie.isset(""); set resp.http.null2 = cookie.isset(req.http.probably-null); } diff --git a/vmod/tests/std_b00005.vtc b/vmod/tests/std_b00005.vtc index 11cb16aec..0204ccfab 100644 --- a/vmod/tests/std_b00005.vtc +++ b/vmod/tests/std_b00005.vtc @@ -77,7 +77,7 @@ varnish v1 -vcl+backend { set resp.http.port11 = std.port(debug.get_ip()); std.timestamp("1.2.3.4 80, p = 443"); - debug.store_ip(std.ip(req.http.non-existent, server.ip)); + debug.store_ip(std.ip(req.http.nonexistent, server.ip)); set resp.http.ip12 = debug.get_ip(); set resp.http.port12 = std.port(debug.get_ip()); std.timestamp("NULL, server.ip"); From phk at FreeBSD.org Mon Aug 19 12:40:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:40:07 +0000 (UTC) Subject: [master] 7a2df91ce spelling: param Message-ID: <20240819124007.F35D011C46F@lists.varnish-cache.org> commit 7a2df91ce52358f37857b5d886feb531a814d935 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: param Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/vmod/vmod_directors_shard.c b/vmod/vmod_directors_shard.c index da8743834..cb70c67f4 100644 --- a/vmod/vmod_directors_shard.c +++ b/vmod/vmod_directors_shard.c @@ -65,7 +65,7 @@ * * Overview of parameter objects (pointers are alternatives) * - * shard() director shard_param() object default praram + * shard() director shard_param() object default param * * ---------------------------------> vmod static * VCL obj / -> From phk at FreeBSD.org Mon Aug 19 12:40:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:40:08 +0000 (UTC) Subject: [master] eb696e3aa spelling: pedantic Message-ID: <20240819124008.226C411C489@lists.varnish-cache.org> commit eb696e3aab8109ab6914570c03db8ba32a2aafae Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: pedantic Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/vmod/vmod_debug.c b/vmod/vmod_debug.c index 076d43d36..99bc87201 100644 --- a/vmod/vmod_debug.c +++ b/vmod/vmod_debug.c @@ -172,7 +172,7 @@ static const struct vdp xyzzy_vdp_rot13 = { }; /********************************************************************** - * pendantic tests of the VDP API: + * pedantic tests of the VDP API: * - assert that we see a VDP_END * - assert that _fini gets called before the task ends * From phk at FreeBSD.org Mon Aug 19 12:40:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:40:08 +0000 (UTC) Subject: [master] 0a3b90e3e spelling: the Message-ID: <20240819124008.48A9B11C497@lists.varnish-cache.org> commit 0a3b90e3ed34de786e80b4a9630aef1f543d4211 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: the Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/vmod/vmod_unix.vcc b/vmod/vmod_unix.vcc index b88c2326e..2ffb61ff8 100644 --- a/vmod/vmod_unix.vcc +++ b/vmod/vmod_unix.vcc @@ -104,7 +104,7 @@ All functions in this VMOD are subject to the following constraints: "VCL failed". If the failure occurs during ``vcl_synth{}``, then ``vcl_synth{}`` - is aborted, and the the response line "503 VCL failed" is sent. + is aborted, and the response line "503 VCL failed" is sent. * If the current listener is not a Unix domain socket, or if the attempt to read credentials fails, then a ``VCL_Error`` message is From phk at FreeBSD.org Mon Aug 19 12:40:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:40:08 +0000 (UTC) Subject: [master] 4d9d436d5 spelling: unparseable Message-ID: <20240819124008.67B6B11C4A8@lists.varnish-cache.org> commit 4d9d436d55dea4a1a1247282035e3e0cabd88534 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 09:13:45 2024 -0400 spelling: unparseable Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/vmod/vmod_vtc.vcc b/vmod/vmod_vtc.vcc index fb876d430..ade2e4ca1 100644 --- a/vmod/vmod_vtc.vcc +++ b/vmod/vmod_vtc.vcc @@ -192,7 +192,7 @@ Replay literal log lines. The parser accepts the output generated by ``varnishlog -g raw`` and varnishtest log ``vsl|`` lines. -Unparsable lines are silently ignored. +Unparseable lines are silently ignored. SEE ALSO ======== From phk at FreeBSD.org Mon Aug 19 12:41:05 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:41:05 +0000 (UTC) Subject: [master] 23abba252 chore(m4): spelling: reentrant Message-ID: <20240819124105.853C411CD6F@lists.varnish-cache.org> commit 23abba252288e7396ab02869ecc2a02115a7d5e1 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 chore(m4): spelling: reentrant Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4 index 9f35d1391..39a7a5ed4 100644 --- a/m4/ax_pthread.m4 +++ b/m4/ax_pthread.m4 @@ -244,7 +244,7 @@ AS_IF([test "x$ax_pthread_clang" = "xyes"], [ax_pthread_flags="-pthread,-lpthread -pthread"]) -# The presence of a feature test macro requesting re-entrant function +# The presence of a feature test macro requesting reentrant function # definitions is, on some systems, a strong hint that pthreads support is # correctly enabled From phk at FreeBSD.org Mon Aug 19 12:42:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:42:06 +0000 (UTC) Subject: [master] 5782f0e16 spelling: boilerplate Message-ID: <20240819124206.1D7F511D52E@lists.varnish-cache.org> commit 5782f0e1624fea985c755192f245f1377950c150 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: boilerplate Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py index 64e56d7f9..44dae5038 100755 --- a/lib/libvcc/vmodtool.py +++ b/lib/libvcc/vmodtool.py @@ -1071,7 +1071,7 @@ class vcc(): fo.close() def amboilerplate(self): - ''' Produce boilplate for autocrap tools ''' + ''' Produce boilerplate for autocrap tools ''' vcc = os.path.basename(self.inputfile) src = glob.glob("vmod_" + self.modname + "*.[ch]") src.sort() From phk at FreeBSD.org Mon Aug 19 12:42:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:42:06 +0000 (UTC) Subject: [master] 1f47a3bfa spelling: buffer Message-ID: <20240819124206.3A3FD11D537@lists.varnish-cache.org> commit 1f47a3bfac3f340a6605bd96e15fb1cb048b32fa Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: buffer Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/lib/libvarnish/vtcp.c b/lib/libvarnish/vtcp.c index 207b8f80d..278a074ad 100644 --- a/lib/libvarnish/vtcp.c +++ b/lib/libvarnish/vtcp.c @@ -72,7 +72,7 @@ vtcp_sa_to_ascii(const void *sa, socklen_t l, char *abuf, unsigned alen, if (i) { /* * XXX this printf is shitty, but we may not have space - * for the gai_strerror in the bufffer :-( + * for the gai_strerror in the buffer :-( */ fprintf(stderr, "getnameinfo = %d %s\n", i, gai_strerror(i)); if (i == EAI_SYSTEM) From phk at FreeBSD.org Mon Aug 19 12:42:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:42:06 +0000 (UTC) Subject: [master] b56a9c2f8 spelling: buffered Message-ID: <20240819124206.59A3A11D540@lists.varnish-cache.org> commit b56a9c2f82af215c3c58450ea6683b078fc1ee70 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: buffered Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/lib/libvsc/VSC_main.vsc b/lib/libvsc/VSC_main.vsc index 31f28feb1..cc463db4a 100644 --- a/lib/libvsc/VSC_main.vsc +++ b/lib/libvsc/VSC_main.vsc @@ -727,14 +727,14 @@ :oneliner: SHM writes Number of individual writes to the shared memory log. A single - write may batch multiple records for bufferred tasks. + write may batch multiple records for buffered tasks. .. varnish_vsc:: shm_flushes :level: diag :oneliner: SHM flushes due to overflow - Number of writes performed before the end of a bufferred task + Number of writes performed before the end of a buffered task because adding a record to a batch would exceed vsl_buffer. .. varnish_vsc:: shm_cont From phk at FreeBSD.org Mon Aug 19 12:42:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:42:06 +0000 (UTC) Subject: [master] e3a2cb490 spelling: cannot Message-ID: <20240819124206.76CDE11D54A@lists.varnish-cache.org> commit e3a2cb4901ba8f800fc561d72ab51c40a8734649 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: cannot Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/lib/libvcc/vcc_backend.c b/lib/libvcc/vcc_backend.c index d9ec8f97d..dc7a64b59 100644 --- a/lib/libvcc/vcc_backend.c +++ b/lib/libvcc/vcc_backend.c @@ -312,7 +312,7 @@ vcc_ParseProbeSpec(struct vcc *tl, const struct symbol *sym, char **namep) } if (threshold > window ) { VSB_cat(tl->sb, - "Threshold can not be greater than window.\n"); + "Threshold cannot be greater than window.\n"); AN(t_threshold); vcc_ErrWhere(tl, t_threshold); AN(t_window); @@ -559,7 +559,7 @@ vcc_ParseHostDef(struct vcc *tl, struct symbol *sym, if (via->extra != NULL) { AZ(strcmp(via->extra, "via")); VSB_cat(tl->sb, - "Can not stack .via backends at\n"); + "Cannot stack .via backends at\n"); vcc_ErrWhere(tl, tl->t); VSB_destroy(&tl->fb); return; diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c index cd4b03c2f..b9a03b794 100644 --- a/lib/libvcc/vcc_expr.c +++ b/lib/libvcc/vcc_expr.c @@ -833,7 +833,7 @@ vcc_expr5(struct vcc *tl, struct expr **e, vcc_type_t fmt) return; } VSB_printf(tl->sb, - "Symbol '%.*s' type (%s) can not be used in expression.\n", + "Symbol '%.*s' type (%s) cannot be used in expression.\n", PF(t), sym->kind->name); vcc_ErrWhere(tl, t); if (sym->def_b != NULL) { diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py index 44dae5038..2d3d94640 100755 --- a/lib/libvcc/vmodtool.py +++ b/lib/libvcc/vmodtool.py @@ -382,7 +382,7 @@ class ProtoType(): else: t = arg(wl, names, st.vcc.enums, ',') if t.vt == 'VOID': - err("arguments can not be of type '%s'" % t.vt, warn=False) + err("arguments cannot be of type '%s'" % t.vt, warn=False) if t.nm is None: t.nm2 = "arg%d" % n else: diff --git a/lib/libvsc/VSC_main.vsc b/lib/libvsc/VSC_main.vsc index cc463db4a..22097f2d8 100644 --- a/lib/libvsc/VSC_main.vsc +++ b/lib/libvsc/VSC_main.vsc @@ -819,7 +819,7 @@ :group: ban_mtx :oneliner: Number of bans using req.* - Number of bans which use req.* variables. These bans can not be + Number of bans which use req.* variables. These bans cannot be washed by the ban-lurker. .. varnish_vsc:: bans_added From phk at FreeBSD.org Mon Aug 19 12:42:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:42:06 +0000 (UTC) Subject: [master] b7a7393e9 spelling: descends Message-ID: <20240819124206.90C0B11D556@lists.varnish-cache.org> commit b7a7393e9faac0916f88e6d1dbfc35e1d4efae73 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: descends Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/lib/libvcc/vcc_xref.c b/lib/libvcc/vcc_xref.c index 6f72576a0..95f3e3dd3 100644 --- a/lib/libvcc/vcc_xref.c +++ b/lib/libvcc/vcc_xref.c @@ -34,7 +34,7 @@ * both defined and referenced. Complaints about referenced but undefined * or defined but unreferenced objects will be emitted. * - * The second check recursively decends through subroutine calls to make + * The second check recursively descends through subroutine calls to make * sure that action actions are correct for the methods through which * they are called. */ From phk at FreeBSD.org Mon Aug 19 12:42:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:42:06 +0000 (UTC) Subject: [master] fe75f34a5 spelling: formerly Message-ID: <20240819124206.AA8B311D55B@lists.varnish-cache.org> commit fe75f34a56e81cf944f77d0340ea12710edbe231 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: formerly Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/lib/libvgz/README b/lib/libvgz/README index 9b2fb3977..77dad0005 100644 --- a/lib/libvgz/README +++ b/lib/libvgz/README @@ -66,7 +66,7 @@ Notes for some targets: - zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works when compiled with cc. -- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is +- On Digital Unix 4.0D (formerly OSF/1) on AlphaServer, the cc option -std1 is necessary to get gzprintf working correctly. This is done by configure. - zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with From phk at FreeBSD.org Mon Aug 19 12:42:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:42:06 +0000 (UTC) Subject: [master] d5501ffd4 spelling: integer type Message-ID: <20240819124206.C423811D561@lists.varnish-cache.org> commit d5501ffd42a7a068849c888e7b8bb048b5a2f58e Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: integer type Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/lib/libvcc/vcc_utils.c b/lib/libvcc/vcc_utils.c index b5103c040..801f44da4 100644 --- a/lib/libvcc/vcc_utils.c +++ b/lib/libvcc/vcc_utils.c @@ -120,7 +120,7 @@ vcc_regexp(struct vcc *tl, struct vsb *vgc_name) * * Instead we make sure the sockaddr is sane (for our values of * sane) and dump it as our own "struct suckaddr" type, in binary, - * using the widest integertype, hoping that this will ensure sufficient + * using the widest integer type, hoping that this will ensure sufficient * alignment. */ From phk at FreeBSD.org Mon Aug 19 12:42:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:42:06 +0000 (UTC) Subject: [master] 2f43737b2 spelling: irix Message-ID: <20240819124206.DD6F411D569@lists.varnish-cache.org> commit 2f43737b28e050cc394affeeebe583d7eca477f6 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: irix Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/lib/libvgz/README b/lib/libvgz/README index 77dad0005..c07b6b6b3 100644 --- a/lib/libvgz/README +++ b/lib/libvgz/README @@ -59,7 +59,7 @@ Notes for some targets: - For Windows DLL versions, please see win32/DLL_FAQ.txt -- For 64-bit Irix, deflate.c must be compiled without any optimization. With +- For 64-bit IRIX, deflate.c must be compiled without any optimization. With -O, one libpng test fails. The test works in 32 bit mode (with the -n32 compiler flag). The compiler bug has been reported to SGI. From phk at FreeBSD.org Mon Aug 19 12:42:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:42:07 +0000 (UTC) Subject: [master] 750415fe0 spelling: macos Message-ID: <20240819124207.0B2B811D581@lists.varnish-cache.org> commit 750415fe0bfb0ff7edef2eb1010b7898963caf1d Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: macos Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/lib/libvarnish/vtcp.c b/lib/libvarnish/vtcp.c index 278a074ad..d3aba491c 100644 --- a/lib/libvarnish/vtcp.c +++ b/lib/libvarnish/vtcp.c @@ -614,7 +614,7 @@ VTCP_Check(ssize_t a) defined (__NetBSD__) || \ defined (__APPLE__) /* - * Solaris and MacOS returns EINVAL if the other end unexpectedly reset + * Solaris and macOS returns EINVAL if the other end unexpectedly reset * the connection. * * On NetBSD it is documented behaviour. From phk at FreeBSD.org Mon Aug 19 12:42:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:42:07 +0000 (UTC) Subject: [master] ca77288b7 spelling: preceded Message-ID: <20240819124207.406F811D597@lists.varnish-cache.org> commit ca77288b7bcef5214d5753533405349883836083 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: preceded Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c index b9a03b794..7475053aa 100644 --- a/lib/libvcc/vcc_expr.c +++ b/lib/libvcc/vcc_expr.c @@ -1356,7 +1356,7 @@ vcc_expr_bin_bool(struct vcc *tl, struct expr **e, vcc_type_t fmt, ERRCHK(tl); if ((*e)->fmt != BOOL) { VSB_printf(tl->sb, - "'%s' must be preceeded by BOOL," + "'%s' must be preceded by BOOL," " found %s.\n", tokstr, vcc_utype((*e)->fmt)); vcc_ErrWhere2(tl, tk, tl->t); return; From phk at FreeBSD.org Mon Aug 19 12:42:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:42:07 +0000 (UTC) Subject: [master] 19ea17655 spelling: nonexistent Message-ID: <20240819124207.26BA511D593@lists.varnish-cache.org> commit 19ea176557f94cc910bde2f21e773d699acc223f Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: nonexistent Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/lib/libvarnish/vfl.c b/lib/libvarnish/vfl.c index 8c8d1336a..e94dcea38 100644 --- a/lib/libvarnish/vfl.c +++ b/lib/libvarnish/vfl.c @@ -74,7 +74,7 @@ vflopenat(int dirfd, const char *path, int flags, va_list ap) for (;;) { if ((fd = openat(dirfd, path, flags, mode)) == -1) - /* non-existent or no access */ + /* nonexistent or no access */ return (-1); if (flock(fd, operation) == -1) { /* unsupported or interrupted */ From phk at FreeBSD.org Mon Aug 19 12:42:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:42:07 +0000 (UTC) Subject: [master] f19a3c476 spelling: suppress Message-ID: <20240819124207.5B1A211D5AC@lists.varnish-cache.org> commit f19a3c476391ef184f49b6bdc2447547c1b40926 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: suppress Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/lib/libvarnishapi/vsl.c b/lib/libvarnishapi/vsl.c index 8c3d33753..34e3d1088 100644 --- a/lib/libvarnishapi/vsl.c +++ b/lib/libvarnishapi/vsl.c @@ -95,7 +95,7 @@ VSL_New(void) vsl->L_opt = 1000; vsl->T_opt = 120.; vsl->vbm_select = vbit_new(SLT__MAX); - vsl->vbm_supress = vbit_new(SLT__MAX); + vsl->vbm_suppress = vbit_new(SLT__MAX); VTAILQ_INIT(&vsl->vslf_select); VTAILQ_INIT(&vsl->vslf_suppress); @@ -127,7 +127,7 @@ VSL_Delete(struct VSL_data *vsl) CHECK_OBJ_NOTNULL(vsl, VSL_MAGIC); vbit_destroy(vsl->vbm_select); - vbit_destroy(vsl->vbm_supress); + vbit_destroy(vsl->vbm_suppress); vsl_IX_free(&vsl->vslf_select); vsl_IX_free(&vsl->vslf_suppress); VSL_ResetError(vsl); @@ -206,7 +206,7 @@ VSL_Match(struct VSL_data *vsl, const struct VSL_cursor *c) else if (!VTAILQ_EMPTY(&vsl->vslf_suppress) && vsl_match_IX(vsl, &vsl->vslf_suppress, c)) return (0); - else if (vbit_test(vsl->vbm_supress, tag)) + else if (vbit_test(vsl->vbm_suppress, tag)) return (0); /* Default show */ diff --git a/lib/libvarnishapi/vsl_api.h b/lib/libvarnishapi/vsl_api.h index cb5b7ac82..9a14e22c1 100644 --- a/lib/libvarnishapi/vsl_api.h +++ b/lib/libvarnishapi/vsl_api.h @@ -78,7 +78,7 @@ struct VSL_data { /* Bitmaps of -ix selected tags */ struct vbitmap *vbm_select; - struct vbitmap *vbm_supress; + struct vbitmap *vbm_suppress; /* Lists of -IX filters */ vslf_list vslf_select; diff --git a/lib/libvarnishapi/vsl_arg.c b/lib/libvarnishapi/vsl_arg.c index f7cbcc822..0fcdb4156 100644 --- a/lib/libvarnishapi/vsl_arg.c +++ b/lib/libvarnishapi/vsl_arg.c @@ -229,7 +229,7 @@ vsl_ix_arg(struct VSL_data *vsl, int opt, const char *arg) vsl->flags |= F_SEEN_ixIX; i = VSL_List2Tags(arg, -1, opt == 'x' ? vsl_vbm_bitset : vsl_vbm_bitclr, - vsl->vbm_supress); + vsl->vbm_suppress); if (i == -1) return (vsl_diag(vsl, "-%c: \"%s\" matches zero tags", (char)opt, arg)); @@ -356,10 +356,10 @@ VSL_Arg(struct VSL_data *vsl, int opt, const char *arg) long l; CHECK_OBJ_NOTNULL(vsl, VSL_MAGIC); - /* If first option is 'i', set all bits for supression */ + /* If first option is 'i', set all bits for suppression */ if ((opt == 'i' || opt == 'I') && !(vsl->flags & F_SEEN_ixIX)) for (i = 0; i < SLT__MAX; i++) - vbit_set(vsl->vbm_supress, i); + vbit_set(vsl->vbm_suppress, i); switch (opt) { case 'b': vsl->b_opt = 1; return (1); From phk at FreeBSD.org Mon Aug 19 12:42:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:42:07 +0000 (UTC) Subject: [master] f14bc6670 spelling: unsettable Message-ID: <20240819124207.9144811D5BD@lists.varnish-cache.org> commit f14bc66705ec89b95717a50e95da2ccbb3efa4f8 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 09:14:01 2024 -0400 spelling: unsettable Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py index 10fedac24..7efe5f8fb 100755 --- a/lib/libvcc/generate.py +++ b/lib/libvcc/generate.py @@ -262,7 +262,7 @@ def parse_var(ln): for i in j[2:]: vw.append(i.strip(",.")) continue - if j[0] == "Unsetable" and j[1] == "from:": + if j[0] == "Unsettable" and j[1] == "from:": for i in j[2:]: vu.append(i.strip(",.")) continue From phk at FreeBSD.org Mon Aug 19 12:42:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:42:07 +0000 (UTC) Subject: [master] 8b4493c5c spelling: with Message-ID: <20240819124207.C790911D5CD@lists.varnish-cache.org> commit 8b4493c5c39d152c926dc8c731b6cadbd4544837 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:03 2024 -0400 spelling: with Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/lib/libvarnish/vsb.c b/lib/libvarnish/vsb.c index 67a4efec8..61f119458 100644 --- a/lib/libvarnish/vsb.c +++ b/lib/libvarnish/vsb.c @@ -87,7 +87,7 @@ _assert_VSB_integrity(const char *fun, const struct vsb *s) KASSERT(s != NULL, ("%s called with a NULL vsb pointer", fun)); KASSERT(s->magic == VSB_MAGIC, - ("%s called wih an bogus vsb pointer", fun)); + ("%s called with an bogus vsb pointer", fun)); KASSERT(s->s_buf != NULL, ("%s called with uninitialized or corrupt vsb", fun)); KASSERT(s->s_len < s->s_size, From phk at FreeBSD.org Mon Aug 19 12:43:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:06 +0000 (UTC) Subject: [master] 888d611a4 spelling: anymore Message-ID: <20240819124306.4DE6F11DF64@lists.varnish-cache.org> commit 888d611a40fab528026bb2862360a199ad8dfdf6 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: anymore Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/vapi/vsm.h b/include/vapi/vsm.h index f41ca86b9..2d45046b6 100644 --- a/include/vapi/vsm.h +++ b/include/vapi/vsm.h @@ -171,7 +171,7 @@ const struct vsm_valid *VSM_StillValid(const struct vsm *, const struct vsm_fant * good. * * Return: - * VSM_invalid: fantom is not valid any more. + * VSM_invalid: fantom is not valid anymore. * VSM_valid: fantom is still the same. */ From phk at FreeBSD.org Mon Aug 19 12:43:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:06 +0000 (UTC) Subject: [master] 174cc523f spelling: available Message-ID: <20240819124306.8F83711DF68@lists.varnish-cache.org> commit 174cc523f13f021694bdfe76fff5878a2ac8ae6c Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: available Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/tbl/params.h b/include/tbl/params.h index dc27ae7bf..668658324 100644 --- a/include/tbl/params.h +++ b/include/tbl/params.h @@ -337,7 +337,7 @@ PARAM_SIMPLE( /* units */ NULL, /* descr */ "Maximum number of transactions that can queue waiting for a backend " - "connection to become avaiable. This default of 0 (zero) means that " + "connection to become available. This default of 0 (zero) means that " "there is no transaction queueing. VCL can override this default value " "for each backend.\n\n" "Note that this feature must be used with caution, as it can " From phk at FreeBSD.org Mon Aug 19 12:43:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:06 +0000 (UTC) Subject: [master] b6afdfe50 spelling: cannot Message-ID: <20240819124306.B838811DF71@lists.varnish-cache.org> commit b6afdfe50022dc29c4c19073c34390feac75b556 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: cannot Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/vrt.h b/include/vrt.h index 4bea3b178..7d573f3e2 100644 --- a/include/vrt.h +++ b/include/vrt.h @@ -467,7 +467,7 @@ enum vcl_func_call_e { enum vcl_func_fail_e { VSUB_E_OK, VSUB_E_RECURSE, // call would recurse - VSUB_E_METHOD // can not be called from this method + VSUB_E_METHOD // cannot be called from this method }; typedef void vcl_func_f(VRT_CTX, enum vcl_func_call_e, enum vcl_func_fail_e *); From phk at FreeBSD.org Mon Aug 19 12:43:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:06 +0000 (UTC) Subject: [master] f02fbb988 spelling: case-insensitive Message-ID: <20240819124306.E48DA11DF7D@lists.varnish-cache.org> commit f02fbb988dabcd184d51f8758e65f11f0147007f Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: case-insensitive Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/vapi/vsl.h b/include/vapi/vsl.h index a1f1528e6..f78080225 100644 --- a/include/vapi/vsl.h +++ b/include/vapi/vsl.h @@ -180,7 +180,7 @@ int VSL_Name2Tag(const char *name, int l); /* * Convert string to tag number (= enum VSL_tag_e). Name can be a * substring from the beginning of a tag when that substring is - * unique. Matching is case insensitive. + * unique. Matching is case-insensitive. * * Arguments: * name: A tag name (or substring) to match against @@ -196,7 +196,7 @@ int VSL_Glob2Tags(const char *glob, int l, VSL_tagfind_f *func, void *priv); /* * Convert a string to multiple tag matches. The string can have * either a prefix or postfix wildcard (*) character. For each - * matching tag func is called. Matching is done case insensitive. + * matching tag func is called. Matching is done case-insensitive. * * Arguments: * glob: The string to match From phk at FreeBSD.org Mon Aug 19 12:43:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:07 +0000 (UTC) Subject: [master] cdd8f4ddc spelling: current Message-ID: <20240819124307.1118511DF8B@lists.varnish-cache.org> commit cdd8f4ddc02e2d0da405c8a690c1f6491a85970c Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: current Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/vapi/vsl.h b/include/vapi/vsl.h index f78080225..3b43f2cb4 100644 --- a/include/vapi/vsl.h +++ b/include/vapi/vsl.h @@ -461,7 +461,7 @@ FILE *VSL_WriteOpen(struct VSL_data *vsl, const char *name, int append, int VSL_Write(const struct VSL_data *vsl, const struct VSL_cursor *c, void *fo); /* - * Write the currect record pointed to be c to the FILE* fo + * Write the current record pointed to be c to the FILE* fo * * Return values: * 0: Success From phk at FreeBSD.org Mon Aug 19 12:43:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:07 +0000 (UTC) Subject: [master] bfd1a6d6a spelling: endianness Message-ID: <20240819124307.341D711DF91@lists.varnish-cache.org> commit bfd1a6d6ab414d3d7f4c8fcff40958bc64a2bf54 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: endianness Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/vapi/vsl_int.h b/include/vapi/vsl_int.h index 27e3fcaf1..87d38b04c 100644 --- a/include/vapi/vsl_int.h +++ b/include/vapi/vsl_int.h @@ -51,7 +51,7 @@ * log records. * * Each logrecord consist of four or more 32 bit words, stored in - * native endiansess: + * native endianness: * * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * | TAG | unused |ver| length | From phk at FreeBSD.org Mon Aug 19 12:43:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:07 +0000 (UTC) Subject: [master] a80ec6095 spelling: expunges Message-ID: <20240819124307.5FC0E11DF99@lists.varnish-cache.org> commit a80ec609536fb4f0fc9d4ddbf8136a89f0040d2b Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: expunges Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/tbl/params.h b/include/tbl/params.h index 668658324..9edcbb7cb 100644 --- a/include/tbl/params.h +++ b/include/tbl/params.h @@ -163,7 +163,7 @@ PARAM_SIMPLE( "When this parameter is set to a non-zero value, the ban lurker " "continues to work the ban list as usual top to bottom, but when it " "reaches the ban_cutoff-th ban, it treats all objects as if they " - "matched a ban and expurges them from cache. As actively used objects " + "matched a ban and expunges them from cache. As actively used objects " "get tested against the ban list at request time and thus are likely " "to be associated with bans near the top of the ban list, with " "ban_cutoff, least recently accessed objects (the \"long tail\") are " From phk at FreeBSD.org Mon Aug 19 12:43:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:07 +0000 (UTC) Subject: [master] d528cd57b spelling: gunzipped Message-ID: <20240819124307.8059011DFA2@lists.varnish-cache.org> commit d528cd57ba1aa65518b1470c64b015c0c115bbd3 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: gunzipped Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/tbl/vsl_tags.h b/include/tbl/vsl_tags.h index 2c35404db..5d50d8afc 100644 --- a/include/tbl/vsl_tags.h +++ b/include/tbl/vsl_tags.h @@ -481,7 +481,7 @@ SLTM(VCL_Error, 0, "VCL execution error message", SLTM(Gzip, 0, "G(un)zip performed on object", "A Gzip record is emitted for each instance of gzip or gunzip" " work performed. Worst case, an ESI transaction stored in" - " gzip'ed objects but delivered gunziped, will run into many of" + " gzip'ed objects but delivered gunzipped, will run into many of" " these.\n\n" "The format is::\n\n" "\t%c %c %c %d %d %d %d %d\n" From phk at FreeBSD.org Mon Aug 19 12:43:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:07 +0000 (UTC) Subject: [master] 2c3e4a148 spelling: gzipped Message-ID: <20240819124307.A2C1811DFB6@lists.varnish-cache.org> commit 2c3e4a1485e5bf6a460c3d8ab272ee9888bbfaf1 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: gzipped Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/tbl/obj_attr.h b/include/tbl/obj_attr.h index f9441b17a..dbbb2295d 100644 --- a/include/tbl/obj_attr.h +++ b/include/tbl/obj_attr.h @@ -56,7 +56,7 @@ #ifdef OBJ_FLAG /* upper, lower, val */ - OBJ_FLAG(GZIPED, gziped, (1<<1)) + OBJ_FLAG(GZIPED, gzipped, (1<<1)) OBJ_FLAG(CHGCE, chgce, (1<<2)) OBJ_FLAG(IMSCAND, imscand, (1<<3)) OBJ_FLAG(ESIPROC, esiproc, (1<<4)) From phk at FreeBSD.org Mon Aug 19 12:43:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:07 +0000 (UTC) Subject: [master] 8d2d665ca spelling: implicit Message-ID: <20240819124307.C77EC11DFC4@lists.varnish-cache.org> commit 8d2d665ca57692e595e71ee11b8e9bfc45efdd7f Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: implicit Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/tbl/params.h b/include/tbl/params.h index 9edcbb7cb..2bc1b412d 100644 --- a/include/tbl/params.h +++ b/include/tbl/params.h @@ -865,7 +865,7 @@ PARAM_SIMPLE( /* descr */ "How many parked request we start for each completed request on " "the object.\n" - "NB: Even with the implict delay of delivery, this parameter " + "NB: Even with the implicit delay of delivery, this parameter " "controls an exponential increase in number of worker threads.", /* flags */ EXPERIMENTAL ) From phk at FreeBSD.org Mon Aug 19 12:43:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:07 +0000 (UTC) Subject: [master] d0c1b6b40 spelling: indefinitely Message-ID: <20240819124307.E048911DFD1@lists.varnish-cache.org> commit d0c1b6b4010c43729b4e223c95bbc3e80f82f0fe Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: indefinitely Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/vut_options.h b/include/vut_options.h index 534ff0cc1..903b70eab 100644 --- a/include/vut_options.h +++ b/include/vut_options.h @@ -106,6 +106,6 @@ " attempted only once and will fail immediately if" \ " unsuccessful. If set to \"off\", the connection will not" \ " fail, allowing the utility to start and wait" \ - " indefinetely for the Varnish instance to appear. " \ + " indefinitely for the Varnish instance to appear. " \ " Defaults to 5 seconds." \ ) From phk at FreeBSD.org Mon Aug 19 12:43:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:08 +0000 (UTC) Subject: [master] 6d97367b6 spelling: language Message-ID: <20240819124308.0AA5D11DFE6@lists.varnish-cache.org> commit 6d97367b6eab0d013e37864a6451764ec5ddcac2 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: language Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/vsb.h b/include/vsb.h index 37fc1c027..f8ab8b150 100644 --- a/include/vsb.h +++ b/include/vsb.h @@ -100,7 +100,7 @@ void VSB_destroy(struct vsb **); */ #define VSB_QUOTE_CSTR 8 /* - * C lanuage source code literal string(s) + * C language source code literal string(s) * Breaks strings at \n (expecting string concatenation) */ #define VSB_QUOTE_UNSAFE 16 From phk at FreeBSD.org Mon Aug 19 12:43:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:08 +0000 (UTC) Subject: [master] bf8988815 spelling: preserve Message-ID: <20240819124308.2789E11DFF5@lists.varnish-cache.org> commit bf8988815fa8a982473c9c1c9b193f7e7ddd3dac Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: preserve Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/tbl/params.h b/include/tbl/params.h index 2bc1b412d..7c093baa9 100644 --- a/include/tbl/params.h +++ b/include/tbl/params.h @@ -1348,7 +1348,7 @@ PARAM_SIMPLE( "initial SETTINGS frame, the http_req_size parameter is instead.\n\n" "The http_req_size advises HTTP2 clients of the maximum size for " "the header list. Exceeding http_req_size results in a reset stream " - "after processing the HPACK block to perserve the connection, but " + "after processing the HPACK block to preserve the connection, but " "exceeding h2_max_header_list_size results in the HTTP2 connection " "going away immediately.\n\n" "If h2_max_header_list_size is lower than http_req_size, it has no " From phk at FreeBSD.org Mon Aug 19 12:43:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:08 +0000 (UTC) Subject: [master] 38613a4b8 spelling: sizing Message-ID: <20240819124308.48BF411DFFC@lists.varnish-cache.org> commit 38613a4b8b4276e5945d927cf7a61e2fcdc23385 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 09:11:22 2024 -0400 spelling: sizing Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/vbm.h b/include/vbm.h index 1136d19d9..3b7adf284 100644 --- a/include/vbm.h +++ b/include/vbm.h @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Self-sizeing bitmap operations + * Self-sizing bitmap operations */ #include diff --git a/include/vbm_test.c b/include/vbm_test.c index bf55a6a30..dec868bf5 100644 --- a/include/vbm_test.c +++ b/include/vbm_test.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Test Self-sizeing bitmap operations static initialization with dynamic growth + * Test Self-sizing bitmap operations static initialization with dynamic growth */ #include From phk at FreeBSD.org Mon Aug 19 12:43:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:43:08 +0000 (UTC) Subject: [master] b0c9281c0 spelling: unusable Message-ID: <20240819124308.6652E11E00B@lists.varnish-cache.org> commit b0c9281c08dc000cea31dc2ea7a2ca79af63dcac Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: unusable Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/tbl/cli_cmds.h b/include/tbl/cli_cmds.h index 3295b5844..6f5eb5c90 100644 --- a/include/tbl/cli_cmds.h +++ b/include/tbl/cli_cmds.h @@ -344,7 +344,7 @@ CLI_CMD(BACKEND_SET_HEALTH, " * With ``auto``, the health status is determined by a probe\n" " or some other dynamic mechanism, if any\n" " * ``healthy`` sets the backend as usable\n" - " * ``sick`` sets the backend as unsable\n", + " * ``sick`` sets the backend as unusable\n", 2, 2 ) From phk at FreeBSD.org Mon Aug 19 12:44:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:06 +0000 (UTC) Subject: [master] a0466cfb0 spelling: a Message-ID: <20240819124406.7DA9C11E938@lists.varnish-cache.org> commit a0466cfb0358a333c966cbed523908f2b1736392 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:52 2024 -0400 spelling: a Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/storage/storage_file.c b/bin/varnishd/storage/storage_file.c index 299464e19..365b4932f 100644 --- a/bin/varnishd/storage/storage_file.c +++ b/bin/varnishd/storage/storage_file.c @@ -68,7 +68,7 @@ * * Last bucket is "larger than" so choose number so that the second * to last bucket matches the 128k CHUNKSIZE in cache_fetch.c when - * using the a 4K minimal page size + * using a 4K minimal page size */ #define NBUCKET (128 / 4 + 1) diff --git a/bin/varnishtest/tests/a00000.vtc b/bin/varnishtest/tests/a00000.vtc index 2d3604f24..2cc25bc0f 100644 --- a/bin/varnishtest/tests/a00000.vtc +++ b/bin/varnishtest/tests/a00000.vtc @@ -19,7 +19,7 @@ shell -exit 77 -expect {0 tests failed, 1 tests skipped, 0 tests passed} { varnishtest -k _.vtc } -# Test external macro-def with a a two-turtle test +# Test external macro-def with a two-turtle test shell -expect {__=barf} { echo varnishtest foo > _.vtc printf 'shell {echo %c{foobar} > ${tmpdir}/__}' '$' >> _.vtc diff --git a/bin/varnishtest/tests/g00008.vtc b/bin/varnishtest/tests/g00008.vtc index 3929b6999..b57d84d8a 100644 --- a/bin/varnishtest/tests/g00008.vtc +++ b/bin/varnishtest/tests/g00008.vtc @@ -1,6 +1,6 @@ varnishtest "Test uncommon GZIP header fields" -# With a a handcrafted GZIP file with all optional header fields +# With a handcrafted GZIP file with all optional header fields server s1 { rxreq From phk at FreeBSD.org Mon Aug 19 12:44:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:06 +0000 (UTC) Subject: [master] 1d20fc62e spelling: adulterated Message-ID: <20240819124406.9B0F711E940@lists.varnish-cache.org> commit 1d20fc62e9971afd4ddba372aa20b685a417acca Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:52 2024 -0400 spelling: adulterated Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/http1/cache_http1_fetch.c b/bin/varnishd/http1/cache_http1_fetch.c index 4ea37e1d3..99075c9fe 100644 --- a/bin/varnishd/http1/cache_http1_fetch.c +++ b/bin/varnishd/http1/cache_http1_fetch.c @@ -248,7 +248,7 @@ V1F_FetchRespHdr(struct busyobj *bo) /* * Figure out how the fetch is supposed to happen, before the - * headers are adultered by VCL + * headers are adulterated by VCL */ if (http_method_eq(http_GetMethod(bo->bereq), HEAD)) { /* From phk at FreeBSD.org Mon Aug 19 12:44:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:06 +0000 (UTC) Subject: [master] 2554eb78c spelling: an Message-ID: <20240819124406.B760F11E946@lists.varnish-cache.org> commit 2554eb78cb2e618ac0204c44f413c9b5d278c664 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:52 2024 -0400 spelling: an Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c index eb862bf49..3cdacbdc5 100644 --- a/bin/varnishd/cache/cache_expire.c +++ b/bin/varnishd/cache/cache_expire.c @@ -145,7 +145,7 @@ EXP_RefNewObjcore(struct objcore *oc) /*-------------------------------------------------------------------- - * Call EXP's attention to a an oc + * Call EXP's attention to an oc */ void From phk at FreeBSD.org Mon Aug 19 12:44:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:06 +0000 (UTC) Subject: [master] 97b983307 spelling: announce Message-ID: <20240819124406.D3E9511E94A@lists.varnish-cache.org> commit 97b983307271d4a4a3b4fab5d3746769c8e7b6d0 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:52 2024 -0400 spelling: announce Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/o00001.vtc b/bin/varnishtest/tests/o00001.vtc index 03c898996..97209254c 100644 --- a/bin/varnishtest/tests/o00001.vtc +++ b/bin/varnishtest/tests/o00001.vtc @@ -205,7 +205,7 @@ delay .1 client c2 { # max length with garbage sendhex "0d 0a 0d 0a 00 0d 0a 51 55 49 54 0a" - # annouce 1025 bytes > 1024 implicit limit + # announce 1025 bytes > 1024 implicit limit sendhex "20 00 04 01" expect_close } -run From phk at FreeBSD.org Mon Aug 19 12:44:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:06 +0000 (UTC) Subject: [master] 7b62ae756 spelling: brightness Message-ID: <20240819124406.EDBF211E94E@lists.varnish-cache.org> commit 7b62ae75690c08d6a61466ee27b68c09e52a4e71 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: brightness Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/teken.3 b/bin/varnishtest/teken.3 index 840a17cec..b5263e4ad 100644 --- a/bin/varnishtest/teken.3 +++ b/bin/varnishtest/teken.3 @@ -181,7 +181,7 @@ The function is similar to .Fn teken_256to16 except it converts to an ANSI 8-color code. -This is more accurate than discarding the brigtness bit in the result of +This is more accurate than discarding the brightness bit in the result of .Fn teken_256to16 . .Pp The From phk at FreeBSD.org Mon Aug 19 12:44:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:07 +0000 (UTC) Subject: [master] 33648714a spelling: calculate Message-ID: <20240819124407.155E711E953@lists.varnish-cache.org> commit 33648714a76728708ffed7a6bd4b5330fe8fcaf0 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: calculate Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/storage/storage_persistent.h b/bin/varnishd/storage/storage_persistent.h index 0f8aafbed..8c2f4c236 100644 --- a/bin/varnishd/storage/storage_persistent.h +++ b/bin/varnishd/storage/storage_persistent.h @@ -332,7 +332,7 @@ void smp_newsilo(struct smp_sc *sc); int smp_valid_silo(struct smp_sc *sc); /*-------------------------------------------------------------------- - * Caculate payload of some stuff + * Calculate payload of some stuff */ static inline uint64_t From phk at FreeBSD.org Mon Aug 19 12:44:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:07 +0000 (UTC) Subject: [master] ea487c742 spelling: cannot Message-ID: <20240819124407.3488E11E95A@lists.varnish-cache.org> commit ea487c742c3be6e65b2a0bf52bda7a4c7b75f93c Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: cannot Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c index 650ad26cf..c035f8a25 100644 --- a/bin/varnishd/cache/cache_fetch.c +++ b/bin/varnishd/cache/cache_fetch.c @@ -1121,7 +1121,7 @@ vbf_fetch_thread(struct worker *wrk, void *priv) VCL_TaskLeave(ctx, bo->privs); http_Teardown(bo->bereq); http_Teardown(bo->beresp); - // can not make assumptions about the number of references here #3434 + // cannot make assumptions about the number of references here #3434 if (bo->bereq_body != NULL) (void) HSH_DerefObjCore(bo->wrk, &bo->bereq_body, 0); diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c index 6693af8c3..d0b28bf61 100644 --- a/bin/varnishd/mgt/mgt_cli.c +++ b/bin/varnishd/mgt/mgt_cli.c @@ -484,7 +484,7 @@ mgt_cli_secret(const char *S_arg) VJ_master(JAIL_MASTER_FILE); fd = open(S_arg, O_RDONLY); if (fd < 0) { - fprintf(stderr, "Can not open secret-file \"%s\"\n", S_arg); + fprintf(stderr, "Cannot open secret-file \"%s\"\n", S_arg); exit(2); } VJ_master(JAIL_MASTER_LOW); @@ -495,7 +495,7 @@ mgt_cli_secret(const char *S_arg) exit(2); } if (i < 0) { - fprintf(stderr, "Can not read secret-file \"%s\"\n", S_arg); + fprintf(stderr, "Cannot read secret-file \"%s\"\n", S_arg); exit(2); } closefd(&fd); diff --git a/bin/varnishd/mgt/mgt_jail.c b/bin/varnishd/mgt/mgt_jail.c index 769e854a1..6ba0a8e9a 100644 --- a/bin/varnishd/mgt/mgt_jail.c +++ b/bin/varnishd/mgt/mgt_jail.c @@ -177,7 +177,7 @@ VJ_make_workdir(const char *dname) closefd(&i); AZ(unlink("_.testfile")); ARGV_ERR("Working directory %s (-n argument) " - "can not reside on a file system mounted noexec\n", dname); + "cannot reside on a file system mounted noexec\n", dname); } #endif diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c index 009ad7618..377ae18a4 100644 --- a/bin/varnishd/mgt/mgt_param.c +++ b/bin/varnishd/mgt/mgt_param.c @@ -98,7 +98,7 @@ static const char WIZARD_TEXT[] = static const char PROTECTED_TEXT[] = "\n\n" - "NB: This parameter is protected and can not be changed."; + "NB: This parameter is protected and cannot be changed."; static const char ONLY_ROOT_TEXT[] = "\n\n" diff --git a/bin/varnishtest/tests/c00042.vtc b/bin/varnishtest/tests/c00042.vtc index 6c9208284..a57ec7797 100644 --- a/bin/varnishtest/tests/c00042.vtc +++ b/bin/varnishtest/tests/c00042.vtc @@ -159,7 +159,7 @@ varnish v1 -errvcl "Cannot set both .via and .path" { } } -varnish v1 -errvcl "Can not stack .via backends" { +varnish v1 -errvcl "Cannot stack .via backends" { backend a { .host = "${v2_addr}"; .port = "${v2_port}"; } backend b { diff --git a/bin/varnishtest/tests/m00000.vtc b/bin/varnishtest/tests/m00000.vtc index 715f5fa7b..0ffce7e16 100644 --- a/bin/varnishtest/tests/m00000.vtc +++ b/bin/varnishtest/tests/m00000.vtc @@ -322,7 +322,7 @@ delay .5 varnish v1 -expect vmods == 0 -varnish v1 -errvcl {Symbol 'std' type (vmod) can not be used in expression.} { +varnish v1 -errvcl {Symbol 'std' type (vmod) cannot be used in expression.} { import std; sub vcl_recv { diff --git a/bin/varnishtest/tests/v00020.vtc b/bin/varnishtest/tests/v00020.vtc index 848c7252e..51ac0f09f 100644 --- a/bin/varnishtest/tests/v00020.vtc +++ b/bin/varnishtest/tests/v00020.vtc @@ -56,7 +56,7 @@ varnish v1 -errvcl {Symbol 'asub' can only be used as a SUB expression} { } } -varnish v1 -errvcl {Symbol 'acl' type (reserved) can not be used in expression.} { +varnish v1 -errvcl {Symbol 'acl' type (reserved) cannot be used in expression.} { import std; sub vcl_recv { call acl; } } @@ -442,7 +442,7 @@ varnish v1 -errvcl {'||' must be preceeded by BOOL, found REAL.} { sub vcl_recv { if (std.random(0,1) || 0) { } } } -varnish v1 -errvcl {Symbol 'acl' type (reserved) can not be used in expression.} { +varnish v1 -errvcl {Symbol 'acl' type (reserved) cannot be used in expression.} { import std; sub vcl_recv { if (client.ip ~ acl) {} } } diff --git a/bin/varnishtest/tests/v00038.vtc b/bin/varnishtest/tests/v00038.vtc index c7c4d61ed..0173bb098 100644 --- a/bin/varnishtest/tests/v00038.vtc +++ b/bin/varnishtest/tests/v00038.vtc @@ -49,7 +49,7 @@ varnish v1 -errvcl "Window must be 64 or less" { } } -varnish v1 -errvcl "Threshold can not be greater than window" { +varnish v1 -errvcl "Threshold cannot be greater than window" { backend b1 { .host = "${localhost}"; .probe = { From phk at FreeBSD.org Mon Aug 19 12:44:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:07 +0000 (UTC) Subject: [master] 795eeed74 spelling: coalescing Message-ID: <20240819124407.50DC411E967@lists.varnish-cache.org> commit 795eeed74fc4e9c96f4c38607f31289ab6daec16 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:37:07 2024 -0400 spelling: coalescing Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c index c035f8a25..76a819c2c 100644 --- a/bin/varnishd/cache/cache_fetch.c +++ b/bin/varnishd/cache/cache_fetch.c @@ -839,7 +839,7 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo) /* Wait for the stale object to become fully fetched, so * that we can catch fetch errors, before we unbusy the * new object. This serves two purposes. First it helps - * with request coalesching, and stops long chains of + * with request coalescing, and stops long chains of * IMS-updated short-TTL objects all streaming from a * single slow body fetch. Second it makes sure that all * the object attributes are complete when we copy them From phk at FreeBSD.org Mon Aug 19 12:44:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:07 +0000 (UTC) Subject: [master] 03a11d4e7 spelling: collapse Message-ID: <20240819124407.76E9011E983@lists.varnish-cache.org> commit 03a11d4e711aee7e86907799830f6d1ae9c52e4a Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: collapse Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/storage/storage_malloc.c b/bin/varnishd/storage/storage_malloc.c index 2c3ce5b5b..7e7a7b8ac 100644 --- a/bin/varnishd/storage/storage_malloc.c +++ b/bin/varnishd/storage/storage_malloc.c @@ -92,7 +92,7 @@ sma_alloc(const struct stevedore *st, size_t size) return (NULL); /* - * Do not collaps the sma allocation with sma->s.ptr: it is not + * Do not collapse the sma allocation with sma->s.ptr: it is not * a good idea. Not only would it make ->trim impossible, * performance-wise it would be a catastropy with chunksized * allocations growing another full page, just to accommodate the sma. diff --git a/bin/varnishd/storage/storage_umem.c b/bin/varnishd/storage/storage_umem.c index 770efb7d7..6d3402246 100644 --- a/bin/varnishd/storage/storage_umem.c +++ b/bin/varnishd/storage/storage_umem.c @@ -168,7 +168,7 @@ smu_alloc(const struct stevedore *st, size_t size) return (NULL); /* - * Do not collaps the smu allocation with smu->s.ptr: it is not + * Do not collapse the smu allocation with smu->s.ptr: it is not * a good idea. Not only would it make ->trim impossible, * performance-wise it would be a catastropy with chunksized * allocations growing another full page, just to accommodate the smu. From phk at FreeBSD.org Mon Aug 19 12:44:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:07 +0000 (UTC) Subject: [master] 02181065d spelling: columns Message-ID: <20240819124407.9272711E9A1@lists.varnish-cache.org> commit 02181065de3271463987c7c42cb26abd6e308046 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: columns Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c index d44dc4f27..792f2f3eb 100644 --- a/bin/varnishtest/vtc_process.c +++ b/bin/varnishtest/vtc_process.c @@ -913,7 +913,7 @@ process_close(struct process *p) * [-run] [-close] [-kill SIGNAL] [-start] [-stop] [-wait] * [-write STRING] [-writeln STRING] [-writehex HEXSTRING] * [-need-bytes [+]NUMBER] - * [-screen-dump] [-winsz LINES COLUMNSS] [-ansi-response] + * [-screen-dump] [-winsz LINES COLUMNS] [-ansi-response] * [-expect-cursor LINE COLUMN] [-expect-text LINE COLUMN TEXT] * [-match-text LINE COLUMN REGEXP] * From phk at FreeBSD.org Mon Aug 19 12:44:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:07 +0000 (UTC) Subject: [master] 01da10d20 spelling: compatible Message-ID: <20240819124407.D090C11E9B3@lists.varnish-cache.org> commit 01da10d207816e260ccb5ed21179c7de669d7a96 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: compatible Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_rfc2616.c b/bin/varnishd/cache/cache_rfc2616.c index a91c9f862..637450a67 100644 --- a/bin/varnishd/cache/cache_rfc2616.c +++ b/bin/varnishd/cache/cache_rfc2616.c @@ -78,7 +78,7 @@ rfc2616_time(const char *p) ep++; /* We accept ',' as an end character because we may be parsing a * multi-element Cache-Control part. We accept '.' to be future - * compatble with fractional seconds. */ + * compatible with fractional seconds. */ if (*ep == '\0' || *ep == ',' || *ep == '.') return (val); return (0); From phk at FreeBSD.org Mon Aug 19 12:44:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:07 +0000 (UTC) Subject: [master] ce0dda1c8 spelling: consecutive Message-ID: <20240819124408.116A211E9C5@lists.varnish-cache.org> commit ce0dda1c86a3217451b819e7be34a92daa221ea9 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: consecutive Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/r00902.vtc b/bin/varnishtest/tests/r00902.vtc index c12506132..391ef94c4 100644 --- a/bin/varnishtest/tests/r00902.vtc +++ b/bin/varnishtest/tests/r00902.vtc @@ -1,4 +1,4 @@ -varnishtest "Ticket #902 http_CollectHdr() failure on consequitive headers" +varnishtest "Ticket #902 http_CollectHdr() failure on consecutive headers" server s1 { rxreq From phk at FreeBSD.org Mon Aug 19 12:44:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:08 +0000 (UTC) Subject: [master] c836c95ea spelling: constructor Message-ID: <20240819124408.3EE9611E9CA@lists.varnish-cache.org> commit c836c95ea9f70f45ddf862e04e91e76df8367a31 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: constructor Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/m00019.vtc b/bin/varnishtest/tests/m00019.vtc index bebbfe4d7..8d480854a 100644 --- a/bin/varnishtest/tests/m00019.vtc +++ b/bin/varnishtest/tests/m00019.vtc @@ -1,4 +1,4 @@ -varnishtest "Test vmod functions/contructor named arguments and defaults" +varnishtest "Test vmod functions/constructor named arguments and defaults" server s1 { rxreq From phk at FreeBSD.org Mon Aug 19 12:44:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:08 +0000 (UTC) Subject: [master] 60998b00b spelling: contrary Message-ID: <20240819124408.667DF11E9DC@lists.varnish-cache.org> commit 60998b00bd278d7b227822fe42087233d1e28fb7 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: contrary Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/vtc_haproxy.c b/bin/varnishtest/vtc_haproxy.c index b3e047dd4..e4150bf01 100644 --- a/bin/varnishtest/vtc_haproxy.c +++ b/bin/varnishtest/vtc_haproxy.c @@ -290,7 +290,7 @@ haproxy_cli_recv(struct haproxy_cli *hc) * SECTION: haproxy.cli.expect * expect OP STRING * Regex match the CLI reception buffer with STRING - * if OP is ~ or, on the contraty, if OP is !~ check that there is + * if OP is ~ or, on the contrary, if OP is !~ check that there is * no regex match. */ static void v_matchproto_(cmd_f) From phk at FreeBSD.org Mon Aug 19 12:44:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:08 +0000 (UTC) Subject: [master] 987d86588 spelling: deliberately Message-ID: <20240819124408.8839911E9E4@lists.varnish-cache.org> commit 987d86588c2efc0abfed7d06bfc6641e7cb2d168 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: deliberately Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_rfc2616.c b/bin/varnishd/cache/cache_rfc2616.c index 637450a67..38e302237 100644 --- a/bin/varnishd/cache/cache_rfc2616.c +++ b/bin/varnishd/cache/cache_rfc2616.c @@ -127,7 +127,7 @@ RFC2616_Ttl(struct busyobj *bo, vtim_real now, vtim_real *t_origin, * parsed value of t_origin, as that will be needed to * synthesize a correct Age header in delivery. The * SLT_TTL log tag at the end of this function is - * deliberetaly skipped to avoid confusion when reading + * deliberately skipped to avoid confusion when reading * the log.*/ *ttl = -1; *grace = 0; From phk at FreeBSD.org Mon Aug 19 12:44:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:08 +0000 (UTC) Subject: [master] 8fb453c89 spelling: dissuade Message-ID: <20240819124408.ADC4C11E9F8@lists.varnish-cache.org> commit 8fb453c89203aa578f2fdacdd5e5dd8eaa805e63 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: dissuade Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_req_body.c b/bin/varnishd/cache/cache_req_body.c index 51d45471e..0ee49c37a 100644 --- a/bin/varnishd/cache/cache_req_body.c +++ b/bin/varnishd/cache/cache_req_body.c @@ -233,7 +233,7 @@ VRB_Iterate(struct worker *wrk, struct vsl_log *vsl, /*---------------------------------------------------------------------- * VRB_Ignore() is a dedicated function, because we might - * be able to disuade or terminate its transmission in some protocols. + * be able to dissuade or terminate its transmission in some protocols. * * For HTTP1, we do nothing if we are going to close the connection anyway or * just iterate it into oblivion. From phk at FreeBSD.org Mon Aug 19 12:44:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:08 +0000 (UTC) Subject: [master] bd9dce194 spelling: does Message-ID: <20240819124408.CF93011E9FF@lists.varnish-cache.org> commit bd9dce194b9270ce3325b20ed8fdd31b421f8b17 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: does Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/o00005.vtc b/bin/varnishtest/tests/o00005.vtc index 444edd8c6..08a44d726 100644 --- a/bin/varnishtest/tests/o00005.vtc +++ b/bin/varnishtest/tests/o00005.vtc @@ -1,6 +1,6 @@ varnishtest "PROXY v2 TLV overflow" -# this does does not work with IPv6, the workspace overflow test is too brittle +# this does not work with IPv6, the workspace overflow test is too brittle feature ipv4 varnish v1 -arg "-p pool_sess=0,0,0" -proto "PROXY" -vcl { From phk at FreeBSD.org Mon Aug 19 12:44:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:08 +0000 (UTC) Subject: [master] 5e73db71a spelling: duplicate Message-ID: <20240819124408.F24E411EA10@lists.varnish-cache.org> commit 5e73db71a4d72c36038bbc20aedee0528121cc8d Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: duplicate Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/r01581.vtc b/bin/varnishtest/tests/r01581.vtc index 9ba44b10f..1a2fc27f6 100644 --- a/bin/varnishtest/tests/r01581.vtc +++ b/bin/varnishtest/tests/r01581.vtc @@ -1,4 +1,4 @@ -varnishtest "Duplcate SLT_Begin" +varnishtest "Duplicate SLT_Begin" server s1 { rxreq diff --git a/bin/varnishtest/tests/t02026.vtc b/bin/varnishtest/tests/t02026.vtc index b464f8cdc..2182a7a34 100644 --- a/bin/varnishtest/tests/t02026.vtc +++ b/bin/varnishtest/tests/t02026.vtc @@ -1,4 +1,4 @@ -varnishtest "Dublicate pseudo-headers" +varnishtest "Duplicate pseudo-headers" server s1 { rxreq From phk at FreeBSD.org Mon Aug 19 12:44:09 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:09 +0000 (UTC) Subject: [master] 408b2147c spelling: errors Message-ID: <20240819124409.1D36011EA1D@lists.varnish-cache.org> commit 408b2147c3a04562ddded997a6c3f59ffa141439 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: errors Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/r01737.vtc b/bin/varnishtest/tests/r01737.vtc index 454bd96e8..9b5d23a93 100644 --- a/bin/varnishtest/tests/r01737.vtc +++ b/bin/varnishtest/tests/r01737.vtc @@ -4,7 +4,7 @@ barrier b1 cond 2 # Build a esi request tree that fails on flush before include at two different # levels. Synchronize a client close after the response headers have been -# received by the client. This produces write erros for the body parts in all +# received by the client. This produces write errors for the body parts in all # fragments. server s1 { rxreq From phk at FreeBSD.org Mon Aug 19 12:44:09 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:09 +0000 (UTC) Subject: [master] ea7d788e1 spelling: filtered Message-ID: <20240819124409.579C911EA39@lists.varnish-cache.org> commit ea7d788e13d4018c61bd7192a97d9ea06fafd31a Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: filtered Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c index 63818eaad..37f54e2ac 100644 --- a/bin/varnishd/cache/cache_http.c +++ b/bin/varnishd/cache/cache_http.c @@ -1193,7 +1193,7 @@ http_PutResponse(struct http *to, const char *proto, uint16_t status, } /*-------------------------------------------------------------------- - * check if header is filterd by the dynamic marker or the static + * check if header is filtered by the dynamic marker or the static * definitions in http_headers.h */ From phk at FreeBSD.org Mon Aug 19 12:44:09 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:09 +0000 (UTC) Subject: [master] 1a7f812ae spelling: for Message-ID: <20240819124409.7C6FD11EA44@lists.varnish-cache.org> commit 1a7f812ae59ab35edfdaf11dac967e115041adca Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: for Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/s00007.vtc b/bin/varnishtest/tests/s00007.vtc index 0374605ab..45c6c8538 100644 --- a/bin/varnishtest/tests/s00007.vtc +++ b/bin/varnishtest/tests/s00007.vtc @@ -1,4 +1,4 @@ -varnishtest "Effective TTL for for a slow backend" +varnishtest "Effective TTL for a slow backend" server s1 { rxreq From phk at FreeBSD.org Mon Aug 19 12:44:09 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:09 +0000 (UTC) Subject: [master] 9e241252f spelling: grab Message-ID: <20240819124409.9C44611EA4F@lists.varnish-cache.org> commit 9e241252facb1befd0f4eafd32b71dd746e3c4dc Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: grab Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/storage/storage_persistent.c b/bin/varnishd/storage/storage_persistent.c index 0f858771e..df2fc9128 100644 --- a/bin/varnishd/storage/storage_persistent.c +++ b/bin/varnishd/storage/storage_persistent.c @@ -363,7 +363,7 @@ smp_open(struct stevedore *st) AZ(smp_open_segs(sc, &sc->seg2)); /* - * Grap a reference to the tail of the ban list, until the thread + * Grab a reference to the tail of the ban list, until the thread * has loaded all objects, so we can be sure that all of our * proto-bans survive until then. */ From phk at FreeBSD.org Mon Aug 19 12:44:09 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:09 +0000 (UTC) Subject: [master] 05f214a31 spelling: hardware Message-ID: <20240819124409.BA3D811EA5D@lists.varnish-cache.org> commit 05f214a3177da5b0c1580fa6a3c46054e8529a6c Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: hardware Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/teken.3 b/bin/varnishtest/teken.3 index b5263e4ad..899186572 100644 --- a/bin/varnishtest/teken.3 +++ b/bin/varnishtest/teken.3 @@ -173,7 +173,7 @@ whose color with default palettes is as similar as possible (not very similar). The lower 3 bits of the result are the ANSI color and the next lowest bit is brightness. -Other layers (hardare and software) that only support 16 colors can use +Other layers (hardware and software) that only support 16 colors can use this to avoid knowing the details of 256-color codes. .Pp The From phk at FreeBSD.org Mon Aug 19 12:44:09 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:09 +0000 (UTC) Subject: [master] a8a0bb2e1 spelling: implicit Message-ID: <20240819124409.DD6CF11EA65@lists.varnish-cache.org> commit a8a0bb2e1c05af14ee4e321020db70a5009f4724 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: implicit Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/vtc_logexp.c b/bin/varnishtest/vtc_logexp.c index 3a805864b..705cd96d1 100644 --- a/bin/varnishtest/vtc_logexp.c +++ b/bin/varnishtest/vtc_logexp.c @@ -834,7 +834,7 @@ cmd_logexpect(CMD_ARGS) } /* - * We do an implict -wait if people muck about with a + * We do an implicit -wait if people muck about with a * running logexp. */ if (le->run) diff --git a/bin/varnishtest/vtc_server.c b/bin/varnishtest/vtc_server.c index f704147d8..45913aaa7 100644 --- a/bin/varnishtest/vtc_server.c +++ b/bin/varnishtest/vtc_server.c @@ -543,7 +543,7 @@ cmd_server(CMD_ARGS) } /* - * We do an implict -wait if people muck about with a + * We do an implicit -wait if people muck about with a * running server. */ if (s->run) diff --git a/bin/varnishtest/vtc_syslog.c b/bin/varnishtest/vtc_syslog.c index 6cb59b04c..2a291957f 100644 --- a/bin/varnishtest/vtc_syslog.c +++ b/bin/varnishtest/vtc_syslog.c @@ -617,7 +617,7 @@ cmd_syslog(CMD_ARGS) } /* - * We do an implict -wait if people muck about with a + * We do an implicit -wait if people muck about with a * running syslog. * This only works if the previous ->spec has completed */ From phk at FreeBSD.org Mon Aug 19 12:44:10 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:10 +0000 (UTC) Subject: [master] 7aabf8537 spelling: implicitly Message-ID: <20240819124410.065CE11EA75@lists.varnish-cache.org> commit 7aabf8537837910af5707032e1083b7abde1a4e2 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: implicitly Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/vtc_tunnel.c b/bin/varnishtest/vtc_tunnel.c index 5960ca5cd..8b9cc1863 100644 --- a/bin/varnishtest/vtc_tunnel.c +++ b/bin/varnishtest/vtc_tunnel.c @@ -99,7 +99,7 @@ * * If one end of the tunnel is closed before the end of the specification * the test case will fail. A specification that ends in a paused state will - * implicitely resume the tunnel. + * implicitly resume the tunnel. */ enum tunnel_state_e { From phk at FreeBSD.org Mon Aug 19 12:44:10 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:10 +0000 (UTC) Subject: [master] c72224a42 spelling: implies Message-ID: <20240819124410.38A1311EA82@lists.varnish-cache.org> commit c72224a42ba4d358f8d7966da1c13f354bdb54a2 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: implies Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c index 9956d30e0..0205d311b 100644 --- a/bin/varnishd/cache/cache_backend.c +++ b/bin/varnishd/cache/cache_backend.c @@ -696,7 +696,7 @@ VRT_backend_vsm_need(VRT_CTX) * The new_backend via parameter is a VCL_BACKEND, but we need a (struct * backend) * - * For now, we resolve it when creating the backend, which imples no redundancy + * For now, we resolve it when creating the backend, which implies no redundancy * / load balancing across the via director if it is more than a simple backend. */ From phk at FreeBSD.org Mon Aug 19 12:44:10 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:10 +0000 (UTC) Subject: [master] 9e3daae9e spelling: its Message-ID: <20240819124410.59B3111EA95@lists.varnish-cache.org> commit 9e3daae9e2f4a1a6b0ba775c2293ee909ddcf739 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: its Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c index 33d1a22ad..23cdfe242 100644 --- a/bin/varnishd/cache/cache_esi_deliver.c +++ b/bin/varnishd/cache/cache_esi_deliver.c @@ -800,7 +800,7 @@ ved_gzgz_fini(struct vdp_ctx *vdc, void **priv) /* XXX * this works due to the esi layering, a VDP pushing bytes from _fini - * will otherwise have it's own _bytes method called. + * will otherwise have its own _bytes method called. * * Could rewrite use VDP_END */ diff --git a/bin/varnishtest/tests/v00001.vtc b/bin/varnishtest/tests/v00001.vtc index 8bcea8dbc..e8797abd1 100644 --- a/bin/varnishtest/tests/v00001.vtc +++ b/bin/varnishtest/tests/v00001.vtc @@ -68,7 +68,7 @@ varnish v1 -syntax 4.0 -vcl+backend { set resp.proto = "HTTP/1.2"; set resp.reason = "Naah, lets fail it"; set resp.status = 904; - # XXX should be moved to it's own test + # XXX should be moved to its own test set resp.http.x-served-by-hostname = server.hostname; set resp.http.x-served-by-identity = server.identity; set resp.http.foobar = resp.proto + resp.status; From phk at FreeBSD.org Mon Aug 19 12:44:10 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:10 +0000 (UTC) Subject: [master] 16c2f352d spelling: macos Message-ID: <20240819124410.79F3C11EAA5@lists.varnish-cache.org> commit 16c2f352dd0e8cf4db74963156218bf34781a79c Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: macos Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c index 92f0add1c..9587cf113 100644 --- a/bin/varnishtest/vtc_main.c +++ b/bin/varnishtest/vtc_main.c @@ -634,7 +634,7 @@ ip_magic(void) #if defined (__APPLE__) /* - * In MacOS a bound socket that is not listening will timeout + * In macOS a bound socket that is not listening will timeout * instead of refusing the connection so close it and hope * for the best. */ diff --git a/bin/varnishtest/vtc_syslog.c b/bin/varnishtest/vtc_syslog.c index 2a291957f..02ffce658 100644 --- a/bin/varnishtest/vtc_syslog.c +++ b/bin/varnishtest/vtc_syslog.c @@ -132,7 +132,7 @@ VUDP_Check(int a) return (1); #elif defined (__APPLE__) /* - * MacOS returns EINVAL if the other end unexpectedly reset + * macOS returns EINVAL if the other end unexpectedly reset * the connection. */ if (errno == EINVAL) From phk at FreeBSD.org Mon Aug 19 12:44:10 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:10 +0000 (UTC) Subject: [master] adfff50ca spelling: macros Message-ID: <20240819124410.A2D1A11EAB4@lists.varnish-cache.org> commit adfff50ca1a4839a9e1e8effd70c50234c2fed5d Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: macros Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/d00007.vtc b/bin/varnishtest/tests/d00007.vtc index 9443010f9..8c6794f1a 100644 --- a/bin/varnishtest/tests/d00007.vtc +++ b/bin/varnishtest/tests/d00007.vtc @@ -67,7 +67,7 @@ server s1 { # we vtc.sleep to make sure that the health check is done and server # s1 has accepted again. We would rather want to use barriers, but # there is a (yet not understood) bug in varnishtest which prevents -# the bX_sock marcros from being available in the second varnish +# the bX_sock macros from being available in the second varnish # instance varnish v1 -vcl { From phk at FreeBSD.org Mon Aug 19 12:44:10 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:10 +0000 (UTC) Subject: [master] 1d19ad7e5 spelling: metadata Message-ID: <20240819124410.C337911EAC7@lists.varnish-cache.org> commit 1d19ad7e5a819203fdc9fe0299fe1ab7c1d610a0 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: metadata Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c index fa6d78084..1caeeb5a3 100644 --- a/bin/varnishtest/vtc_http2.c +++ b/bin/varnishtest/vtc_http2.c @@ -802,7 +802,7 @@ receive_frame(void *priv) vtc_fatal(s->vl, "Expected CONTINUATION frame for " "stream %u", expect_cont); - /* parse the frame according to it type, and fill the metada */ + /* parse the frame according to it type, and fill the metadata */ switch (f->type) { case TYPE_DATA: parse_data(s, f); From phk at FreeBSD.org Mon Aug 19 12:44:10 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:10 +0000 (UTC) Subject: [master] 53df5a204 spelling: misnomer Message-ID: <20240819124410.E05AB11EAD5@lists.varnish-cache.org> commit 53df5a204daa78fe6bcbbd5580f5cd7682ededb2 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: misnomer Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c index ece80e3b6..452a08c92 100644 --- a/bin/varnishd/cache/cache_acceptor.c +++ b/bin/varnishd/cache/cache_acceptor.c @@ -635,7 +635,7 @@ vca_acct(void *arg) struct listen_sock *ls; vtim_real t0; - // XXX Actually a mis-nomer now because the accept happens in a pool + // XXX Actually a misnomer now because the accept happens in a pool // thread. Rename to accept-nanny or so? THR_SetName("cache-acceptor"); THR_Init(); From phk at FreeBSD.org Mon Aug 19 12:44:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:11 +0000 (UTC) Subject: [master] ae1340898 spelling: nonexistent Message-ID: <20240819124411.0C5A111EADE@lists.varnish-cache.org> commit ae134089873bfa55d864d26a2a99fd9f07ed4e5a Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: nonexistent Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/u00000.vtc b/bin/varnishtest/tests/u00000.vtc index 090f26147..6bfc93b95 100644 --- a/bin/varnishtest/tests/u00000.vtc +++ b/bin/varnishtest/tests/u00000.vtc @@ -74,8 +74,8 @@ shell -err -expect {Error: -I file CLI command failed (104)} { varnishd -f '' -I foo -n ${tmpdir}/v0 -a :0 -l 2m } -shell -err -expect "Can't open non-existent" { - varnishd -f '' -I non-existent -n ${tmpdir}/v0 -a :0 +shell -err -expect "Can't open nonexistent" { + varnishd -f '' -I nonexistent -n ${tmpdir}/v0 -a :0 } From phk at FreeBSD.org Mon Aug 19 12:44:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:11 +0000 (UTC) Subject: [master] 9f523eb17 spelling: object Message-ID: <20240819124411.3649211EAE6@lists.varnish-cache.org> commit 9f523eb17a5c8392da40a7e8b29e0320a56774d5 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: object Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/storage/stevedore.c b/bin/varnishd/storage/stevedore.c index 34f3919fe..9ab3ba501 100644 --- a/bin/varnishd/storage/stevedore.c +++ b/bin/varnishd/storage/stevedore.c @@ -89,7 +89,7 @@ STV_NewObject(struct worker *wrk, struct objcore *oc, AN(stv->allocobj); if (stv->allocobj(wrk, stv, oc, wsl) == 0) { VSLb(wrk->vsl, SLT_Error, - "Failed to create object object from %s %s", + "Failed to create object from %s %s", stv->name, stv->ident); return (0); } diff --git a/bin/varnishtest/tests/m00058.vtc b/bin/varnishtest/tests/m00058.vtc index e339764ae..75e32d6c8 100644 --- a/bin/varnishtest/tests/m00058.vtc +++ b/bin/varnishtest/tests/m00058.vtc @@ -75,7 +75,7 @@ client c1 { expect resp.status == 200 expect resp.http.npurged == 1 - # Wait for the obejct to enter keep + # Wait for the object to enter keep delay 1 # We don't get a grace hit, but the backend gets an IMS header diff --git a/bin/varnishtest/tests/r03502.vtc b/bin/varnishtest/tests/r03502.vtc index db9e0a97f..e2d30faf5 100644 --- a/bin/varnishtest/tests/r03502.vtc +++ b/bin/varnishtest/tests/r03502.vtc @@ -41,7 +41,7 @@ logexpect l1 -v v1 -g vxid -q "vxid == 1004" { # Ensure the FetchError is in vbf_beresp2obj() # not later in the VFP. Otherwise we have too much free_space fail add = Storage - expect 0 = Error {^Failed to create object object from .+ Transient} + expect 0 = Error {^Failed to create object from .+ Transient} expect 0 = FetchError {^Could not get storage} fail clear } -start From phk at FreeBSD.org Mon Aug 19 12:44:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:11 +0000 (UTC) Subject: [master] e36c41c9a spelling: panicking Message-ID: <20240819124411.519DD11EAF0@lists.varnish-cache.org> commit e36c41c9a3bf82f3347ccc9d17f9042f29eae1d6 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 09:02:03 2024 -0400 spelling: panicking Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c index c6aa6f564..c5f4788a3 100644 --- a/bin/varnishd/cache/cache_panic.c +++ b/bin/varnishd/cache/cache_panic.c @@ -670,7 +670,7 @@ pan_ic(const char *func, const char *file, int line, const char *cond, abort(); } - /* If we already panicing in another thread, do nothing */ + /* If we already panicking in another thread, do nothing */ do { i = pthread_mutex_trylock(&panicstr_mtx); if (i != 0) From phk at FreeBSD.org Mon Aug 19 12:44:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:11 +0000 (UTC) Subject: [master] 606aef9ca spelling: parties Message-ID: <20240819124411.6EEA611EB01@lists.varnish-cache.org> commit 606aef9ca4a62ba0af6b4f77351858b1cbde60a5 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: parties Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c index 97ce9348f..cf9d7b465 100644 --- a/bin/varnishd/http2/cache_http2_proto.c +++ b/bin/varnishd/http2/cache_http2_proto.c @@ -603,7 +603,7 @@ h2_rx_settings(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2) } /********************************************************************** - * Incoming HEADERS, this is where the partys at... + * Incoming HEADERS, this is where the parties at... */ void v_matchproto_(task_func_t) From phk at FreeBSD.org Mon Aug 19 12:44:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:11 +0000 (UTC) Subject: [master] c8fe97885 spelling: piecemeal Message-ID: <20240819124411.8AF0411EB17@lists.varnish-cache.org> commit c8fe978858816da4fa8704b1c00d3acfba5f8b14 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: piecemeal Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_esi_parse.c b/bin/varnishd/cache/cache_esi_parse.c index 70835f07f..b4148e72e 100644 --- a/bin/varnishd/cache/cache_esi_parse.c +++ b/bin/varnishd/cache/cache_esi_parse.c @@ -597,7 +597,7 @@ vep_do_include(struct vep_state *vep, enum dowhat what) /*--------------------------------------------------------------------- * Lex/Parse object for ESI instructions * - * This function is called with the input object piecemal so do not + * This function is called with the input object piecemeal so do not * assume that we have more than one char available at at time, but * optimize for getting huge chunks. * From phk at FreeBSD.org Mon Aug 19 12:44:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:11 +0000 (UTC) Subject: [master] b295ba434 spelling: posix Message-ID: <20240819124411.A840E11EB2E@lists.varnish-cache.org> commit b295ba434cda02e2ae1af6649e6861f0c941c97f Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: posix Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c index d29d3d3ae..303bc5de0 100644 --- a/bin/varnishd/cache/cache_main.c +++ b/bin/varnishd/cache/cache_main.c @@ -237,7 +237,7 @@ cli_debug_shutdown_delay(struct cli *cli, const char * const *av, void *priv) } /* - * Default to seed=1, this is the only seed value POSIXl guarantees will + * Default to seed=1, this is the only seed value POSIX guarantees will * result in a reproducible random number sequence. */ static void v_matchproto_(cli_func_t) From phk at FreeBSD.org Mon Aug 19 12:44:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:11 +0000 (UTC) Subject: [master] 6dcecde52 spelling: preceded Message-ID: <20240819124411.CA1CD11EB3D@lists.varnish-cache.org> commit 6dcecde5231fa847b4ca14863bd0cd4a435727ee Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: preceded Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/v00020.vtc b/bin/varnishtest/tests/v00020.vtc index 51ac0f09f..86268bd80 100644 --- a/bin/varnishtest/tests/v00020.vtc +++ b/bin/varnishtest/tests/v00020.vtc @@ -432,12 +432,12 @@ varnish v1 -errvcl {'||' must be followed by BOOL, found REAL.} { sub vcl_recv { if (0 || std.random(0,1)) { } } } -varnish v1 -errvcl {'&&' must be preceeded by BOOL, found REAL.} { +varnish v1 -errvcl {'&&' must be preceded by BOOL, found REAL.} { import std; sub vcl_recv { if (std.random(0,1) && 0) { } } } -varnish v1 -errvcl {'||' must be preceeded by BOOL, found REAL.} { +varnish v1 -errvcl {'||' must be preceded by BOOL, found REAL.} { import std; sub vcl_recv { if (std.random(0,1) || 0) { } } } From phk at FreeBSD.org Mon Aug 19 12:44:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:11 +0000 (UTC) Subject: [master] c40c19594 spelling: preexisting Message-ID: <20240819124411.EA4FA11EB57@lists.varnish-cache.org> commit c40c19594970bb73185865ce9b1b053b5f35f614 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: preexisting Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c index 2efd43d23..c6f05478f 100644 --- a/bin/varnishd/mgt/mgt_main.c +++ b/bin/varnishd/mgt/mgt_main.c @@ -290,7 +290,7 @@ make_secret(const char *dirname) VJ_master(JAIL_MASTER_FILE); if (unlink(fn) < 0 && errno != ENOENT) { - ARGV_ERR("Cannot remove pre-existing secret-file in %s (%s)\n", + ARGV_ERR("Cannot remove preexisting secret-file in %s (%s)\n", dirname, VAS_errtxt(errno)); } diff --git a/bin/varnishtest/tests/u00000.vtc b/bin/varnishtest/tests/u00000.vtc index 6bfc93b95..b03195c82 100644 --- a/bin/varnishtest/tests/u00000.vtc +++ b/bin/varnishtest/tests/u00000.vtc @@ -44,7 +44,7 @@ shell -err -expect {Cannot open -S file} { varnishd -S ${tmpdir}/nonexistent -n ${tmpdir}/v0 -f '' } -shell -err -expect {Cannot remove pre-existing secret-file in} { +shell -err -expect {Cannot remove preexisting secret-file in} { mkdir ${tmpdir}/is_a_dir ${tmpdir}/is_a_dir/_.secret varnishd -n ${tmpdir}/is_a_dir -d -a :0 } From phk at FreeBSD.org Mon Aug 19 12:44:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:12 +0000 (UTC) Subject: [master] 870a6e1d4 spelling: pretty Message-ID: <20240819124412.1726411EB7B@lists.varnish-cache.org> commit 870a6e1d405c6e3dbc7132e4ab6770570d498b4b Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: pretty Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c index 5652e1e02..ca081a17a 100644 --- a/bin/varnishtest/vtc_http.c +++ b/bin/varnishtest/vtc_http.c @@ -893,7 +893,7 @@ http_tx_parse_args(char * const *av, struct vtclog *vl, struct http *hp, * * The only thing different between a request and a response, apart * from who can send them is that the first line (request line vs - * status line), so all the options are prety much the same. + * status line), so all the options are pretty much the same. * * \-method STRING (txreq only) * What method to use (default: "GET"). From phk at FreeBSD.org Mon Aug 19 12:44:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:12 +0000 (UTC) Subject: [master] 684187981 spelling: recursive Message-ID: <20240819124412.347DE11EB9D@lists.varnish-cache.org> commit 684187981f1399a0c86acdeb27c5373765d45b71 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: recursive Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/r03360.vtc b/bin/varnishtest/tests/r03360.vtc index 94f9fd21c..22e6e9369 100644 --- a/bin/varnishtest/tests/r03360.vtc +++ b/bin/varnishtest/tests/r03360.vtc @@ -1,4 +1,4 @@ -varnishtest "Test recusive vcl includes" +varnishtest "Test recursive vcl includes" shell {echo include '"_recurse.vcl";' > ${tmpdir}/_recurse.vcl} shell {echo include +glob '"${tmpdir}/_recurse[2].vcl";' > ${tmpdir}/_recurse1.vcl} From phk at FreeBSD.org Mon Aug 19 12:44:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:12 +0000 (UTC) Subject: [master] c91809b23 spelling: respond Message-ID: <20240819124412.5580011EBCA@lists.varnish-cache.org> commit c91809b23b4af6ff1fbf863dc4b5b5163e50b76a Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: respond Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c index 9587cf113..b3e58f6b8 100644 --- a/bin/varnishtest/vtc_main.c +++ b/bin/varnishtest/vtc_main.c @@ -660,7 +660,7 @@ ip_magic(void) VSA_free(&sa); /* - * We need an IP number which will not repond, ever, and that is a + * We need an IP number which will not respond, ever, and that is a * lot harder than it sounds. This IP# is from RFC5737 and a * C-class broadcast at that. * If tests involving ${bad_ip} fails and you run linux, you should From phk at FreeBSD.org Mon Aug 19 12:44:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:12 +0000 (UTC) Subject: [master] b7464def3 spelling: response Message-ID: <20240819124412.7E09011EBD9@lists.varnish-cache.org> commit b7464def3ff68c18eb70395d03da34eee85a3944 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: response Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/b00082.vtc b/bin/varnishtest/tests/b00082.vtc index 8b659a913..c22344d31 100644 --- a/bin/varnishtest/tests/b00082.vtc +++ b/bin/varnishtest/tests/b00082.vtc @@ -1,4 +1,4 @@ -varnishtest "Backend IMS 304 reponse with Content-Length 0" +varnishtest "Backend IMS 304 response with Content-Length 0" # this case tests invalid behaviour, which we should handle gracefully anyway diff --git a/bin/varnishtest/tests/l00003.vtc b/bin/varnishtest/tests/l00003.vtc index 5ecef3faa..43e8cc6e7 100644 --- a/bin/varnishtest/tests/l00003.vtc +++ b/bin/varnishtest/tests/l00003.vtc @@ -38,7 +38,7 @@ varnish v1 -vcl+backend { # \r\n 2 bytes # Total: 45 bytes -# Reponse: +# Response: # HTTP/1.1 200 OK\r\n 17 bytes # Accept-Ranges: bytes\r\n 22 bytes # Transfer-Encoding: chunked\r\n 28 bytes diff --git a/bin/varnishtest/tests/l00005.vtc b/bin/varnishtest/tests/l00005.vtc index d63d5ebb2..184d5a911 100644 --- a/bin/varnishtest/tests/l00005.vtc +++ b/bin/varnishtest/tests/l00005.vtc @@ -46,7 +46,7 @@ varnish v1 -vcl+backend { # Host: foo.bar\r\n 15 bytes # \r\n 2 bytes # Total: 70 bytes -# Reponse: +# Response: # HTTP/1.1\r\n 10 bytes # \r\n 2 bytes # Total: 12 bytes From phk at FreeBSD.org Mon Aug 19 12:44:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:12 +0000 (UTC) Subject: [master] 1cd7b5431 spelling: segment Message-ID: <20240819124412.9A4A911EBEA@lists.varnish-cache.org> commit 1cd7b5431c0543ef50965921da24f39834fe86f6 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: segment Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/storage/mgt_storage_persistent.c b/bin/varnishd/storage/mgt_storage_persistent.c index 9bfcce676..d0ecc3fc0 100644 --- a/bin/varnishd/storage/mgt_storage_persistent.c +++ b/bin/varnishd/storage/mgt_storage_persistent.c @@ -95,7 +95,7 @@ smp_metrics(struct smp_sc *sc) /* * The number of segments are limited by the size of the segment - * table(s) and from that follows the minimum size of a segmement. + * table(s) and from that follows the minimum size of a segment. */ sc->max_nseg = smp_stuff_len(sc, SMP_SEG1_STUFF) / sc->min_nseg; From phk at FreeBSD.org Mon Aug 19 12:44:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:12 +0000 (UTC) Subject: [master] c5bba6309 spelling: segments Message-ID: <20240819124412.B9FA111EBF3@lists.varnish-cache.org> commit c5bba6309800b5607af6cd6787579de27ef252e3 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: segments Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/r00445.vtc b/bin/varnishtest/tests/r00445.vtc index 3334415c3..8049595e6 100644 --- a/bin/varnishtest/tests/r00445.vtc +++ b/bin/varnishtest/tests/r00445.vtc @@ -1,4 +1,4 @@ -varnishtest "zero length ESI include segmens with chunked encoding" +varnishtest "zero length ESI include segments with chunked encoding" server s1 { rxreq From phk at FreeBSD.org Mon Aug 19 12:44:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:12 +0000 (UTC) Subject: [master] 14d097b00 spelling: semantics Message-ID: <20240819124412.D67E011EBFA@lists.varnish-cache.org> commit 14d097b007ce4db274d097f4b44dda015bbb0d3d Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: semantics Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/flint.lnt b/bin/flint.lnt index e6cee798a..971a4ec7a 100644 --- a/bin/flint.lnt +++ b/bin/flint.lnt @@ -26,7 +26,7 @@ // System library/POSIX related /////////////////////////////////////////////////////////////////////// -// Fix strchr() semtics, it can only return NULL if arg2 != 0 +// Fix strchr() semantics, it can only return NULL if arg2 != 0 -sem(strchr, 1p, type(1), 2n == 0 ? (@p < 1p) : (@p < 1p || @p == 0 )) +typename(844) From phk at FreeBSD.org Mon Aug 19 12:44:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:12 +0000 (UTC) Subject: [master] 97e425ec1 spelling: subscription Message-ID: <20240819124412.F340C11EC04@lists.varnish-cache.org> commit 97e425ec10f87b313c6db939c6ba95bd22f85de0 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: subscription Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_obj.c b/bin/varnishd/cache/cache_obj.c index 21c3d8f91..1f4ca9876 100644 --- a/bin/varnishd/cache/cache_obj.c +++ b/bin/varnishd/cache/cache_obj.c @@ -658,7 +658,7 @@ ObjSetFlag(struct worker *wrk, struct objcore *oc, enum obj_flags of, int val) } /*==================================================================== - * Object event subscribtion mechanism. + * Object event subscription mechanism. * * XXX: it is extremely unclear what the locking circumstances are here. */ From phk at FreeBSD.org Mon Aug 19 12:44:13 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:13 +0000 (UTC) Subject: [master] 13ed14cfb spelling: sufficient Message-ID: <20240819124413.1BE7A11EC59@lists.varnish-cache.org> commit 13ed14cfbc683fb7da5dc89f6da9c4829bb5b731 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: sufficient Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/e00029.vtc b/bin/varnishtest/tests/e00029.vtc index e02c78d11..b26b966d7 100644 --- a/bin/varnishtest/tests/e00029.vtc +++ b/bin/varnishtest/tests/e00029.vtc @@ -1,6 +1,6 @@ varnishtest "ESI max_esi_depth" -# test that the default stack size is sufficent for hitting +# test that the default stack size is sufficient for hitting # max_esi_depth server s1 { From phk at FreeBSD.org Mon Aug 19 12:44:13 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:13 +0000 (UTC) Subject: [master] 686feb1fd spelling: the Message-ID: <20240819124413.3D17511EC6F@lists.varnish-cache.org> commit 686feb1fd60272c82bcbbb73c2616cc91678a31c Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: the Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/vtc_misc.c b/bin/varnishtest/vtc_misc.c index 64d7b506d..36551af28 100644 --- a/bin/varnishtest/vtc_misc.c +++ b/bin/varnishtest/vtc_misc.c @@ -293,7 +293,7 @@ cmd_filewrite(CMD_ARGS) * * The above will set the environment variable $FOO to the value * provided. There is also an ``-ifunset`` argument which will only - * set the value if the the environment variable does not already + * set the value if the environment variable does not already * exist:: * * setenv -ifunset FOO quux diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c index 792f2f3eb..baf196257 100644 --- a/bin/varnishtest/vtc_process.c +++ b/bin/varnishtest/vtc_process.c @@ -958,7 +958,7 @@ process_close(struct process *p) * * process p1 "do --something" -run * - * However, you may use the the ``process`` variant to conveniently + * However, you may use the ``process`` variant to conveniently * collect the standard input and output without dealing with shell * redirections yourself. The ``shell`` command can also expect an * expression from either output, consider using it if you only need From phk at FreeBSD.org Mon Aug 19 12:44:13 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:13 +0000 (UTC) Subject: [master] d4ffd5d7d spelling: transmitted Message-ID: <20240819124413.5AFEA11EC8D@lists.varnish-cache.org> commit d4ffd5d7d6a24451d4111929da02aa63ad62b5b0 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: transmitted Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c index ca081a17a..4bb254a1d 100644 --- a/bin/varnishtest/vtc_http.c +++ b/bin/varnishtest/vtc_http.c @@ -771,7 +771,7 @@ cmd_http_gunzip(CMD_ARGS) } /********************************************************************** - * Handle common arguments of a transmited request or response + * Handle common arguments of a transmitted request or response */ static char* const * From phk at FreeBSD.org Mon Aug 19 12:44:13 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:13 +0000 (UTC) Subject: [master] af7354fe2 spelling: tuple Message-ID: <20240819124413.764E711ECAB@lists.varnish-cache.org> commit af7354fe2efefa5c236a8da45cb0bc3472da5238 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: tuple Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_hash.c b/bin/varnishd/cache/cache_hash.c index 54bea6192..8a1bb400d 100644 --- a/bin/varnishd/cache/cache_hash.c +++ b/bin/varnishd/cache/cache_hash.c @@ -33,7 +33,7 @@ * happens here. * * We have two kinds of structures, objecthead and object. An objecthead - * corresponds to a given (Host:, URL) tupple, and the objects hung from + * corresponds to a given (Host:, URL) tuple, and the objects hung from * the objecthead may represent various variations (ie: Vary: header, * different TTL etc) instances of that web-entity. * From phk at FreeBSD.org Mon Aug 19 12:44:13 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:13 +0000 (UTC) Subject: [master] 3dc81449b spelling: unformattable Message-ID: <20240819124413.B3FC211ECC7@lists.varnish-cache.org> commit 3dc81449beb82af68da6306f273cf198ea735b9d Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: unformattable Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c index d8630d347..7f4378fb9 100644 --- a/bin/varnishd/cache/cache_vrt.c +++ b/bin/varnishd/cache/cache_vrt.c @@ -788,7 +788,7 @@ VRT_TIME_string(VRT_CTX, VCL_TIME t) } VTIM_format(t, p); if (*p == '\0') { - VRT_fail(ctx, "Unformatable VCL_TIME"); + VRT_fail(ctx, "Unformattable VCL_TIME"); return (NULL); } return (p); diff --git a/bin/varnishtest/tests/r03308.vtc b/bin/varnishtest/tests/r03308.vtc index 115581be7..83355f935 100644 --- a/bin/varnishtest/tests/r03308.vtc +++ b/bin/varnishtest/tests/r03308.vtc @@ -1,4 +1,4 @@ -varnishtest "Unformatable VCL_TIME" +varnishtest "Unformattable VCL_TIME" feature 64bit From phk at FreeBSD.org Mon Aug 19 12:44:13 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:13 +0000 (UTC) Subject: [master] c90c8fad1 spelling: varnishtest Message-ID: <20240819124413.D20CE11ECD6@lists.varnish-cache.org> commit c90c8fad1faa7b23913774e96a58d7200684b29f Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 09:16:55 2024 -0400 spelling: varnishtest Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishtest/tests/a00000.vtc b/bin/varnishtest/tests/a00000.vtc index 2cc25bc0f..c11fda8f0 100644 --- a/bin/varnishtest/tests/a00000.vtc +++ b/bin/varnishtest/tests/a00000.vtc @@ -10,7 +10,7 @@ shell { echo 'shell "exit 9"' >> _.vtc } -shell -exit 2 -expect {doesn't start with 'vtest' or 'varnishtes} { +shell -exit 2 -expect {doesn't start with 'vtest' or 'varnishtest} { varnishtest -v _.vtc } From phk at FreeBSD.org Mon Aug 19 12:44:13 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:44:13 +0000 (UTC) Subject: [master] cfdbb685c spelling: will Message-ID: <20240819124414.18F8611ECE1@lists.varnish-cache.org> commit cfdbb685cd5b07a7a29644e06684071141f846cb Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: will Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c index 3cdacbdc5..40362f109 100644 --- a/bin/varnishd/cache/cache_expire.c +++ b/bin/varnishd/cache/cache_expire.c @@ -191,7 +191,7 @@ EXP_Insert(struct worker *wrk, struct objcore *oc) if (!(oc->exp_flags & OC_EF_REFD)) return; - /* One ref held by the caller, and one that wil be owned by + /* One ref held by the caller, and one that will be owned by * expiry. */ assert(oc->refcnt >= 2); From phk at FreeBSD.org Mon Aug 19 12:45:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:45:06 +0000 (UTC) Subject: [master] b385408fd spelling: coccinelle Message-ID: <20240819124506.28E5611F9EB@lists.varnish-cache.org> commit b385408fd204081393237cdecd7ece3da534b8b8 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: coccinelle Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/tools/coccinelle/vcocci.sh b/tools/coccinelle/vcocci.sh index 087fe62fa..64c4ae369 100755 --- a/tools/coccinelle/vcocci.sh +++ b/tools/coccinelle/vcocci.sh @@ -44,7 +44,7 @@ usage() { Usage: $SCRIPT [...] $SCRIPT help - Operate Coccinnelle semantic patches. + Operate Coccinelle semantic patches. Available commands: From phk at FreeBSD.org Mon Aug 19 12:45:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:45:06 +0000 (UTC) Subject: [master] 05e98601a spelling: temp directory Message-ID: <20240819124506.4628B11F9F0@lists.varnish-cache.org> commit 05e98601a4601d1eaac2a8be7e452e54f70fbd29 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: temp directory Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/tools/vtest.sh b/tools/vtest.sh index 1b3bd60c5..cc617b592 100755 --- a/tools/vtest.sh +++ b/tools/vtest.sh @@ -35,7 +35,7 @@ set -e export MAKEFLAGS="${MAKEFLAGS:--j2}" -# This tempdirectory must not be used by anything else. +# This temp directory must not be used by anything else. # Do *NOT* set this to /tmp export TMPDIR="${TMPDIR:-`pwd`/_vtest_tmp}" From phk at FreeBSD.org Mon Aug 19 12:47:05 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:05 +0000 (UTC) Subject: [master] eee85ce85 spelling: a Message-ID: <20240819124705.38E0B1207D5@lists.varnish-cache.org> commit eee85ce854d2f0ae32dc3b5f74c260f7d712cab9 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:52 2024 -0400 spelling: a Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/barriers.rst b/doc/sphinx/phk/barriers.rst index 794e57e36..2c669fe80 100644 --- a/doc/sphinx/phk/barriers.rst +++ b/doc/sphinx/phk/barriers.rst @@ -71,7 +71,7 @@ That is the major barrier in Varnish: All management happens in one process all actual movement of traffic happens in another, and the Manager process does not trust the Child process at all. -The Child process is in a the totally unprotected domain: Any +The Child process is in a totally unprotected domain: Any computer on the InterNet "(ANON)" can connect to the Child process and ask for some web-object. From phk at FreeBSD.org Mon Aug 19 12:47:05 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:05 +0000 (UTC) Subject: [master] 203c8a7b0 spelling: abandoned Message-ID: <20240819124705.64CF21207D9@lists.varnish-cache.org> commit 203c8a7b0d0030c23896d07b3d6363d46f4aaded Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:52 2024 -0400 spelling: abandoned Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/thatslow.rst b/doc/sphinx/phk/thatslow.rst index 7db085029..be5304a3f 100644 --- a/doc/sphinx/phk/thatslow.rst +++ b/doc/sphinx/phk/thatslow.rst @@ -183,7 +183,7 @@ I'll take that. to optimize much harder. No, I won't tell you which those are. .. [#f7] Only code where that is a bigger problem is phd-ware: Software - written as proof-of-concept and abandonned in haste when the diploma + written as proof-of-concept and abandoned in haste when the diploma was in hand. .. [#f8] Obviously, a high count of CVE's should be a real reason for From phk at FreeBSD.org Mon Aug 19 12:47:05 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:05 +0000 (UTC) Subject: [master] 76a50686e spelling: access Message-ID: <20240819124705.8DAED1207DC@lists.varnish-cache.org> commit 76a50686ef5a6b09a56585a909b9afc49ba704ce Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:52 2024 -0400 spelling: access Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/notes.rst b/doc/sphinx/phk/notes.rst index b663096fb..fc72554d2 100644 --- a/doc/sphinx/phk/notes.rst +++ b/doc/sphinx/phk/notes.rst @@ -97,7 +97,7 @@ RAM page, fix up the paging tables, and retry the instruction which failed. Squid knows nothing about this, for squid it was just a single -normal memory acces. +normal memory access. So now squid has the object in a page in RAM and written to the disk two places: one copy in the operating systems paging space and From phk at FreeBSD.org Mon Aug 19 12:47:05 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:05 +0000 (UTC) Subject: [master] 0133a7242 spelling: actually Message-ID: <20240819124705.B30F91207E0@lists.varnish-cache.org> commit 0133a724275a9c8045f4833c67453da77693fe20 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:52 2024 -0400 spelling: actually Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/cheri2.rst b/doc/sphinx/phk/cheri2.rst index 71584b40b..26d312d06 100644 --- a/doc/sphinx/phk/cheri2.rst +++ b/doc/sphinx/phk/cheri2.rst @@ -75,7 +75,7 @@ with ``pipe(2)``, but there is no way CHERI could spot that to make an execption, so reading pointers out of a filedescriptor, cause fully justified core-dumps. -If the poll-waiter was actaully relevant, the proper fix would be +If the poll-waiter was actually relevant, the proper fix would be to let the sending thread stick things on a locked list and just write a nonce-byte into the pipe to the waiter-thread, but that goes at the bottom of the TODO list, and for now I just remove the From phk at FreeBSD.org Mon Aug 19 12:47:05 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:05 +0000 (UTC) Subject: [master] 374b55e26 spelling: addresses Message-ID: <20240819124705.CDA551207E4@lists.varnish-cache.org> commit 374b55e268d979c326ab96aba614923239ec1f32 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:52 2024 -0400 spelling: addresses Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/ip_address.rst b/doc/sphinx/phk/ip_address.rst index 04b43d437..06c117c4f 100644 --- a/doc/sphinx/phk/ip_address.rst +++ b/doc/sphinx/phk/ip_address.rst @@ -98,7 +98,7 @@ act together, and renovate the `getaddrinfo(3)` API, Varnish will automatically pick that up and use it. Should they, in a flash of enlightenment, also make `getaddrinfo(3)` -useful for parsing these newfangled CIDR adresses we got in 1993, +useful for parsing these newfangled CIDR addresses we got in 1993, I will be more than happy to ditch `vcc_acl_try_netnotation()` too. Until next time, From phk at FreeBSD.org Mon Aug 19 12:47:05 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:05 +0000 (UTC) Subject: [master] 77145279d spelling: anniversary Message-ID: <20240819124705.E8F661207E8@lists.varnish-cache.org> commit 77145279d8220f59d0d0fd87170feeca70c716f6 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:52 2024 -0400 spelling: anniversary Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/thatslow.rst b/doc/sphinx/phk/thatslow.rst index be5304a3f..8923a8bc8 100644 --- a/doc/sphinx/phk/thatslow.rst +++ b/doc/sphinx/phk/thatslow.rst @@ -128,7 +128,7 @@ is not going to boost your line count either. But did it work ? ----------------- -A 10 year project aniversary is a good reason to stop and see +A 10 year project anniversary is a good reason to stop and see if the expected roses are there to be smelled. We have lots of numbers, commits (10538), bugreports (1864), CVEs From phk at FreeBSD.org Mon Aug 19 12:47:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:06 +0000 (UTC) Subject: [master] 39f6155fb spelling: anybody' Message-ID: <20240819124706.0E9621207F3@lists.varnish-cache.org> commit 39f6155fbedbad1ae4eb6ae822ca5111d021b865 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:52 2024 -0400 spelling: anybody' Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/patent.rst b/doc/sphinx/phk/patent.rst index 446956802..bb6d189c8 100644 --- a/doc/sphinx/phk/patent.rst +++ b/doc/sphinx/phk/patent.rst @@ -76,7 +76,7 @@ But in all probable worlds, that would only have meant that the idea would be dead as a doornail, I would not have made any money from it, it would never have helped improve the web, and I would have wasted much more of my life in meetings than would be good for -anybodys health. +anybody's health. As if that wasn't enough, the very thought of having to hire somebody scared me, but not nearly as much as the realization that if I built From phk at FreeBSD.org Mon Aug 19 12:47:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:06 +0000 (UTC) Subject: [master] 07b2063a5 spelling: anymore Message-ID: <20240819124706.3826C120805@lists.varnish-cache.org> commit 07b2063a5593285e1597aa8fe941423f33f85d4c Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: anymore Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 66edf08ac..3ed258aef 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -4176,7 +4176,7 @@ Bugs fixed * 1404_ - Don't send Content-Length on 304 Not Modified responses. * 1401_ - Varnish would crash when retrying a backend fetch too many times. * 1399_ - Memory get freed while in use by another thread/object -* 1398_ - Fix NULL deref related to a backend we don't know any more. +* 1398_ - Fix NULL deref related to a backend we don't know anymore. * 1397_ - Crash on backend fetch while LRUing. * 1395_ - End up in vcl_error also if fetch fails vcl_backend_response. * 1391_ - Client abort and retry during a streaming fetch would make Varnish assert. @@ -5945,7 +5945,7 @@ varnishd core dumps. Make sure it's set. - Doing purge.hash() with an empty string would cause us to dump core. - Fixed so we don't do that any more. + Fixed so we don't do that anymore. - We ran into a problem with glibc's malloc on Linux where it seemed like it failed to ever give memory back to the OS, causing the system diff --git a/doc/sphinx/phk/503aroundtheworld.rst b/doc/sphinx/phk/503aroundtheworld.rst index c200ba7f5..8b16b4d84 100644 --- a/doc/sphinx/phk/503aroundtheworld.rst +++ b/doc/sphinx/phk/503aroundtheworld.rst @@ -109,7 +109,7 @@ Varnish release 2.1.2, May 2010 has the link, release 2.1.3 from July same year does not.) And that, my friends, is why the error message of last resort in -Varnish Cache does not even contain a link any more. +Varnish Cache does not even contain a link anymore. */phk* diff --git a/doc/sphinx/phk/cheri1.rst b/doc/sphinx/phk/cheri1.rst index 1f519f9eb..2c6d8f476 100644 --- a/doc/sphinx/phk/cheri1.rst +++ b/doc/sphinx/phk/cheri1.rst @@ -17,7 +17,7 @@ https://www.cl.cam.ac.uk/research/security/ctsrd/cheri/ The core idea in CHERI is that pointers are not integers, which means that you cannot randomly make up or modify pointers to point -at random things any more, whatever your intentions might be. +at random things anymore, whatever your intentions might be. From a security point of view, this circumscribes several large classes of commonly used attack-vectors, and Microsoft Research diff --git a/doc/sphinx/phk/notes.rst b/doc/sphinx/phk/notes.rst index fc72554d2..79fa43f2a 100644 --- a/doc/sphinx/phk/notes.rst +++ b/doc/sphinx/phk/notes.rst @@ -29,7 +29,7 @@ So what's wrong with 1975 programming ? --------------------------------------- The really short answer is that computers do not have two kinds of -storage any more. +storage anymore. It used to be that you had the primary store, and it was anything from acoustic delaylines filled with mercury via small magnetic diff --git a/doc/sphinx/phk/spdy.rst b/doc/sphinx/phk/spdy.rst index 4cf9db228..e2e69898f 100644 --- a/doc/sphinx/phk/spdy.rst +++ b/doc/sphinx/phk/spdy.rst @@ -110,7 +110,7 @@ You should be able to do something like:: And doing that is not really *that* hard, I think. We just need to keep track of all the objects we instantiate and make sure they -disappear and die when nobody is using them any more. +disappear and die when nobody is using them anymore. A lot of the assumptions we made back in 2006 are no longer valid under such an architecture, but those same assumptions are diff --git a/doc/sphinx/whats-new/changes-5.0.rst b/doc/sphinx/whats-new/changes-5.0.rst index 22ce305d8..45de81d9a 100644 --- a/doc/sphinx/whats-new/changes-5.0.rst +++ b/doc/sphinx/whats-new/changes-5.0.rst @@ -137,7 +137,7 @@ Request Body sent always / "cacheable POST" Previously, we would only send a request body for passed requests (and for pipe mode, but this is special anyway and should be avoided). -Not so any more, but the default behaviour has not changed: +Not so anymore, but the default behaviour has not changed: Whenever a request has a body, it will get sent to the backend for a cache miss (and pass, as before). This can be prevented by an diff --git a/doc/sphinx/whats-new/upgrading-6.2.rst b/doc/sphinx/whats-new/upgrading-6.2.rst index 858b27833..84f64fb17 100644 --- a/doc/sphinx/whats-new/upgrading-6.2.rst +++ b/doc/sphinx/whats-new/upgrading-6.2.rst @@ -72,7 +72,7 @@ now also accept suitable numeral or quantitative arguments. These type-conversion functions should be fully backwards compatible, but the following differences should be noted: -* The *fallback* is not required any more. A conversion failure in the +* The *fallback* is not required anymore. A conversion failure in the absence of a *fallback* argument will now trigger a VCL failure. * A VCL failure will also be triggered if no or more than one argument From phk at FreeBSD.org Mon Aug 19 12:47:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:06 +0000 (UTC) Subject: [master] d40f52c14 spelling: arbitrary Message-ID: <20240819124706.565D2120823@lists.varnish-cache.org> commit d40f52c147a2b13571a8c0ff70abe8c1e6181b3d Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: arbitrary Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 3ed258aef..34b89d939 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -790,7 +790,7 @@ Varnish Cache 7.1.0 (2022-03-15) debugging the vsl client library code. * The ``vtc.vsl()`` and ``vtc.vsl_replay()`` functions have been added - to the vtc vmod to generate arbitraty log lines for testing. + to the vtc vmod to generate arbitrary log lines for testing. * The limit of the ``vsl_reclen`` parameter has been corrected. From phk at FreeBSD.org Mon Aug 19 12:47:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:06 +0000 (UTC) Subject: [master] 33495a76d spelling: are Message-ID: <20240819124706.74BED12083C@lists.varnish-cache.org> commit 33495a76d9b2a3dbc626c9c37c662d4155da70da Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: are Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/http20.rst b/doc/sphinx/phk/http20.rst index 371a0180e..9c0cd7caa 100644 --- a/doc/sphinx/phk/http20.rst +++ b/doc/sphinx/phk/http20.rst @@ -105,7 +105,7 @@ seeing cookies being crypto-signed, to prevent forgeries. The term "bass ackwards" comes to mind. Cookies are also one of the main wasters of bandwidth, disabling -caching by default, sending lots of cookies were they are are not +caching by default, sending lots of cookies were they are not needed, which made many sites register separate domains for image content, to "save" bandwidth by avoiding cookies. From phk at FreeBSD.org Mon Aug 19 12:47:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:06 +0000 (UTC) Subject: [master] 958d07db5 spelling: arithmetic Message-ID: <20240819124706.95011120849@lists.varnish-cache.org> commit 958d07db56dbe190ceda850deb092ecb970a99a4 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: arithmetic Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 34b89d939..6086c6594 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -3618,7 +3618,7 @@ Varnish Cache 4.1.2-beta1 (2016-02-17) * Some fixes to minor/trivial issues found with clang AddressSanitizer. -* Arithmetric on REAL data type in VCL is now possible. +* Arithmetic on REAL data type in VCL is now possible. * vmodtool.py improvements to allow VMODs for 4.0 and 4.1 to share a source tree. From phk at FreeBSD.org Mon Aug 19 12:47:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:06 +0000 (UTC) Subject: [master] 9547b521f spelling: artur's Message-ID: <20240819124706.AD7B4120856@lists.varnish-cache.org> commit 9547b521fa21d23797ac66733ea8951364eada66 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: artur's Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/patent.rst b/doc/sphinx/phk/patent.rst index bb6d189c8..9c92f26f3 100644 --- a/doc/sphinx/phk/patent.rst +++ b/doc/sphinx/phk/patent.rst @@ -222,18 +222,18 @@ I took myself out of the game: FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. -Today (20190517) Arturs `Fastly `_, company +Today (20190517) Artur's `Fastly `_, company went public on the New York Stock Exchange, and went up from $16 to $24 in a matter of hours. So-called "financial analysts" write that as a consequence Fastly is now worth 2+ Billion Dollars. I can say with 100% certainty and honesty that there is no way -I could *ever* have done that, that is entirely Arturs doing and +I could *ever* have done that, that is entirely Artur's doing and I know and admire how hard he worked to make it happen. Congratulations to Artur and the Fastly Crew! -But I will steal some of Arturs thunder, and point to Fastlys IPO +But I will steal some of Artur's thunder, and point to Fastlys IPO as proof that at least once in my career, I had a unique idea worth a billion dollars :-) From phk at FreeBSD.org Mon Aug 19 12:47:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:06 +0000 (UTC) Subject: [master] 4d2c7e758 spelling: assigning Message-ID: <20240819124706.CA62612085F@lists.varnish-cache.org> commit 4d2c7e758bd8baa2abe71c47656102d699bb10c2 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: assigning Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 6086c6594..a038ae09e 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -2240,7 +2240,7 @@ Fixed bugs * Fix VRT_priv_task for calls from vcl_pipe {} (2820_) -* Fix assinging == (2809_) +* Fix assigning == (2809_) * Fix vmod object constructor documentation in the ``vmodtool.py`` - generated RST files From phk at FreeBSD.org Mon Aug 19 12:47:06 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:06 +0000 (UTC) Subject: [master] 763b924da spelling: at Message-ID: <20240819124706.E4A67120869@lists.varnish-cache.org> commit 763b924dabf5df8b512dd177b8ddb0dc6fe81eff Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: at Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/dough.rst b/doc/sphinx/phk/dough.rst index 512347842..4e86e7d7f 100644 --- a/doc/sphinx/phk/dough.rst +++ b/doc/sphinx/phk/dough.rst @@ -233,7 +233,7 @@ The Apache Foundation "adopts" smaller projects inside their field of interest, and I believe that works OK, but I'm not sure if it can easily be transplanted to different topics. -The final way is to simply throw money a the developers, the +The final way is to simply throw money at the developers, the way the FreeBSD and Varnish communities have done with me. It is a far more flexible solution with respect to level of From phk at FreeBSD.org Mon Aug 19 12:47:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:07 +0000 (UTC) Subject: [master] 1a9a58f52 spelling: authoritarian Message-ID: <20240819124707.0D166120877@lists.varnish-cache.org> commit 1a9a58f52672a58d56d796ff5106e9e8935abeb2 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: authoritarian Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/quic.rst b/doc/sphinx/phk/quic.rst index 6d3074bd0..c234323c7 100644 --- a/doc/sphinx/phk/quic.rst +++ b/doc/sphinx/phk/quic.rst @@ -97,7 +97,7 @@ dials privacy up to 11: Everything but the first byte of a QUIC packet is encrypted. Authorities are not going to like that, and I can easily see more -autoritarian countries outright ban QUIC, and to make that ban +authoritarian countries outright ban QUIC, and to make that ban stick, they may even transition from "allowed if not banned" to "banned if not allowed" firewalling. From phk at FreeBSD.org Mon Aug 19 12:47:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:07 +0000 (UTC) Subject: [master] 28d69db03 spelling: available Message-ID: <20240819124707.27D86120880@lists.varnish-cache.org> commit 28d69db03e008522a75291f0af592952d35e6fe4 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: available Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/reference/vcl-backend.rst b/doc/sphinx/reference/vcl-backend.rst index cad16bb62..a62f94586 100644 --- a/doc/sphinx/reference/vcl-backend.rst +++ b/doc/sphinx/reference/vcl-backend.rst @@ -116,7 +116,7 @@ Limit how many simultaneous connections varnish can open to the backend:: Attribute ``.wait_limit`` ------------------------------ -Maximum number of transactions that can queue waiting for a backend connection to become avaiable:: +Maximum number of transactions that can queue waiting for a backend connection to become available:: .wait_limit = 1000; From phk at FreeBSD.org Mon Aug 19 12:47:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:07 +0000 (UTC) Subject: [master] f231f6eb1 spelling: based Message-ID: <20240819124707.4644D12088C@lists.varnish-cache.org> commit f231f6eb1dd3e094cc8fb5e2756e36795b215591 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: based Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/firstdesign.rst b/doc/sphinx/phk/firstdesign.rst index 55d9811fa..dc7266939 100644 --- a/doc/sphinx/phk/firstdesign.rst +++ b/doc/sphinx/phk/firstdesign.rst @@ -96,7 +96,7 @@ where we kept thinking in the old frame of reference (ie: Squid):: and you're off running. - A text, curses or HTML based based facility to give some instant + A text, curses or HTML based facility to give some instant feedback and stats is necessary. If circumstances are not conductive to strucured approach, it should From phk at FreeBSD.org Mon Aug 19 12:47:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:07 +0000 (UTC) Subject: [master] 6cdd5f6c8 spelling: cannot Message-ID: <20240819124707.64287120896@lists.varnish-cache.org> commit 6cdd5f6c81b34319dad4a9f6102e6e5fd7ce4bc1 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:53 2024 -0400 spelling: cannot Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/cheri4.rst b/doc/sphinx/phk/cheri4.rst index 26baeb015..6c96038b2 100644 --- a/doc/sphinx/phk/cheri4.rst +++ b/doc/sphinx/phk/cheri4.rst @@ -36,7 +36,7 @@ gives you the "capability" to access the memory, and therefore they can be restricted separately from the memory they provide access to. If you could just create your own "capabilities" out of integers, -that would be no big improvement, but you can not: Under CHERI you +that would be no big improvement, but you cannot: Under CHERI you can only make a new capability from another capability, and the new one can never be more potent than the one it is derived from. diff --git a/doc/sphinx/phk/gzip.rst b/doc/sphinx/phk/gzip.rst index 61c4e19b0..0eafa9943 100644 --- a/doc/sphinx/phk/gzip.rst +++ b/doc/sphinx/phk/gzip.rst @@ -58,7 +58,7 @@ To always entice the backend into sending us gzip'ed content. Varnish will not gzip any content on its own (but see below), we trust the backend to know what content can be sensibly gzip'ed (html) and what -can not (jpeg) +cannot (jpeg) If in vcl_backend_response{} we find out that we are trying to deliver a gzip'ed object to a client that has not indicated willingness to receive diff --git a/doc/sphinx/phk/vcl_expr.rst b/doc/sphinx/phk/vcl_expr.rst index e2b18e9c8..4f7ad3b7e 100644 --- a/doc/sphinx/phk/vcl_expr.rst +++ b/doc/sphinx/phk/vcl_expr.rst @@ -25,12 +25,12 @@ time (Expires). Obviously, you can add a TIME and DURATION, the result is a TIME. -Equally obviously, you can not add TIME to TIME, but you can subtract +Equally obviously, you cannot add TIME to TIME, but you can subtract TIME from TIME, resulting in a DURATION. VCL do also have "naked" numbers, like INT and REAL, but what you can do with them is very limited. For instance you can multiply a -duration by a REAL, but you can not multiply a TIME by anything. +duration by a REAL, but you cannot multiply a TIME by anything. Given that we have our own types, the next question is what precedence operators have. diff --git a/doc/sphinx/reference/varnishncsa.rst b/doc/sphinx/reference/varnishncsa.rst index dc09410f7..de5ea8428 100644 --- a/doc/sphinx/reference/varnishncsa.rst +++ b/doc/sphinx/reference/varnishncsa.rst @@ -149,7 +149,7 @@ Supported formatters are: * ``%{msec_frac}``: millisecond fraction * ``%{usec_frac}``: microsecond fraction - The extensions can not be combined with each other or strftime(3) in + The extensions cannot be combined with each other or strftime(3) in the same specification. Use multiple ``%{X}t`` specifications instead. %T diff --git a/doc/sphinx/reference/vcl-backend.rst b/doc/sphinx/reference/vcl-backend.rst index a62f94586..00904acbf 100644 --- a/doc/sphinx/reference/vcl-backend.rst +++ b/doc/sphinx/reference/vcl-backend.rst @@ -197,8 +197,8 @@ Unless specified for *destination*, the ``connect_timeout``, ``first_byte_timeout`` and ``between_bytes_timeout`` attributes are copied from *proxy* to *destination*. -As of this release, the *proxy* backend used with ``.via`` can not be -a director, it can not itself use ``.via`` (error: *Can not stack .via +As of this release, the *proxy* backend used with ``.via`` cannot be +a director, it cannot itself use ``.via`` (error: *Cannot stack .via backends*) and the protocol is fixed to `PROXY2`_. Implementation detail: diff --git a/doc/sphinx/reference/vmod.rst b/doc/sphinx/reference/vmod.rst index 193b9060d..197d91b43 100644 --- a/doc/sphinx/reference/vmod.rst +++ b/doc/sphinx/reference/vmod.rst @@ -9,7 +9,7 @@ VMOD - Varnish Modules %%%%%%%%%%%%%%%%%%%%%% -For all you can do in VCL, there are things you can not do. +For all you can do in VCL, there are things you cannot do. Look an IP number up in a database file for instance. VCL provides for inline C code, and there you can do everything, but it is not a convenient or even readable way to solve such @@ -89,7 +89,7 @@ that at length in a moment. Notice that the third function returns VOID, that makes it a "procedure" in VCL lingo, meaning that it cannot be used in expressions, right side of assignments and such. Instead it can be used as a primary action, -something functions which return a value can not:: +something functions which return a value cannot:: sub vcl_recv { std.set_ip_tos(32); @@ -483,7 +483,7 @@ VCL_SUB references never be called from a different VCL. ``VRT_call()`` fails the VCL for recursive calls and when the - ``VCL_SUB`` can not be called from the current context + ``VCL_SUB`` cannot be called from the current context (e.g. calling a subroutine accessing ``req`` from the backend side). diff --git a/doc/sphinx/whats-new/changes-5.0.rst b/doc/sphinx/whats-new/changes-5.0.rst index 45de81d9a..433386532 100644 --- a/doc/sphinx/whats-new/changes-5.0.rst +++ b/doc/sphinx/whats-new/changes-5.0.rst @@ -86,7 +86,7 @@ As useful as this feature is, it has caused a lot of headaches to varnish administrators along the lines of "why the *beep* doesn't Varnish cache this": A hit-for-pass object stayed in cache for however long its ttl dictated and prevented caching whenever it got hit ("for -that url" in most cases). In particular, as a pass object can not be +that url" in most cases). In particular, as a pass object cannot be turned into something cacheable retrospectively (``beresp.uncacheable`` can be changed from ``false`` to ``true``, but not the other way around), even responses which would have been diff --git a/doc/sphinx/whats-new/changes-7.3.rst b/doc/sphinx/whats-new/changes-7.3.rst index dc6af79fc..164952620 100644 --- a/doc/sphinx/whats-new/changes-7.3.rst +++ b/doc/sphinx/whats-new/changes-7.3.rst @@ -159,7 +159,7 @@ avoids duplicates when a custom implementation relied on ``http_*()`` that would also log the headers being set up. The ``VRT_new_backend*()`` functions take an additional backend argument, the -optional via backend. It can not be a custom backend implementation, but it +optional via backend. It cannot be a custom backend implementation, but it can be a director resolving a native backend. There is a new ``authority`` field for via backends in ``struct vrt_backend``. diff --git a/doc/sphinx/whats-new/upgrading-7.1.rst b/doc/sphinx/whats-new/upgrading-7.1.rst index 86ec9eb89..fc8497e5a 100644 --- a/doc/sphinx/whats-new/upgrading-7.1.rst +++ b/doc/sphinx/whats-new/upgrading-7.1.rst @@ -60,7 +60,7 @@ The feature flag is off by default, preserving the existing behavior to continue ESI processing despite include failures. Users of persistent storage engines be advised that objects created -before the introduction of this change can not carry the +before the introduction of this change cannot carry the ``onerror="continue"`` attribute and, consequently, will be handled as if it was not present if the ``+esi_include_onerror`` feature flag is enabled. From phk at FreeBSD.org Mon Aug 19 12:47:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:07 +0000 (UTC) Subject: [master] c3fc88c24 spelling: capabilities Message-ID: <20240819124707.855F31208A8@lists.varnish-cache.org> commit c3fc88c240079304c4df3040008011bbd9d12ea1 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: capabilities Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/cheri1.rst b/doc/sphinx/phk/cheri1.rst index 2c6d8f476..9eac778bb 100644 --- a/doc/sphinx/phk/cheri1.rst +++ b/doc/sphinx/phk/cheri1.rst @@ -35,7 +35,7 @@ it made any real-life difference. Robert has graciously lent me a shell-account on one of his shiny new MORELLO machines, which rock an ARM64 prototype CPU with CHERI -capabilites. +capabilities. In this sequence of rants I will sing the saga of "How Varnish meets CHERI" - as it happens. From phk at FreeBSD.org Mon Aug 19 12:47:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:07 +0000 (UTC) Subject: [master] a703b9c15 spelling: case-insensitive Message-ID: <20240819124707.A26DF1208BF@lists.varnish-cache.org> commit a703b9c15330ddb20113f6a0734f3fc8eab2092f Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: case-insensitive Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/reference/vcl.rst b/doc/sphinx/reference/vcl.rst index 1d4d3b897..959901352 100644 --- a/doc/sphinx/reference/vcl.rst +++ b/doc/sphinx/reference/vcl.rst @@ -197,7 +197,7 @@ Regular Expressions Varnish uses Perl-compatible regular expressions (PCRE). For a complete description please see the pcre(3) man page. -To send flags to the PCRE engine, such as to do case insensitive matching, add +To send flags to the PCRE engine, such as to do case-insensitive matching, add the flag within parens following a question mark, like this:: # If host is NOT example dot com.. From phk at FreeBSD.org Mon Aug 19 12:47:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:07 +0000 (UTC) Subject: [master] bd21154e0 spelling: compound Message-ID: <20240819124707.C24F71208CD@lists.varnish-cache.org> commit bd21154e0cfa42f07029da57238620274c213de8 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: compound Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index a038ae09e..c7c4dc2c3 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -881,7 +881,7 @@ Varnish Cache 7.1.0 (2022-03-15) ``VCL_STANDS``) from a single string ``s`` or ``x`` strings, respectively. - Note that the macros create a compund literal whose scope is the + Note that the macros create a compound literal whose scope is the enclosing block. Their value must thus only be used within the same block (it can be passed to called functions) and must not be returned or referenced for use outside the enclosing block. From phk at FreeBSD.org Mon Aug 19 12:47:07 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:07 +0000 (UTC) Subject: [master] 928b5d32b spelling: continuous Message-ID: <20240819124707.DC7D11208D4@lists.varnish-cache.org> commit 928b5d32b39038e77c2bfccf20d90aba1afe3e13 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: continuous Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/trialerror.rst b/doc/sphinx/phk/trialerror.rst index 690384e39..e358cb1e6 100644 --- a/doc/sphinx/phk/trialerror.rst +++ b/doc/sphinx/phk/trialerror.rst @@ -5,9 +5,9 @@ .. _phk_trialerror: -================================================= -Trial&Error - Prototyping - Continous Integration -================================================= +================================================== +Trial&Error - Prototyping - Continuous Integration +================================================== The other day I chatted to a friend who wrote his phd thesis with `David Wheeler `_ as his advisor, that made me feel young, because Wheeler @@ -39,7 +39,7 @@ themselves. But we could call it "Prototyping" if that sounded better, and now that the history-deficient dot-com generation has "invented" it, -we can call it "Continous Integration". +we can call it "Continuous Integration". I don't care - it's still Trial&Error to me. From phk at FreeBSD.org Mon Aug 19 12:47:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:08 +0000 (UTC) Subject: [master] dbc8bfd49 spelling: course Message-ID: <20240819124708.065981208E7@lists.varnish-cache.org> commit dbc8bfd499155ce8ff95eefb7357b0564f218405 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: course Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/quic.rst b/doc/sphinx/phk/quic.rst index c234323c7..5665c49c2 100644 --- a/doc/sphinx/phk/quic.rst +++ b/doc/sphinx/phk/quic.rst @@ -101,7 +101,7 @@ authoritarian countries outright ban QUIC, and to make that ban stick, they may even transition from "allowed if not banned" to "banned if not allowed" firewalling. -Of couse QUIC would still be a thing if you are big enough to +Of course QUIC would still be a thing if you are big enough to negotiate with G7-sized governments, and I would not be surprised if QUIC ends up being a feasible protocol only for companies which can point at the "job creation" their data-centers provide. From phk at FreeBSD.org Mon Aug 19 12:47:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:08 +0000 (UTC) Subject: [master] 83e8292a2 spelling: crypto Message-ID: <20240819124708.249931208F7@lists.varnish-cache.org> commit 83e8292a28b15945bf17d0d1f26013ac7fa50a51 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: crypto Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/ssl.rst b/doc/sphinx/phk/ssl.rst index b38d9847e..581b8653a 100644 --- a/doc/sphinx/phk/ssl.rst +++ b/doc/sphinx/phk/ssl.rst @@ -58,7 +58,7 @@ a SSL proxy in separate process ? No, it will not, because the way varnish would have to do it would be to ... start a separate process to do the SSL handling. -There is no other way we can guarantee that secret krypto-bits do +There is no other way we can guarantee that secret crypto-bits do not leak anywhere they should not, than by fencing in the code that deals with them in a child process, so the bulk of varnish never gets anywhere near the certificates, not even during a core-dump. From phk at FreeBSD.org Mon Aug 19 12:47:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:08 +0000 (UTC) Subject: [master] 72c9830e2 spelling: daemonized Message-ID: <20240819124708.46A27120902@lists.varnish-cache.org> commit 72c9830e2b43f99f1ee503620dc5f107e0680775 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:54 2024 -0400 spelling: daemonized Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index c7c4dc2c3..9f55d38e5 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -3683,7 +3683,7 @@ Varnish Cache 4.1.1-beta1 (2016-01-15) ====================================== - Format of "ban.list" has changed slightly. -- [varnishncsa] -w is now required when running deamonized. +- [varnishncsa] -w is now required when running daemonized. - [varnishncsa] Log format can now be read from file. - Port fields extracted from PROXY1 header now work as expected. - New VCL state "busy" introduced (mostly for VMOD writers). From phk at FreeBSD.org Mon Aug 19 12:47:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:08 +0000 (UTC) Subject: [master] d4ca5c27f spelling: damndest Message-ID: <20240819124708.6179A120913@lists.varnish-cache.org> commit d4ca5c27fce96bd183bea6f12a302efc45720c14 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: damndest Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/VSV00001.rst b/doc/sphinx/phk/VSV00001.rst index 0032b4fc2..e7b34409f 100644 --- a/doc/sphinx/phk/VSV00001.rst +++ b/doc/sphinx/phk/VSV00001.rst @@ -151,7 +151,7 @@ blindly to someone who doesn't have a history of requesting them."* - that sounds like praise by faint damnation to me. Anyway, I will not promise that we will have no major security -issues until the year 2028, but I'll do my damnest to make it so. +issues until the year 2028, but I'll do my damndest to make it so. VDR - Varnish Developers Rock ----------------------------- From phk at FreeBSD.org Mon Aug 19 12:47:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:08 +0000 (UTC) Subject: [master] b1656c442 spelling: definition Message-ID: <20240819124708.80FC912091B@lists.varnish-cache.org> commit b1656c442272957c641863f07503e60a343196a6 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: definition Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 9f55d38e5..3b48c3407 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -5890,7 +5890,7 @@ varnishd mandates. This makes PUT, DELETE, OPTIONS and TRACE work in addition to POST. -- Change how backends are defined, to a constant structural defintion +- Change how backends are defined, to a constant structural definition style. See https://www.varnish-cache.org/wiki/VclSyntaxChanges for the details. From phk at FreeBSD.org Mon Aug 19 12:47:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:08 +0000 (UTC) Subject: [master] f9599256f spelling: deliberately Message-ID: <20240819124708.9FD83120923@lists.varnish-cache.org> commit f9599256fa0cbbe2e8d6a3a14ea9937a91a15bcd Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: deliberately Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/VSV00003.rst b/doc/sphinx/phk/VSV00003.rst index 06fbae2b6..4a70ba177 100644 --- a/doc/sphinx/phk/VSV00003.rst +++ b/doc/sphinx/phk/VSV00003.rst @@ -68,7 +68,7 @@ Dealing with it --------------- Martin Grydeland from Varnish Software has been the Senior Wrangler -of this security issue, while I deliberatly have taken a hands-off +of this security issue, while I deliberately have taken a hands-off stance, a decision I have no reason to regret. Thanks a lot Martin! From phk at FreeBSD.org Mon Aug 19 12:47:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:08 +0000 (UTC) Subject: [master] 5cf618f9f spelling: dependents Message-ID: <20240819124708.BD75B120934@lists.varnish-cache.org> commit 5cf618f9f1316f32b90dfb40c9c2ff756b24b605 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: dependents Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 3b48c3407..a1de97632 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -938,7 +938,7 @@ Varnish Cache 7.0.1 (2021-11-23) combined strings of type VCL_REGEX (3721_). * An issue has been fixed that would cause the VCL dependency checker to - incorrectly flag VCLs as dependants of other VCLs when using labels, + incorrectly flag VCLs as dependents of other VCLs when using labels, preventing them from being discarded (3734_). * VCLs loaded through CLI or the use of startup CLI scripts (-I option to From phk at FreeBSD.org Mon Aug 19 12:47:08 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:08 +0000 (UTC) Subject: [master] d5559812a spelling: deprecated Message-ID: <20240819124708.D9E74120940@lists.varnish-cache.org> commit d5559812ad2901d7fd3d8e97fee11883b64a50a1 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: deprecated Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index a1de97632..0f5992650 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -1046,7 +1046,7 @@ Varnish Cache 7.0.0 (2021-09-15) * Added ``VRT_UnsetHdr()`` and removed ``vrt_magic_string_unset``. -* Removed depcreated ``STRING_LIST`` in favor of ``STRANDS``. All functions +* Removed deprecated ``STRING_LIST`` in favor of ``STRANDS``. All functions that previously took a ``STRING_LIST`` had ``const char *, ...`` arguments, they now take ``const char *, VCL_STRANDS`` arguments. The magic cookie ``vrt_magic_string_end`` is gone and ``VRT_CollectStrands()`` was renamed to From phk at FreeBSD.org Mon Aug 19 12:47:09 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:09 +0000 (UTC) Subject: [master] d637cfd28 spelling: descendents Message-ID: <20240819124709.05A64120958@lists.varnish-cache.org> commit d637cfd281200f15de5ffde8a44638dc8e6e0b61 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: descendents Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/platforms.rst b/doc/sphinx/phk/platforms.rst index a83528bfa..d32ffe800 100644 --- a/doc/sphinx/phk/platforms.rst +++ b/doc/sphinx/phk/platforms.rst @@ -69,12 +69,12 @@ Platform specific bug reports without patches will likely live a quiet life. *Mac OS/X* -*Solaris-decendants* (Oracle Solaris, OmniOS, Joyent SmartOS) +*Solaris-descendents* (Oracle Solaris, OmniOS, Joyent SmartOS) Mac OS/X is regarded as a developer platform, not as a production platform. -Solaris-decendants are regarded as a production platform. +Solaris-descendents are regarded as a production platform. NetBSD, AIX and HP-UX are conceivably candidates for this level, but so far I have not heard much, if any, user interest. From phk at FreeBSD.org Mon Aug 19 12:47:09 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:09 +0000 (UTC) Subject: [master] c0b9da94b spelling: devastated Message-ID: <20240819124709.231D412096D@lists.varnish-cache.org> commit c0b9da94b28ede375691600b2db9b69e40f606c2 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: devastated Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/dough.rst b/doc/sphinx/phk/dough.rst index 4e86e7d7f..6afa07a32 100644 --- a/doc/sphinx/phk/dough.rst +++ b/doc/sphinx/phk/dough.rst @@ -10,7 +10,7 @@ Raking in the dough on Free and Open Source Software ==================================================== I'm writing this on the third day after the "Heartbleed" bug in OpenSSL -devasted internet security, and while I have been very critical of the +devastated internet security, and while I have been very critical of the OpenSSL source code since I first saw it, I have nothing but admiration for the OpenSSL crew and their effort. From phk at FreeBSD.org Mon Aug 19 12:47:09 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:09 +0000 (UTC) Subject: [master] 5ec3666b8 spelling: developer Message-ID: <20240819124709.47CC1120981@lists.varnish-cache.org> commit 5ec3666b8934d779325edf9ad1c6c15ec9dc139b Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: developer Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 0f5992650..fe891a728 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -69,7 +69,7 @@ Varnish Cache NEXT (2024-09-15) unless explicitly given. * ``varnishd`` now creates a ``worker_tmpdir`` which can be used by - VMODs for temporary files. The `VMOD deleveloper documentation`_ has + VMODs for temporary files. The `VMOD developer documentation`_ has details. * The environment variable ``VARNISH_DEFAULT_N`` now provides the @@ -77,7 +77,7 @@ Varnish Cache NEXT (2024-09-15) ``-n`` argument to ``varnishd`` and ``varnish*`` utilities except ``varnishtest``. -.. _VMOD deleveloper documentation: doc/sphinx/reference/vmod.rst +.. _VMOD developer documentation: doc/sphinx/reference/vmod.rst ================================ Varnish Cache 7.5.0 (2024-03-18) From phk at FreeBSD.org Mon Aug 19 12:47:09 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:09 +0000 (UTC) Subject: [master] f16a90bb4 spelling: differentiate Message-ID: <20240819124709.63A3F12098E@lists.varnish-cache.org> commit f16a90bb4c0edc5e2f19ed4a79430188bb0032b1 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: differentiate Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/README.WRITING_RST.rst b/doc/README.WRITING_RST.rst index 21fe17a0d..bb1a5f7c1 100644 --- a/doc/README.WRITING_RST.rst +++ b/doc/README.WRITING_RST.rst @@ -38,7 +38,7 @@ cross-references using:: Trouble is that ``rst2man`` and ``rst2pdf`` working on individual files cannot parse `ref` roles to anything outside the current rst -file, so we need to differenciate link targets depending on the kind +file, so we need to differentiate link targets depending on the kind of documentation: * set link targets on the top of documents ending up in man-pages From phk at FreeBSD.org Mon Aug 19 12:47:09 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:09 +0000 (UTC) Subject: [master] 00bdb73ae spelling: directory Message-ID: <20240819124709.81AFC12099E@lists.varnish-cache.org> commit 00bdb73ae0cd207a59f551181415b1ab147850eb Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: directory Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/reference/vmod.rst b/doc/sphinx/reference/vmod.rst index 197d91b43..553c406f7 100644 --- a/doc/sphinx/reference/vmod.rst +++ b/doc/sphinx/reference/vmod.rst @@ -862,7 +862,7 @@ your counters. Temporary Files =============== -``varnishd`` creates a directroy named ``worker_tmpdir`` under the +``varnishd`` creates a directory named ``worker_tmpdir`` under the varnish working directory (see ``varnishd -n`` argument) for read/write access by the worker process. From phk at FreeBSD.org Mon Aug 19 12:47:09 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:09 +0000 (UTC) Subject: [master] d539042d6 spelling: disambiguation Message-ID: <20240819124709.9FF991209A9@lists.varnish-cache.org> commit d539042d694cd09309344260e3fcffd84fc0fb44 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: disambiguation Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/backends.rst b/doc/sphinx/phk/backends.rst index 709093eb6..049e82577 100644 --- a/doc/sphinx/phk/backends.rst +++ b/doc/sphinx/phk/backends.rst @@ -94,7 +94,7 @@ is a wildcard-ish scheme, where you can write things like:: The final question is if we use shortcut notation for output from :ref:`varnishd(1)`, and the answer is no, because we do not want the stats-counters to change name because we load another VCL and suddenly -need disabiguation. +need disambiguation. Sharing Health Status From phk at FreeBSD.org Mon Aug 19 12:47:09 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:09 +0000 (UTC) Subject: [master] b5f46730c spelling: display Message-ID: <20240819124709.BEFEC1209B0@lists.varnish-cache.org> commit b5f46730c01c01b98b5097b092d7e446d3412183 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:55 2024 -0400 spelling: display Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index fe891a728..6a6b292fd 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -4888,7 +4888,7 @@ varnishd Varnish crashing. - If a backend sends a ``Content-Length`` header and we are streaming and we are not uncompressing it, send the ``Content-Length`` header on, - allowing browsers to diplay a progress bar. + allowing browsers to display a progress bar. - All storage must be at least 1M large. This is to prevent administrator errors when specifying the size of storage where the admin might have forgotten to specify units. From phk at FreeBSD.org Mon Aug 19 12:47:09 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:09 +0000 (UTC) Subject: [master] f45217954 spelling: doodles Message-ID: <20240819124709.DF4161209BA@lists.varnish-cache.org> commit f45217954f93d980fcc5d3cc7f39a3dac3197234 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:38:12 2024 -0400 spelling: doodles Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/three-zero.rst b/doc/sphinx/phk/three-zero.rst index ca9fbfca9..01605e96b 100644 --- a/doc/sphinx/phk/three-zero.rst +++ b/doc/sphinx/phk/three-zero.rst @@ -9,7 +9,7 @@ Thoughts on the eve of Varnish 3.0 ================================== -Five years ago, I was busy transforming my pile of random doddles +Five years ago, I was busy transforming my pile of random doodles on 5mm squared paper into software, according to "git log" working on the first stevedores. From phk at FreeBSD.org Mon Aug 19 12:47:10 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:10 +0000 (UTC) Subject: [master] 13310f466 spelling: doughnuts Message-ID: <20240819124710.08C471209C4@lists.varnish-cache.org> commit 13310f46641095035a2b67827f557ceec97de8db Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:38:40 2024 -0400 spelling: doughnuts Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/notes.rst b/doc/sphinx/phk/notes.rst index 79fa43f2a..2f1c90897 100644 --- a/doc/sphinx/phk/notes.rst +++ b/doc/sphinx/phk/notes.rst @@ -33,7 +33,7 @@ storage anymore. It used to be that you had the primary store, and it was anything from acoustic delaylines filled with mercury via small magnetic -dougnuts via transistor flip-flops to dynamic RAM. +doughnuts via transistor flip-flops to dynamic RAM. And then there were the secondary store, paper tape, magnetic tape, disk drives the size of houses, then the size of washing machines From phk at FreeBSD.org Mon Aug 19 12:47:10 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:10 +0000 (UTC) Subject: [master] 6f0c7c41f spelling: effect Message-ID: <20240819124710.49A1C1209CF@lists.varnish-cache.org> commit 6f0c7c41f873c25dc81c15fb143f2fa1de551172 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: effect Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/reference/vcl_var.rst b/doc/sphinx/reference/vcl_var.rst index 469721164..5f66776a5 100644 --- a/doc/sphinx/reference/vcl_var.rst +++ b/doc/sphinx/reference/vcl_var.rst @@ -1611,7 +1611,7 @@ resp.filters After resp.filters is set, changing any of the conditions which otherwise determine the filter selection will have no - effiect. Using resp.do_esi is an error once resp.filters is + effect. Using resp.do_esi is an error once resp.filters is set. From phk at FreeBSD.org Mon Aug 19 12:47:10 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:10 +0000 (UTC) Subject: [master] 260b6ba5d spelling: embarrassing Message-ID: <20240819124710.705FD1209E7@lists.varnish-cache.org> commit 260b6ba5d42765490367baf286565f4f9591249d Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: embarrassing Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 6a6b292fd..f01638949 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -5129,7 +5129,7 @@ Changes from 2.1.3 to 2.1.4 varnishd -------- -- An embarrasing typo in the new binary heap layout caused inflated +- An embarrassing typo in the new binary heap layout caused inflated obj/objcore/objhdr counts and could cause odd problems when the LRU expunge mechanism was invoked. This has been fixed. diff --git a/doc/sphinx/phk/VSV00003.rst b/doc/sphinx/phk/VSV00003.rst index 4a70ba177..1e622f2e2 100644 --- a/doc/sphinx/phk/VSV00003.rst +++ b/doc/sphinx/phk/VSV00003.rst @@ -52,7 +52,7 @@ I really wish more FOSS projects would pick up this practice. How did we find it ------------------ -This is a bit embarrasing for me. +This is a bit embarrassing for me. For ages I have been muttering about wanting to "fuzz"[#f5]_ Varnish, to see what would happen, but between all the many other items diff --git a/doc/sphinx/phk/patent.rst b/doc/sphinx/phk/patent.rst index 9c92f26f3..f46a682a9 100644 --- a/doc/sphinx/phk/patent.rst +++ b/doc/sphinx/phk/patent.rst @@ -13,7 +13,7 @@ When I was in USA, diplomas on the wall was very much a thing. I don't think I fully reverse-engineered the protocol for which diplomas would get hung and which would be filed away, apart from the unbreakable rule that, like it or not, anything your company -handed out was mandatory on the office-wall, no matter how embarrasing. +handed out was mandatory on the office-wall, no matter how embarrassing. Our paediatrician had diplomas for five or six steps of her education. diff --git a/doc/sphinx/phk/somethinghappened.rst b/doc/sphinx/phk/somethinghappened.rst index a8391bd51..ba7a4418d 100644 --- a/doc/sphinx/phk/somethinghappened.rst +++ b/doc/sphinx/phk/somethinghappened.rst @@ -75,7 +75,7 @@ That would have held some `pretty significant new code `_ from our users for another half year, for no particular reason. -So yeah, it was pretty embarrasing to have to amend our 5.1 release +So yeah, it was pretty embarrassing to have to amend our 5.1 release twice in two weeks, but it did prove that the "release by calendar" strategy is right for our project: It forced us to get our s**t toggether so users can benefit from the work we do in a timely From phk at FreeBSD.org Mon Aug 19 12:47:10 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:10 +0000 (UTC) Subject: [master] 659385ed0 spelling: endianness Message-ID: <20240819124710.A83FC1209FF@lists.varnish-cache.org> commit 659385ed0047b118bbb16f32af5409a81e5dca2c Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: endianness Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/cheri4.rst b/doc/sphinx/phk/cheri4.rst index 6c96038b2..d9419c59b 100644 --- a/doc/sphinx/phk/cheri4.rst +++ b/doc/sphinx/phk/cheri4.rst @@ -126,7 +126,7 @@ C sources, you almost always end up needing a macro like:: To remove const-ness where it cannot go. (If you think that is ISO-C's opus magnum, ask yourself why we still -cannot specify struct packing and endianess explicitly ? It's hardly +cannot specify struct packing and endianness explicitly ? It's hardly like anybody ever have to apart data-structures explicitly specified in hardware or protocol documents, is it ?) diff --git a/doc/sphinx/phk/legacy.rst b/doc/sphinx/phk/legacy.rst index f0754ac23..efb66ed31 100644 --- a/doc/sphinx/phk/legacy.rst +++ b/doc/sphinx/phk/legacy.rst @@ -34,7 +34,7 @@ modems, when dialing into a BBS or ISP in the 1990ies. I guess I should say "legacy-modems" ? -Big-endianess, storing the bytes the sensible way for hex-dumps, is +Big-endianness, storing the bytes the sensible way for hex-dumps, is rapidly becoming legacy, as the final old HP and SUN irons are finally become eWaste. @@ -44,7 +44,7 @@ time picked equally one or the other, and the consolidation towards little-endian is driven more by *"It's actually not that important"* than by anything else. -But we still have a bit of code which cares about endianess +But we still have a bit of code which cares about endianness in Varnish, in particular in the imported `zlib` code. For a while I ran a CI client on a WLAN access point with a diff --git a/doc/sphinx/reference/vtla.rst b/doc/sphinx/reference/vtla.rst index ab017c523..e155926c2 100644 --- a/doc/sphinx/reference/vtla.rst +++ b/doc/sphinx/reference/vtla.rst @@ -54,7 +54,7 @@ VENC Varnish ENCoding -- base64 functions VEND - Varnish ENDianess -- functions to marshall data in specified endianess + Varnish ENDianess -- functions to marshall data in specified endianness VEV Varnish EVent -- library functions to implement a simple event-dispatcher. From phk at FreeBSD.org Mon Aug 19 12:47:10 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:10 +0000 (UTC) Subject: [master] d020ff29c spelling: everybody's Message-ID: <20240819124710.C9B6B120A15@lists.varnish-cache.org> commit d020ff29c43b743795223fb13f9948da53f514a7 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: everybody's Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/VSV00001.rst b/doc/sphinx/phk/VSV00001.rst index e7b34409f..3f26ccc77 100644 --- a/doc/sphinx/phk/VSV00001.rst +++ b/doc/sphinx/phk/VSV00001.rst @@ -28,7 +28,7 @@ VWV - Vulnerability Workaround in VCL Rolling a new Varnish release, even with an trivial one-line patch is not a fast operation, getting from patch to packages rolled and pushed into operating system respositories takes at least several -days, provided you can get everybodys attention. +days, provided you can get everybody's attention. Being able to offer users a way to mitigate security issues in VCL bypasses all that red tape: The moment you have the advisory in diff --git a/doc/sphinx/whats-new/changes-6.0.rst b/doc/sphinx/whats-new/changes-6.0.rst index db0143184..ab147944b 100644 --- a/doc/sphinx/whats-new/changes-6.0.rst +++ b/doc/sphinx/whats-new/changes-6.0.rst @@ -83,7 +83,7 @@ as a result. VMOD functions can take optional arguments, these are different from defaulted arguments in that a separate flag tells if they -were specified or not in the call. For reasons of everybodys +were specified or not in the call. For reasons of everybody's sanity, all the arguments gets wrapped in a function-specific structure when this is used. From phk at FreeBSD.org Mon Aug 19 12:47:10 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:10 +0000 (UTC) Subject: [master] 23f490372 spelling: everybody Message-ID: <20240819124710.ED2F6120A2F@lists.varnish-cache.org> commit 23f490372c27e7e37b9d2301ecc9e5ae7b1f0085 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: everybody Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/vdd19q3.rst b/doc/sphinx/phk/vdd19q3.rst index b77832d85..8bbe06f40 100644 --- a/doc/sphinx/phk/vdd19q3.rst +++ b/doc/sphinx/phk/vdd19q3.rst @@ -82,7 +82,7 @@ another organization will have looked at patches and pull requests before me, both to move some of the "no-ing" away from me and also to get people to pay more attention to each others work. -For this to work, everybdoy will have to spend a bit more time on +For this to work, everybody will have to spend a bit more time on "project work", but everybody agreed to do that, so we think it can fly. From phk at FreeBSD.org Mon Aug 19 12:47:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:11 +0000 (UTC) Subject: [master] 5f13aea30 spelling: exaggerated Message-ID: <20240819124711.1425D120A42@lists.varnish-cache.org> commit 5f13aea30b86e4bf09bc6767bf13335004e3b866 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: exaggerated Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/503aroundtheworld.rst b/doc/sphinx/phk/503aroundtheworld.rst index 8b16b4d84..5671f9607 100644 --- a/doc/sphinx/phk/503aroundtheworld.rst +++ b/doc/sphinx/phk/503aroundtheworld.rst @@ -101,7 +101,7 @@ In fact, they effectively dDoS'ed Norway. (Update: I'm now being told by people from Norway that this did not dDoS that much. As I live in Denmark I obviously only have this saga on second hand. (The only effect I experienced myself was that -the Trac server was unreachable). Somebody has exagerated the +the Trac server was unreachable). Somebody has exaggerated the story along the way. However, this did prompt me to track down the precise timing: From phk at FreeBSD.org Mon Aug 19 12:47:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:11 +0000 (UTC) Subject: [master] 2984f0b59 spelling: exception Message-ID: <20240819124711.3BB64120A56@lists.varnish-cache.org> commit 2984f0b594cbb46b785bfd9c51d521715e54f928 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: exception Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/cheri2.rst b/doc/sphinx/phk/cheri2.rst index 26d312d06..d223b924f 100644 --- a/doc/sphinx/phk/cheri2.rst +++ b/doc/sphinx/phk/cheri2.rst @@ -72,7 +72,7 @@ back into ``poll(2)``. This is 100% safe, because nobody else can get to a pipe created with ``pipe(2)``, but there is no way CHERI could spot that to -make an execption, so reading pointers out of a filedescriptor, +make an exception, so reading pointers out of a filedescriptor, cause fully justified core-dumps. If the poll-waiter was actually relevant, the proper fix would be From phk at FreeBSD.org Mon Aug 19 12:47:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:11 +0000 (UTC) Subject: [master] a48117e91 spelling: exhausted Message-ID: <20240819124711.57B53120A6B@lists.varnish-cache.org> commit a48117e91dd6813b713f7beeab67e7ea24d90f81 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: exhausted Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index f01638949..6566a9f13 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -3321,7 +3321,7 @@ Bugs fixed * 2241_ - VSL fails to get hold of SHM * 2270_ - Newly loaded auto VCLs don't get their go_cold timer set * 2273_ - Master cooling problem -* 2275_ - If the client workspace is almost, but not quite exhaused, we may +* 2275_ - If the client workspace is almost, but not quite exhausted, we may not be able to get enough iovec's to do Chunked transmission. * 2295_ - Spinning loop in VBE_Poll causes master to kill child on CLI timeout From phk at FreeBSD.org Mon Aug 19 12:47:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:11 +0000 (UTC) Subject: [master] 81a16f6fb spelling: facilities Message-ID: <20240819124711.703B4120A7C@lists.varnish-cache.org> commit 81a16f6fb400d0fcf9e3660cea4c09c07060abdb Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: facilities Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/thetoolsweworkwith.rst b/doc/sphinx/phk/thetoolsweworkwith.rst index 60ccddff3..5ed32a7f2 100644 --- a/doc/sphinx/phk/thetoolsweworkwith.rst +++ b/doc/sphinx/phk/thetoolsweworkwith.rst @@ -125,7 +125,7 @@ wall clock time you want to sleep until. The only problem with that is that UTC wall clock time is not continuous when implemented on a computer, and it may not even be -monotonously increasing, since NTPD or other timesync facilites may +monotonously increasing, since NTPD or other timesync facilities may step the clock backwards, particularly in the first minutes after boot. From phk at FreeBSD.org Mon Aug 19 12:47:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:11 +0000 (UTC) Subject: [master] e67bf90ae spelling: fastly's Message-ID: <20240819124711.8D3BA120A8C@lists.varnish-cache.org> commit e67bf90ae3df7a59a4154400dac01a6418f1d4bc Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: fastly's Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/patent.rst b/doc/sphinx/phk/patent.rst index f46a682a9..60c7f2c1b 100644 --- a/doc/sphinx/phk/patent.rst +++ b/doc/sphinx/phk/patent.rst @@ -233,7 +233,7 @@ I know and admire how hard he worked to make it happen. Congratulations to Artur and the Fastly Crew! -But I will steal some of Artur's thunder, and point to Fastlys IPO +But I will steal some of Artur's thunder, and point to Fastly's IPO as proof that at least once in my career, I had a unique idea worth a billion dollars :-) From phk at FreeBSD.org Mon Aug 19 12:47:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:11 +0000 (UTC) Subject: [master] a569cb4bf spelling: feb Message-ID: <20240819124711.BC061120AA4@lists.varnish-cache.org> commit a569cb4bf314babf3a197f05389ec65b9340b4bd Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: feb Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/firstdesign.rst b/doc/sphinx/phk/firstdesign.rst index dc7266939..982a1f163 100644 --- a/doc/sphinx/phk/firstdesign.rst +++ b/doc/sphinx/phk/firstdesign.rst @@ -19,7 +19,7 @@ the birth of Varnish 10 years ago. The first Varnish Design notes ------------------------------ -This file are notes taken during a meeting in Oslo on 2nd feb 2006, +This file are notes taken during a meeting in Oslo on 2nd Feb 2006, which in essence consisted of Anders Berg cursing Squid for a couple of hours. From phk at FreeBSD.org Mon Aug 19 12:47:11 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:11 +0000 (UTC) Subject: [master] 905416fe3 spelling: fetch Message-ID: <20240819124711.DE6AF120AC9@lists.varnish-cache.org> commit 905416fe3740818f8e51fac158de87be378a5730 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:56 2024 -0400 spelling: fetch Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 6566a9f13..96ef96cce 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -3355,7 +3355,7 @@ Varnish Cache 4.1.5-beta2 (2017-02-08) Bugs fixed ---------- -* 1704_ - Reverted the docfix and made the fech_failed counter do +* 1704_ - Reverted the docfix and made the fetch_failed counter do what the documentation says it should do * 1865_ - Panic accessing beresp.backend.ip in vcl_backend_error * 2167_ - VCC will not parse a literal negative number where INT is From phk at FreeBSD.org Mon Aug 19 12:47:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:12 +0000 (UTC) Subject: [master] 8875cbf26 spelling: functionally Message-ID: <20240819124712.05AF3120ADB@lists.varnish-cache.org> commit 8875cbf2628a9dab37b9dbe088598b243c6210fc Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: functionally Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/whats-new/changes-7.2.rst b/doc/sphinx/whats-new/changes-7.2.rst index c7fbbbf09..a48cfa640 100644 --- a/doc/sphinx/whats-new/changes-7.2.rst +++ b/doc/sphinx/whats-new/changes-7.2.rst @@ -25,7 +25,7 @@ keep a place ready for it in the overall architecture. Now a credible use-case finally appeared, and we have implemented "Varnish Extensions" (VTLA: "VEXT"), which can both be used to load -ambient VMODs and to implement entirely new functionaly, for instance +ambient VMODs and to implement entirely new functionally, for instance stevedores. See :ref:`ref-vext` in the reference manual for more information. From phk at FreeBSD.org Mon Aug 19 12:47:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:12 +0000 (UTC) Subject: [master] 21460214b spelling: functioncall Message-ID: <20240819124712.22F88120AEF@lists.varnish-cache.org> commit 21460214b78b2788d17811ea22a274e321b06d6e Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: functioncall Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/firstdesign.rst b/doc/sphinx/phk/firstdesign.rst index 982a1f163..00373ef0e 100644 --- a/doc/sphinx/phk/firstdesign.rst +++ b/doc/sphinx/phk/firstdesign.rst @@ -955,7 +955,7 @@ A couple of days later the ideas had gel'ed:: else_part: /* empty */ | "else" compound - functioncal: "call" function_name + functioncall: "call" function_name field: object field "." variable From phk at FreeBSD.org Mon Aug 19 12:47:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:12 +0000 (UTC) Subject: [master] 8e0acd823 spelling: github Message-ID: <20240819124712.401CC120B14@lists.varnish-cache.org> commit 8e0acd823594cd2d1e60a8b93f849e78996db19c Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: github Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/installation/help.rst b/doc/sphinx/installation/help.rst index 82561143b..d58591e02 100644 --- a/doc/sphinx/installation/help.rst +++ b/doc/sphinx/installation/help.rst @@ -73,7 +73,7 @@ annoy those people. Trouble Tickets =============== -Our bugtracker lives on Github, but please do not open a trouble +Our bugtracker lives on GitHub, but please do not open a trouble ticket, unless you have spotted an actual bug in Varnish. Ask on IRC first if you are in doubt. @@ -82,7 +82,7 @@ pile of other `issues`, feature suggestions for future releases, and double postings of calls for help from people who forgot to check back on already opened Tickets. -New ideas may get parked in our Github wiki, until we have time +New ideas may get parked in our GitHub wiki, until we have time for them, or until we have thought out a good design. diff --git a/doc/sphinx/phk/10goingon50.rst b/doc/sphinx/phk/10goingon50.rst index bed42a48b..97b6b8a52 100644 --- a/doc/sphinx/phk/10goingon50.rst +++ b/doc/sphinx/phk/10goingon50.rst @@ -162,7 +162,7 @@ We were hip before it was hip to be hipsters Moving to github also means moving into a different culture. -Githubs statistics are neat, but whenever you start to measure +GitHub's statistics are neat, but whenever you start to measure something, it becomes a parameter for optimization and competition, and there are people out there who compete on github statistics. From phk at FreeBSD.org Mon Aug 19 12:47:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:12 +0000 (UTC) Subject: [master] f4219bdbd spelling: gotchas Message-ID: <20240819124712.59D73120B26@lists.varnish-cache.org> commit f4219bdbd1dd5caf5291d6c21cf4ea707102c93e Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: gotchas Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/vcl_expr.rst b/doc/sphinx/phk/vcl_expr.rst index 4f7ad3b7e..b9aa570e1 100644 --- a/doc/sphinx/phk/vcl_expr.rst +++ b/doc/sphinx/phk/vcl_expr.rst @@ -35,7 +35,7 @@ duration by a REAL, but you cannot multiply a TIME by anything. Given that we have our own types, the next question is what precedence operators have. -The C programming language is famous for having a couple of gottchas +The C programming language is famous for having a couple of gotchas in its precedence rules and given our limited and narrow type repertoire, blindly importing a set of precedence rules may confuse a lot more than it may help. From phk at FreeBSD.org Mon Aug 19 12:47:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:12 +0000 (UTC) Subject: [master] 66ad10bb8 spelling: grudgingly Message-ID: <20240819124712.730ED120B36@lists.varnish-cache.org> commit 66ad10bb830ccd34a3ae66989ba53dd072e6b995 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: grudgingly Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/lucky.rst b/doc/sphinx/phk/lucky.rst index b11febdac..55118b9f7 100644 --- a/doc/sphinx/phk/lucky.rst +++ b/doc/sphinx/phk/lucky.rst @@ -172,7 +172,7 @@ Good luck! .. rubric:: Footnotes -.. [#f1] I am not a big fan of bug-bounties, but I will grudingly admit +.. [#f1] I am not a big fan of bug-bounties, but I will grudgingly admit that wiser men than me, notably `Dan Geer `_, have proposed that tax-money be used to snatch the vulnerabilities up, before bad guys From phk at FreeBSD.org Mon Aug 19 12:47:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:12 +0000 (UTC) Subject: [master] ea5bcdd50 spelling: gzipped Message-ID: <20240819124712.8D453120B54@lists.varnish-cache.org> commit ea5bcdd50f2f4251a930f112550d0ebdc75cb235 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: gzipped Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/gzip.rst b/doc/sphinx/phk/gzip.rst index 0eafa9943..4882cd4e7 100644 --- a/doc/sphinx/phk/gzip.rst +++ b/doc/sphinx/phk/gzip.rst @@ -92,7 +92,7 @@ fetch. (I have no idea why/when you would use this...) Will make varnish gzip the object during fetch from the backend, provided the backend didn't send us a gzip'ed object. -Remember that a lot of content types cannot sensibly be gziped, most +Remember that a lot of content types cannot sensibly be gzipped, most notably compressed image formats like jpeg, png and similar, so a typical use would be:: @@ -117,7 +117,7 @@ when you enable ESI, if not it is a bug you should report. But things are vastly more complicated now. What happens for instance, when the backend sends a gzip'ed object we ESI process it and it includes another object which is not gzip'ed, and we want -to send the result gziped to the client ? +to send the result gzipped to the client ? Things can get really hairy here, so let me explain it in stages. @@ -170,5 +170,5 @@ compression efficiency, you should:: So that the backend sends these objects uncompressed to varnish. You should also attempt to make sure that all objects which are -esi:included are gziped, either by making the backend do it or +esi:included are gzipped, either by making the backend do it or by making varnish do it. From phk at FreeBSD.org Mon Aug 19 12:47:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:12 +0000 (UTC) Subject: [master] 64841fff7 spelling: happened Message-ID: <20240819124712.A7F79120B60@lists.varnish-cache.org> commit 64841fff7d17e4e69f2beab59bfb2bc8b8bc19f5 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: happened Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/thoughts.rst b/doc/sphinx/phk/thoughts.rst index 80683f9ce..95b37338d 100644 --- a/doc/sphinx/phk/thoughts.rst +++ b/doc/sphinx/phk/thoughts.rst @@ -21,7 +21,7 @@ his wisdom to choose the better idea. But it could also be, that The Assistant to The Deputy Viceminister of Northern Affairs, edged in sideways, at a carefully chosen time where -the emperor looked relaxed and friendly, and sort of happend to mention +the emperor looked relaxed and friendly, and sort of happened to mention that 50 villages had been sort of raided by the barbarians, hoping for the reply, which would not be a career opportunity for The Assistant to The Assistant to The Deputy Viceminister of From phk at FreeBSD.org Mon Aug 19 12:47:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:12 +0000 (UTC) Subject: [master] c1391705e spelling: important Message-ID: <20240819124712.C48A6120B79@lists.varnish-cache.org> commit c1391705e3b1d0dd600b5b7dff3402826fb5f86b Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: important Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/README.WRITING_RST.rst b/doc/README.WRITING_RST.rst index bb1a5f7c1..0d203ece0 100644 --- a/doc/README.WRITING_RST.rst +++ b/doc/README.WRITING_RST.rst @@ -46,7 +46,7 @@ of documentation: .. _varnishd(1): -* set link targets for imporant paramgraphs following the scheme +* set link targets for important paramgraphs following the scheme ref-`doc`-`section`, for instance:: .. _ref-varnishd-opt_T: From phk at FreeBSD.org Mon Aug 19 12:47:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:12 +0000 (UTC) Subject: [master] f102d3353 spelling: in between Message-ID: <20240819124712.DEFB2120B8D@lists.varnish-cache.org> commit f102d3353569dcd130870c083ecd6ecc5fd77b73 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: in between Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/reference/vmod.rst b/doc/sphinx/reference/vmod.rst index 553c406f7..bac18cd03 100644 --- a/doc/sphinx/reference/vmod.rst +++ b/doc/sphinx/reference/vmod.rst @@ -488,7 +488,7 @@ VCL_SUB side). For more than one invocation of ``VRT_call()``, VMODs *must* - check if ``VRT_handled()`` returns non-zero inbetween calls: + check if ``VRT_handled()`` returns non-zero in between calls: The called SUB may have returned with an action (any ``return(x)`` other than plain ``return``) or may have failed the VCL, and in both cases the calling VMOD *must* return From phk at FreeBSD.org Mon Aug 19 12:47:12 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:12 +0000 (UTC) Subject: [master] c102ee94d spelling: incompatibilities Message-ID: <20240819124713.055C9120BA0@lists.varnish-cache.org> commit c102ee94d3166d890a2fb60e5209d8f01b7f58de Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: incompatibilities Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/whats-new/upgrading-6.6.rst b/doc/sphinx/whats-new/upgrading-6.6.rst index 3cafd4a21..f605931f5 100644 --- a/doc/sphinx/whats-new/upgrading-6.6.rst +++ b/doc/sphinx/whats-new/upgrading-6.6.rst @@ -9,7 +9,7 @@ Upgrading to Varnish 6.6 %%%%%%%%%%%%%%%%%%%%%%%% -In general, this release should not come with relevant incompatibilies +In general, this release should not come with relevant incompatibilities to the previous release 6.5. VCL should continue to work as before except when rather exotic, From phk at FreeBSD.org Mon Aug 19 12:47:13 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:13 +0000 (UTC) Subject: [master] c3df35da8 spelling: infinite Message-ID: <20240819124713.29FDE120BB4@lists.varnish-cache.org> commit c3df35da88ca3d73287e007ab3ac3cc1667343ef Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: infinite Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 96ef96cce..155d11c15 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -5623,7 +5623,7 @@ varnishd headers, for instance. - When support for restart in vcl\_error was added, there was no check - to prevent infinte recursion. This has now been fixed. + to prevent infinite recursion. This has now been fixed. - Turn on purge\_dups by default. This should make us consume less memory when there are many bans for the same pattern added. From phk at FreeBSD.org Mon Aug 19 12:47:13 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:13 +0000 (UTC) Subject: [master] 66294eb58 spelling: inspirations Message-ID: <20240819124713.44F6A120BDC@lists.varnish-cache.org> commit 66294eb5846624170da0f3d121a877040c7767d4 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: inspirations Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/firstdesign.rst b/doc/sphinx/phk/firstdesign.rst index 00373ef0e..83361ea0f 100644 --- a/doc/sphinx/phk/firstdesign.rst +++ b/doc/sphinx/phk/firstdesign.rst @@ -477,7 +477,7 @@ to decide what to cache, how long time to cache it, where to cache it and ... it sounded like a lot of very detailed code which had to be incredibly configurable. -Soon those two inspiratons collided:: +Soon those two inspirations collided:: Notes on Varnish From phk at FreeBSD.org Mon Aug 19 12:47:13 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:13 +0000 (UTC) Subject: [master] 4b496f96d spelling: into Message-ID: <20240819124713.60937120BFD@lists.varnish-cache.org> commit 4b496f96d0af51ca1aff4aae2b37b5bf29dda568 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: into Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/installation/bugs.rst b/doc/sphinx/installation/bugs.rst index 0f41b03f7..e8de358aa 100644 --- a/doc/sphinx/installation/bugs.rst +++ b/doc/sphinx/installation/bugs.rst @@ -27,7 +27,7 @@ allow us to reproduce. To report a bug please follow the suggested procedure described in the "Trouble Tickets" section of the documentation (above). -Roughly we categorize bugs in to three kinds of bugs (described below) with Varnish. The information +Roughly we categorize bugs into three kinds of bugs (described below) with Varnish. The information we need to debug them depends on what kind of bug we are facing. Varnish crashes diff --git a/doc/sphinx/phk/trialerror.rst b/doc/sphinx/phk/trialerror.rst index e358cb1e6..94eb2fea9 100644 --- a/doc/sphinx/phk/trialerror.rst +++ b/doc/sphinx/phk/trialerror.rst @@ -34,7 +34,7 @@ with the running program and argued that it prolonged the debugging process. Practically all the oral histories from back then are about people -sneaking in to university or work at night, to get the computer for +sneaking into university or work at night, to get the computer for themselves. But we could call it "Prototyping" if that sounded better, and now From phk at FreeBSD.org Mon Aug 19 12:47:13 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:13 +0000 (UTC) Subject: [master] ac9cd14d1 spelling: its Message-ID: <20240819124713.79385120C1B@lists.varnish-cache.org> commit ac9cd14d1c649ac109de3d228806910a32303034 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: its Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/users-guide/esi.rst b/doc/sphinx/users-guide/esi.rst index 209ade289..8920ed7c0 100644 --- a/doc/sphinx/users-guide/esi.rst +++ b/doc/sphinx/users-guide/esi.rst @@ -214,7 +214,7 @@ will be uncompressed and recompressed part-wise during the fetch. The part-wise compression reduces the opportunities for removing redundancy, because back-references in the gzip -data stream cannot point outside it's own part. +data stream cannot point outside its own part. The other case where compression ratio is impacted, is if an uncompressed fragment is inserted into a compressed From phk at FreeBSD.org Mon Aug 19 12:47:13 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:13 +0000 (UTC) Subject: [master] f6332e1bf spelling: jan Message-ID: <20240819124713.990B7120C35@lists.varnish-cache.org> commit f6332e1bf166c20c91234fba3710a676d6c610c2 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: jan Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/firstdesign.rst b/doc/sphinx/phk/firstdesign.rst index 83361ea0f..a397b7da6 100644 --- a/doc/sphinx/phk/firstdesign.rst +++ b/doc/sphinx/phk/firstdesign.rst @@ -23,7 +23,7 @@ This file are notes taken during a meeting in Oslo on 2nd Feb 2006, which in essence consisted of Anders Berg cursing Squid for a couple of hours. -(Originally the meeting was scheduled for jan 24th but a SAS pilot +(Originally the meeting was scheduled for Jan 24th but a SAS pilot strike put an end to that.) To be honest I knew very little about web-traffic, my own homepage From phk at FreeBSD.org Mon Aug 19 12:47:13 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:13 +0000 (UTC) Subject: [master] ef0ba7b73 spelling: javascript Message-ID: <20240819124713.B2A95120C3E@lists.varnish-cache.org> commit ef0ba7b7339baf66a8fa13b03c3c2c271e4972b6 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: javascript Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/users-guide/increasing-your-hitrate.rst b/doc/sphinx/users-guide/increasing-your-hitrate.rst index 88f166204..00336e99b 100644 --- a/doc/sphinx/users-guide/increasing-your-hitrate.rst +++ b/doc/sphinx/users-guide/increasing-your-hitrate.rst @@ -161,7 +161,7 @@ Lets use the Varnish Software (VS) web as an example here. Very simplified the setup VS uses can be described as a Drupal-based backend with a Varnish cache in front. VS uses some cookies for Google Analytics tracking and similar tools. The cookies are all -set and used by Javascript. Varnish and Drupal doesn't need to see +set and used by JavaScript. Varnish and Drupal doesn't need to see those cookies and since Varnish will cease caching of pages when the client sends cookies Varnish will discard these unnecessary cookies in VCL. From phk at FreeBSD.org Mon Aug 19 12:47:13 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:13 +0000 (UTC) Subject: [master] 50064a9e7 spelling: lego Message-ID: <20240819124713.E4D26120C46@lists.varnish-cache.org> commit 50064a9e72bc7e68b51a7bf6816657c57923d6d0 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:58:27 2024 -0400 spelling: lego Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/lucky.rst b/doc/sphinx/phk/lucky.rst index 55118b9f7..83b70a110 100644 --- a/doc/sphinx/phk/lucky.rst +++ b/doc/sphinx/phk/lucky.rst @@ -144,7 +144,7 @@ many months too late [#f2]_. Jacob was not a major persona on the Internet, but between doing a lot of interesting stuff as a multi-discipline phd. in physics, -being a really good Ada programmer, a huge Lego enthusiast, an +being a really good Ada programmer, a huge LEGO enthusiast, an incredibly helpful person *and* really *good* at helping, he had a lot of friends in many corners of the Internet. From phk at FreeBSD.org Mon Aug 19 12:47:14 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:14 +0000 (UTC) Subject: [master] 6aa71ea70 spelling: macos Message-ID: <20240819124714.21489120C4E@lists.varnish-cache.org> commit 6aa71ea7098d97c2d89322899ed615082db56f5d Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: macos Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 155d11c15..5d6f56269 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -646,7 +646,7 @@ Varnish Cache 7.2.0 (2022-09-15) * Stevedore initialization via the ``.init()`` callback has been moved to the worker process. -* The parameter ``tcp_keepalive_time`` is supported on MacOS. +* The parameter ``tcp_keepalive_time`` is supported on macOS. * Duration parameters can optionally take a unit, with the same syntax as duration units in VCL. Example: ``param.set default_grace 1h``. @@ -1905,7 +1905,7 @@ Varnish Cache 6.4.0 (2020-03-16) * Add more vcl control over timeouts with ``sess.timeout_linger``, ``sess.send_timeout`` and ``sess.idle_send_timeout`` -* Fix panics due to missing EINVAL handling on MacOS, see 1853_ +* Fix panics due to missing EINVAL handling on macOS, see 1853_ * Added ``VSLs()`` and ``VSLbs()`` functions for logging ``STRANDS`` to VSL @@ -6468,7 +6468,7 @@ Build system wider range of platforms. - Compatibility shims for clock\_gettime() are now correctly applied - where needed, allowing Varnish to build on MacOS X. + where needed, allowing Varnish to build on Mac OS X. - The autogen.sh script will now correctly detect and warn about automake versions which are known not to work correctly. diff --git a/doc/sphinx/installation/install_source.rst b/doc/sphinx/installation/install_source.rst index 82bec51a9..1e10f9782 100644 --- a/doc/sphinx/installation/install_source.rst +++ b/doc/sphinx/installation/install_source.rst @@ -148,10 +148,10 @@ Optionally, to pull from a repository:: Then continue `Compiling Varnish`_ -Build dependencies on MacOS +Build dependencies on macOS --------------------------- -To compile varnish on MacOS, these steps should install the required +To compile varnish on macOS, these steps should install the required dependencies: * Install ``xcode`` via the App Store diff --git a/doc/sphinx/users-guide/storage-backends.rst b/doc/sphinx/users-guide/storage-backends.rst index 70e953487..043025c2c 100644 --- a/doc/sphinx/users-guide/storage-backends.rst +++ b/doc/sphinx/users-guide/storage-backends.rst @@ -125,7 +125,7 @@ anyway. Traditionally, the virtual memory limit is configured with for this limit like control groups (Linux) or resource controls (Solaris). -.. XXX idk about the BSD and MacOS abstractions -- slink +.. XXX idk about the BSD and macOS abstractions -- slink The 'path' parameter specifies either the path to the backing file or the path to a directory in which `varnishd` will create the backing file. diff --git a/doc/sphinx/whats-new/changes-7.2.rst b/doc/sphinx/whats-new/changes-7.2.rst index a48cfa640..0d97bd998 100644 --- a/doc/sphinx/whats-new/changes-7.2.rst +++ b/doc/sphinx/whats-new/changes-7.2.rst @@ -40,7 +40,7 @@ respectively from ``120.000``, ``10.000`` and ``0.000`` to ``2m``, ``10s`` and ``0s``. The platform-dependent ``tcp_keepalive_time`` parameter is supported on -MacOS. +macOS. The new ``vcc_feature`` bits parameter replaces previous ``vcc_*`` boolean parameters. The latter still exist as deprecated aliases. From phk at FreeBSD.org Mon Aug 19 12:47:14 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:14 +0000 (UTC) Subject: [master] 29f4d0bb9 spelling: management Message-ID: <20240819124714.4D145120C57@lists.varnish-cache.org> commit 29f4d0bb9772704fd253ee7a55b21714add63c2d Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: management Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/firstdesign.rst b/doc/sphinx/phk/firstdesign.rst index a397b7da6..187e2a490 100644 --- a/doc/sphinx/phk/firstdesign.rst +++ b/doc/sphinx/phk/firstdesign.rst @@ -502,7 +502,7 @@ Soon those two inspirations collided:: Multiple policy configurations can be loaded at the same time but only one is the "active configuration". Loading, switching and - unloading of policy configurations happen via the managment + unloading of policy configurations happen via the management process. A global config sequence number is incremented on each switch and From phk at FreeBSD.org Mon Aug 19 12:47:14 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:14 +0000 (UTC) Subject: [master] e96ba3df6 spelling: may Message-ID: <20240819124714.69090120C5F@lists.varnish-cache.org> commit e96ba3df6ff2192d95fd2b62552f21932ed0f6b1 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: may Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/reference/vcl_var.rst b/doc/sphinx/reference/vcl_var.rst index 5f66776a5..e2f9cdb1b 100644 --- a/doc/sphinx/reference/vcl_var.rst +++ b/doc/sphinx/reference/vcl_var.rst @@ -1361,7 +1361,7 @@ beresp.uncacheable Setting this variable makes the object uncacheable. - This may may produce a hit-for-miss object in the cache. + This may produce a hit-for-miss object in the cache. Clearing the variable has no effect and will log the warning "Ignoring attempt to reset beresp.uncacheable". From phk at FreeBSD.org Mon Aug 19 12:47:14 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:14 +0000 (UTC) Subject: [master] c60cd1c8a spelling: meaningful Message-ID: <20240819124714.860DB120C74@lists.varnish-cache.org> commit c60cd1c8a02886f7a5ff028a183f88fa4ce82d89 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: meaningful Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/firstdesign.rst b/doc/sphinx/phk/firstdesign.rst index 187e2a490..c8e7b180e 100644 --- a/doc/sphinx/phk/firstdesign.rst +++ b/doc/sphinx/phk/firstdesign.rst @@ -136,7 +136,7 @@ where we kept thinking in the old frame of reference (ie: Squid):: from hitting all the backend with the full force. An important aspect of cluster operations is giving a statistically - meaninful judgement of the cluster size, in particular answering + meaningful judgement of the cluster size, in particular answering the question "would adding another machine help ?" precisely. We should have a facility that allows the administrator to type From phk at FreeBSD.org Mon Aug 19 12:47:14 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:14 +0000 (UTC) Subject: [master] 863466e93 spelling: mmap Message-ID: <20240819124714.B58CB120C89@lists.varnish-cache.org> commit 863466e93e74a76f66febd7e5f3164be085a2c01 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:58 2024 -0400 spelling: mmap Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/cheri3.rst b/doc/sphinx/phk/cheri3.rst index 372d84050..47ad9604c 100644 --- a/doc/sphinx/phk/cheri3.rst +++ b/doc/sphinx/phk/cheri3.rst @@ -23,7 +23,7 @@ file with ``MAP_NOCORE``, was the only way to avoid the entire object cache being included in core-dumps. But CHERI will not allow you to put a pointer into a regular file -``mmmap(2)``'ed ``MAP_SHARED``, because that would allow another +``mmap(2)``'ed ``MAP_SHARED``, because that would allow another process, maybe even on a different computer, to ``mmap(2)`` the file ``MAP_SHARED`` later and, by implication, resurrect the pointers. From phk at FreeBSD.org Mon Aug 19 12:47:14 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:14 +0000 (UTC) Subject: [master] a07132e51 spelling: nonexistent Message-ID: <20240819124714.D577D120C96@lists.varnish-cache.org> commit a07132e518012bc3dae793820453da8d29bbd2e9 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: nonexistent Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 5d6f56269..187617f34 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -5662,7 +5662,7 @@ varnishd - If error was called with a null reason, we would crash on Solaris. Make sure this no longer happens. -- Varnish used to crash if you asked it to use a non-existent waiter. +- Varnish used to crash if you asked it to use a nonexistent waiter. This has now been fixed. - Add documentation to the default VCL explaining that using @@ -6015,7 +6015,7 @@ varnishd instead of copying the one it got from the backend (see `ticket #157 `_). -- Comparisons in VCL which involve a non-existent string (usually a +- Comparisons in VCL which involve a nonexistent string (usually a header which is not present in the request or object being processed) would cause a NULL pointer dereference; now the comparison will simply fail. From phk at FreeBSD.org Mon Aug 19 12:47:14 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:14 +0000 (UTC) Subject: [master] ed070626a spelling: norway's Message-ID: <20240819124714.F3404120CA7@lists.varnish-cache.org> commit ed070626a70b92715d12912d49a5123f422a3a65 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: norway's Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/dough.rst b/doc/sphinx/phk/dough.rst index 6afa07a32..cb3ca6efa 100644 --- a/doc/sphinx/phk/dough.rst +++ b/doc/sphinx/phk/dough.rst @@ -124,7 +124,7 @@ were perfectly willing to fund several more months. Varnish community funding ========================= -Five years later, having developed Varnish 1.0 for Norways "Verdens +Five years later, having developed Varnish 1.0 for Norway's "Verdens Gang" newspaper, I decided to give community funding a go again. Wiser from experience, I structured the `Varnish Moral License`_ From phk at FreeBSD.org Mon Aug 19 12:47:15 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:15 +0000 (UTC) Subject: [master] a65871f5e spelling: norwegian Message-ID: <20240819124715.219D9120CAD@lists.varnish-cache.org> commit a65871f5ea9498b7103a9ab544102b88557aad78 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: norwegian Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/503aroundtheworld.rst b/doc/sphinx/phk/503aroundtheworld.rst index 5671f9607..34540ff6f 100644 --- a/doc/sphinx/phk/503aroundtheworld.rst +++ b/doc/sphinx/phk/503aroundtheworld.rst @@ -93,7 +93,7 @@ And dDoS'ed the Varnish Cache project server. ... and the Redpill-Linprox Data Center, where that server lived. -... and the Norvegian ISPs that announced the prefix of that data center. +... and the Norwegian ISPs that announced the prefix of that data center. In fact, they effectively dDoS'ed Norway. From phk at FreeBSD.org Mon Aug 19 12:47:15 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:15 +0000 (UTC) Subject: [master] 81322fe59 spelling: object Message-ID: <20240819124715.49169120CBC@lists.varnish-cache.org> commit 81322fe592fdc5ca4720b17547526592bba9385b Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: object Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/whats-new/changes-7.4.rst b/doc/sphinx/whats-new/changes-7.4.rst index 53c56f90f..a39e2c16b 100644 --- a/doc/sphinx/whats-new/changes-7.4.rst +++ b/doc/sphinx/whats-new/changes-7.4.rst @@ -56,7 +56,7 @@ varnishlog ========== Object creation failures by the selected storage engine are now logged -under the ``Error`` tag as ``Failed to create object object from %s +under the ``Error`` tag as ``Failed to create object from %s %s``. varnishadm From phk at FreeBSD.org Mon Aug 19 12:47:15 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:15 +0000 (UTC) Subject: [master] 146154864 spelling: occasion Message-ID: <20240819124715.61ADC120CCE@lists.varnish-cache.org> commit 1461548647ce6a0308449dc54b4b02b576e8e5d0 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: occasion Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/notes.rst b/doc/sphinx/phk/notes.rst index 2f1c90897..2830b0705 100644 --- a/doc/sphinx/phk/notes.rst +++ b/doc/sphinx/phk/notes.rst @@ -16,7 +16,7 @@ That is not a coincidence. I have spent many years working on the FreeBSD kernel, and only rarely did I venture into userland programming, but when I had -occation to do so, I invariably found that people programmed like +occasion to do so, I invariably found that people programmed like it was still 1975. So when I was approached about the Varnish project I wasn't really From phk at FreeBSD.org Mon Aug 19 12:47:15 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:15 +0000 (UTC) Subject: [master] 91dae394f spelling: paragraphs Message-ID: <20240819124715.7ABAA120CD5@lists.varnish-cache.org> commit 91dae394f72b70f50eb858706046703abd3ba357 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: paragraphs Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/README.WRITING_RST.rst b/doc/README.WRITING_RST.rst index 0d203ece0..5bb846a69 100644 --- a/doc/README.WRITING_RST.rst +++ b/doc/README.WRITING_RST.rst @@ -46,7 +46,7 @@ of documentation: .. _varnishd(1): -* set link targets for important paramgraphs following the scheme +* set link targets for important paragraphs following the scheme ref-`doc`-`section`, for instance:: .. _ref-varnishd-opt_T: From phk at FreeBSD.org Mon Aug 19 12:47:15 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:15 +0000 (UTC) Subject: [master] d266a8076 spelling: parallel Message-ID: <20240819124715.96D40120CDE@lists.varnish-cache.org> commit d266a807685c6459cb77d818dacc13c41cc2ebf1 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: parallel Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 187617f34..fe5a5d204 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -4947,7 +4947,7 @@ varnishtest - add ``-l`` and ``-L`` switches which leave ``/tmp/vtc.*`` behind on error and unconditionally respectively. -- add ``-j`` parameter to run tests in parallell and use this by +- add ``-j`` parameter to run tests in parallel and use this by default. varnishtop From phk at FreeBSD.org Mon Aug 19 12:47:15 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:15 +0000 (UTC) Subject: [master] 90edfd9b3 spelling: parameter Message-ID: <20240819124715.B4FD7120CF1@lists.varnish-cache.org> commit 90edfd9b33eb6e109181368af67fdd277b20b621 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: parameter Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index fe5a5d204..abeb61f05 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -83,7 +83,7 @@ Varnish Cache NEXT (2024-09-15) Varnish Cache 7.5.0 (2024-03-18) ================================ -* Add ``h2_window_timeout`` paramater to mitigate CVE-2023-43622 (VSV00014_). +* Add ``h2_window_timeout`` parameter to mitigate CVE-2023-43622 (VSV00014_). * The parameters ``idle_send_timeout`` and ``timeout_idle`` are now limited to a maximum of 1 hour. From phk at FreeBSD.org Mon Aug 19 12:47:15 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:15 +0000 (UTC) Subject: [master] 00fff613c spelling: persistent Message-ID: <20240819124715.E3989120CFF@lists.varnish-cache.org> commit 00fff613c36de1fd54035ad7d6cf7b0d8c6257c5 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: persistent Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/firstdesign.rst b/doc/sphinx/phk/firstdesign.rst index c8e7b180e..c26e3ad87 100644 --- a/doc/sphinx/phk/firstdesign.rst +++ b/doc/sphinx/phk/firstdesign.rst @@ -315,7 +315,7 @@ where we kept thinking in the old frame of reference (ie: Squid):: The simplest storage method mmap(2)'s a disk or file and puts objects into the virtual memory on page aligned boundaries, - using a small struct for metadata. Data is not persistant + using a small struct for metadata. Data is not persistent across reboots. Object free is incredibly cheap. Object allocation should reuse recently freed space if at all possible. "First free hole" is probably a good allocation strategy. From phk at FreeBSD.org Mon Aug 19 12:47:16 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:16 +0000 (UTC) Subject: [master] f023a4313 spelling: personnel Message-ID: <20240819124716.0BF17120D15@lists.varnish-cache.org> commit f023a4313509f49d584b36e0da45f41ef0b4cf1f Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: personnel Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/barriers.rst b/doc/sphinx/phk/barriers.rst index 2c669fe80..6ed051c96 100644 --- a/doc/sphinx/phk/barriers.rst +++ b/doc/sphinx/phk/barriers.rst @@ -102,7 +102,7 @@ there is no reason to assume they are bugfree, so Varnish does not trust the Operator role, that is a pure one-way relationship. (Trick: If the Child process us run under user "nobody", you can -allow marginally trusted operations personel access to the "nobody" +allow marginally trusted operations personnel access to the "nobody" account (for instance using .ssh/authorized_keys2), and they will be able to kill the Child process, prompting the Manager process to restart it again with the same parameters and settings.) From phk at FreeBSD.org Mon Aug 19 12:47:16 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:16 +0000 (UTC) Subject: [master] fef8b3c22 spelling: pid Message-ID: <20240819124716.2BB91120D27@lists.varnish-cache.org> commit fef8b3c22526b63e147e491a4c0ad4ad996a76d3 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 18:41:39 2024 -0400 spelling: pid Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index abeb61f05..ca0ca29f6 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -5315,7 +5315,7 @@ varnishd - Align pointers in allocated objects. This will in theory make Varnish a tiny bit faster at the expense of slightly more memory usage. -- Ensure the master process process id is updated in the shared memory +- Ensure the master process PID is updated in the shared memory log file after we go into the background. - HEAD requests would be converted to GET requests too early, which From phk at FreeBSD.org Mon Aug 19 12:47:16 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:16 +0000 (UTC) Subject: [master] b8f801d6a spelling: pleasant Message-ID: <20240819124716.450B5120D39@lists.varnish-cache.org> commit b8f801d6a4434107d0e1a0454aecfdeea8f74310 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: pleasant Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/legacy.rst b/doc/sphinx/phk/legacy.rst index efb66ed31..9fd99765c 100644 --- a/doc/sphinx/phk/legacy.rst +++ b/doc/sphinx/phk/legacy.rst @@ -9,7 +9,7 @@ Legacy-.* ========= -In the middle of an otherwise pleaseant conversation recently, the +In the middle of an otherwise pleasant conversation recently, the other person suddenly burst out that *"Varnish was part of our legacy software."* From phk at FreeBSD.org Mon Aug 19 12:47:16 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:16 +0000 (UTC) Subject: [master] 1207ac1c8 spelling: privileges Message-ID: <20240819124716.5F6C4120D44@lists.varnish-cache.org> commit 1207ac1c85e6f6482b6df0d448cd76d959814da5 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: privileges Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/reference/vext.rst b/doc/sphinx/reference/vext.rst index 6570947d0..1b324b45e 100644 --- a/doc/sphinx/reference/vext.rst +++ b/doc/sphinx/reference/vext.rst @@ -10,7 +10,7 @@ VEXT - Varnish Extensions %%%%%%%%%%%%%%%%%%%%%%%%% A Varnish Extension is a shared library, loaded into the worker -process during startup, before privilges are dropped for good. This +process during startup, before privileges are dropped for good. This allows a VEXT to do pretty much anything it wants to do in the worker process. From phk at FreeBSD.org Mon Aug 19 12:47:16 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:16 +0000 (UTC) Subject: [master] 6ecabd110 spelling: productive Message-ID: <20240819124716.7A3AC120D5C@lists.varnish-cache.org> commit 6ecabd110628833c05f70abd2ead7ddaff9e3cfb Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: productive Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/vdd19q3.rst b/doc/sphinx/phk/vdd19q3.rst index 8bbe06f40..e6f640202 100644 --- a/doc/sphinx/phk/vdd19q3.rst +++ b/doc/sphinx/phk/vdd19q3.rst @@ -58,7 +58,7 @@ and we are moving the Monday afternoon bugwash from 13:00-14:00 EU time to 15:00-15:30 EU time, so they do not have to get out of bed so early. -We will also try to make the bugwash more producive, by having PHK +We will also try to make the bugwash more productive, by having PHK publish an "agenda" some hours beforehand, so people can prepare, and instead shorten the bugwash to 30 minutes to keep the time commitment the same. From phk at FreeBSD.org Mon Aug 19 12:47:16 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:16 +0000 (UTC) Subject: [master] d4197cf49 spelling: pursuing Message-ID: <20240819124716.90D37120D71@lists.varnish-cache.org> commit d4197cf4988ac50ce90d61f3efaa341e25a8ad17 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: pursuing Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/vdd19q3.rst b/doc/sphinx/phk/vdd19q3.rst index e6f640202..93bd9e375 100644 --- a/doc/sphinx/phk/vdd19q3.rst +++ b/doc/sphinx/phk/vdd19q3.rst @@ -45,7 +45,7 @@ do something about, from probes being near-magical to H1 to getting a proper handle on the lifetime of dynamic backends. Some concrete improvements came up during the hackathon and we will -be persuing those right away. +be pursuing those right away. Fixing probing is probably a V7 thing, and we need to think and prototype how we expose probing in VCL. From phk at FreeBSD.org Mon Aug 19 12:47:16 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:16 +0000 (UTC) Subject: [master] c94c9e402 spelling: recommendations Message-ID: <20240819124716.A91F1120D82@lists.varnish-cache.org> commit c94c9e4025ff0c991d2614400542736142c91b70 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: recommendations Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/whats-new/upgrading-7.2.rst b/doc/sphinx/whats-new/upgrading-7.2.rst index c7776efc5..16d86c32d 100644 --- a/doc/sphinx/whats-new/upgrading-7.2.rst +++ b/doc/sphinx/whats-new/upgrading-7.2.rst @@ -67,7 +67,7 @@ VMODs ===== Cookies generated by vmod_cookie used to have a trailing semi-colon that -goes against the recommandations from `rfc6265`_. This should not pose a +goes against the recommendations from `rfc6265`_. This should not pose a problem, unless a piece of VCL code or a backend have come to rely on this incorrect behavior. From phk at FreeBSD.org Mon Aug 19 12:47:16 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:16 +0000 (UTC) Subject: [master] b96a5ccaa spelling: repositories Message-ID: <20240819124716.C38DC120D91@lists.varnish-cache.org> commit b96a5ccaa621a7eee2c5fb26c599756ff2afb2e6 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: repositories Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/VSV00001.rst b/doc/sphinx/phk/VSV00001.rst index 3f26ccc77..60c275028 100644 --- a/doc/sphinx/phk/VSV00001.rst +++ b/doc/sphinx/phk/VSV00001.rst @@ -27,7 +27,7 @@ VWV - Vulnerability Workaround in VCL Rolling a new Varnish release, even with an trivial one-line patch is not a fast operation, getting from patch to packages rolled and -pushed into operating system respositories takes at least several +pushed into operating system repositories takes at least several days, provided you can get everybody's attention. Being able to offer users a way to mitigate security issues in VCL From phk at FreeBSD.org Mon Aug 19 12:47:16 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:16 +0000 (UTC) Subject: [master] 2951446d7 spelling: requests Message-ID: <20240819124716.E7DC7120DA1@lists.varnish-cache.org> commit 2951446d7f9be2fafd038d37812b5411676ede3c Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: requests Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index ca0ca29f6..469b31edf 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -3442,7 +3442,7 @@ Bugs fixed vsl_buffer is increased * 2010_ - varnishadm CLI behaving weirdly * 2017_ - varnishncsa docfix: "%r" field is wrong -* 2107_ - (docfix) HEAD requestes changed to GET +* 2107_ - (docfix) HEAD requests changed to GET .. _1830: https://github.com/varnishcache/varnish-cache/issues/1830 .. _2010: https://github.com/varnishcache/varnish-cache/issues/2010 From phk at FreeBSD.org Mon Aug 19 12:47:17 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:17 +0000 (UTC) Subject: [master] 307b9048b spelling: resource Message-ID: <20240819124717.0734A120DAD@lists.varnish-cache.org> commit 307b9048b27aee2cf9172ec0d3e459f3efc9aac9 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: resource Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/reference/vcl_var.rst b/doc/sphinx/reference/vcl_var.rst index e2f9cdb1b..b277150e9 100644 --- a/doc/sphinx/reference/vcl_var.rst +++ b/doc/sphinx/reference/vcl_var.rst @@ -321,7 +321,7 @@ req.hash_ignore_vary This returns the very first match regardless of the object compatibility with the client request. This is useful when variants are irrelevant to certain clients, and differences - in the way the resouce is presented don't change how the + in the way the resource is presented don't change how the client will interpret it. Use with caution. From phk at FreeBSD.org Mon Aug 19 12:47:17 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:17 +0000 (UTC) Subject: [master] 9a5113cda spelling: respectively Message-ID: <20240819124717.23872120DB8@lists.varnish-cache.org> commit 9a5113cdaa608ac6f056c2945bfa889900385a02 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: respectively Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 469b31edf..0635c2dae 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -2171,7 +2171,7 @@ C APIs (for vmod and utility authors) * from ``func_``\ `class` to `vmodname`\ ``.``\ `class`\ ``.``\ `method` for methods, - repsectively. In short, the anchor is now named equal to VCL syntax + respectively. In short, the anchor is now named equal to VCL syntax for constructors and functions and similarly to VCL syntax for methods. * VRT API has been updated to 9.0 From phk at FreeBSD.org Mon Aug 19 12:47:17 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:17 +0000 (UTC) Subject: [master] f6dd0841e spelling: scratching Message-ID: <20240819124717.3F125120DC5@lists.varnish-cache.org> commit f6dd0841efde509c175906e02ddcdc5485c0ddca Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: scratching Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/thatslow.rst b/doc/sphinx/phk/thatslow.rst index 8923a8bc8..db148c559 100644 --- a/doc/sphinx/phk/thatslow.rst +++ b/doc/sphinx/phk/thatslow.rst @@ -137,7 +137,7 @@ impossible to measure program quality, even though we tend to know it when we see it. There are also uncountable events which should be in the ledger, -503s [#f9]_, crashes, hair-tearing, head-scrathing, coffee-drinking, +503s [#f9]_, crashes, hair-tearing, head-scratching, coffee-drinking, manual- and source-code thumbing and frustrated cries of help on IRC. In the other cup there are equally intangible positives, pats on From phk at FreeBSD.org Mon Aug 19 12:47:17 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:17 +0000 (UTC) Subject: [master] 47f4f4de0 spelling: several Message-ID: <20240819124717.60763120DDE@lists.varnish-cache.org> commit 47f4f4de0d32ef6e6d2b75e4cdd2c92e11f57758 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: several Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 0635c2dae..42158229e 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -5104,7 +5104,7 @@ varnishd - Make new-purge not touch busy objects. This fixes a potential crash when calling VRT\_purge. -- If there are everal grace-able objects, pick the least expired one. +- If there are several grace-able objects, pick the least expired one. - Fix an issue with varnishadm -T :6082 shorthand. From phk at FreeBSD.org Mon Aug 19 12:47:17 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:17 +0000 (UTC) Subject: [master] 65d828d6b spelling: silliness Message-ID: <20240819124717.7B13D120DE9@lists.varnish-cache.org> commit 65d828d6b5599746a40b719fcbae07da5a71eddb Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 09:11:13 2024 -0400 spelling: silliness Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/thetoolsweworkwith.rst b/doc/sphinx/phk/thetoolsweworkwith.rst index 5ed32a7f2..b763c8b3c 100644 --- a/doc/sphinx/phk/thetoolsweworkwith.rst +++ b/doc/sphinx/phk/thetoolsweworkwith.rst @@ -46,7 +46,7 @@ ISO-C standardisation working-group 14. I won't claim that it is enough to make grown men cry, but it certainly was enough to make me angry. -Let me give you an example of their utter sillyness: +Let me give you an example of their utter silliness: The book which defined the C langauge had a list af reserved identifiers, all of them lower-case words. The UNIX libraries From phk at FreeBSD.org Mon Aug 19 12:47:17 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:17 +0000 (UTC) Subject: [master] 751506cfc spelling: somebody's Message-ID: <20240819124717.96185120E04@lists.varnish-cache.org> commit 751506cfc1c934cf4e2a43a42a43918f53ad1b4d Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: somebody's Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/firstdesign.rst b/doc/sphinx/phk/firstdesign.rst index c26e3ad87..32efae1b1 100644 --- a/doc/sphinx/phk/firstdesign.rst +++ b/doc/sphinx/phk/firstdesign.rst @@ -61,7 +61,7 @@ where we kept thinking in the old frame of reference (ie: Squid):: The first (layer of) Varnish ---------------------------- - Somebodys webserver is struggling and they decide to try Varnish. + Somebody's webserver is struggling and they decide to try Varnish. Often this will be a skunkworks operation with some random PC purloined from wherever it wasn't being used and the Varnish "HOWTO" From phk at FreeBSD.org Mon Aug 19 12:47:17 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:17 +0000 (UTC) Subject: [master] e2b25150c spelling: structured Message-ID: <20240819124717.B0CD6120E16@lists.varnish-cache.org> commit e2b25150cb50f4ce89c3164894fcf5429291f2be Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: structured Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/firstdesign.rst b/doc/sphinx/phk/firstdesign.rst index 32efae1b1..09726d5b5 100644 --- a/doc/sphinx/phk/firstdesign.rst +++ b/doc/sphinx/phk/firstdesign.rst @@ -99,7 +99,7 @@ where we kept thinking in the old frame of reference (ie: Squid):: A text, curses or HTML based facility to give some instant feedback and stats is necessary. - If circumstances are not conductive to strucured approach, it should + If circumstances are not conductive to structured approach, it should be possible to repeat this process and set up N independent Varnish boxes and get some sort of relief without having to read any further documentation. From phk at FreeBSD.org Mon Aug 19 12:47:17 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:17 +0000 (UTC) Subject: [master] a48ba0583 spelling: suppress Message-ID: <20240819124717.CB1D1120E1E@lists.varnish-cache.org> commit a48ba05833a6d338263de92023f854ec7a053077 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: suppress Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/ipv6suckage.rst b/doc/sphinx/phk/ipv6suckage.rst index cf77f299e..d57d9fbf7 100644 --- a/doc/sphinx/phk/ipv6suckage.rst +++ b/doc/sphinx/phk/ipv6suckage.rst @@ -20,7 +20,7 @@ IPv6 by now, is accusing the pope of being religious. IPv4 addresses in numeric form, are written as 192.168.0.1 and to not confuse IPv6 with IPv4, it was decided in RFC1884 that IPv6 would use colons and groups of 16 bits, and because 128 bits are a -lot of bits, the secret '::' trick was introduced, to supress all +lot of bits, the secret '::' trick was introduced, to suppress all the zero bits that we may not ever need anyway: 1080::8:800:200C:417A Colon was chosen because it was already used in MAC/ethernet addresses From phk at FreeBSD.org Mon Aug 19 12:47:17 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:17 +0000 (UTC) Subject: [master] d168f9334 spelling: susceptible Message-ID: <20240819124717.EA7D0120E2A@lists.varnish-cache.org> commit d168f933449fc0b4ae42090e37f80ce9259f4403 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: susceptible Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 42158229e..4d0566ae5 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -5610,7 +5610,7 @@ varnishd - Various fixes which makes Varnish compile and work on AIX. - Turn on TCP\_DEFER\_ACCEPT on Linux. This should make us less - suspecible to denial of service attacks as well as give us slightly + susceptible to denial of service attacks as well as give us slightly better performance. - Add an .initial property to the backend probe specification. This is From phk at FreeBSD.org Mon Aug 19 12:47:18 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:18 +0000 (UTC) Subject: [master] 0776f48dc spelling: synchronization Message-ID: <20240819124718.17CAE120E3E@lists.varnish-cache.org> commit 0776f48dc25261f24dd00aad69a72e3e68a2f3c8 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: synchronization Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 4d0566ae5..5cac31733 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -3517,7 +3517,7 @@ Varnish Cache 4.1.3-beta1 (2016-06-15) * Add support for TCP Fast Open where available. Disabled by default. -* [varnishtest] New syncronization primitive barriers added, improving +* [varnishtest] New synchronization primitive barriers added, improving coordination when test cases call external programs. .. _1905: https://github.com/varnishcache/varnish-cache/pull/1905 From phk at FreeBSD.org Mon Aug 19 12:47:18 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:18 +0000 (UTC) Subject: [master] d0f5e3d01 spelling: the Message-ID: <20240819124718.34FE7120E4E@lists.varnish-cache.org> commit d0f5e3d012af54b715eb79ec7cef06635165db5b Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:01 2024 -0400 spelling: the Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 5cac31733..97cf10ec8 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -2848,7 +2848,7 @@ Varnish Cache 5.2-RC1 (2017-09-04) Usage ----- -* The default for the the -i argument is now the hostname as returned +* The default for the -i argument is now the hostname as returned by gethostname(3) * Where possible (on platforms with setproctitle(3)), the -i argument diff --git a/doc/sphinx/reference/varnishd.rst b/doc/sphinx/reference/varnishd.rst index 9132b3bea..24c25334d 100644 --- a/doc/sphinx/reference/varnishd.rst +++ b/doc/sphinx/reference/varnishd.rst @@ -218,7 +218,7 @@ Operations options -I clifile Execute the management commands in the file given as ``clifile`` - before the the worker process starts, see `CLI Command File`_. + before the worker process starts, see `CLI Command File`_. Tuning options -------------- diff --git a/doc/sphinx/whats-new/upgrading-4.0.rst b/doc/sphinx/whats-new/upgrading-4.0.rst index f97a28afb..f5173d140 100644 --- a/doc/sphinx/whats-new/upgrading-4.0.rst +++ b/doc/sphinx/whats-new/upgrading-4.0.rst @@ -100,7 +100,7 @@ The synthetic keyword is now a function:: obj in vcl_error replaced by beresp in vcl_backend_error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -To better represent a the context in which it is called, you +To better represent the context in which it is called, you should now use `beresp.*` vcl_backend_error, where you used to use `obj.*` in `vcl_error`. From phk at FreeBSD.org Mon Aug 19 12:47:18 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:18 +0000 (UTC) Subject: [master] 92b508e0c spelling: then Message-ID: <20240819124718.5038E120E5B@lists.varnish-cache.org> commit 92b508e0c50a4ded9efcd236dee5b92917b4ed7b Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: then Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/whats-new/upgrading-6.1.rst b/doc/sphinx/whats-new/upgrading-6.1.rst index fe2672d7e..cd2434085 100644 --- a/doc/sphinx/whats-new/upgrading-6.1.rst +++ b/doc/sphinx/whats-new/upgrading-6.1.rst @@ -174,7 +174,7 @@ Other changes * If you have set ``.proxy_header=1`` (to use the PROXYv1 protocol) for a backend addressed as a Unix domain socket (with a ``.path`` setting for the socket file), and have also defined a probe for - the backend, then then the address family ``UNKNOWN`` is sent in + the backend, then the address family ``UNKNOWN`` is sent in the proxy header for the probe request. If you have set ``.proxy_header=2`` (for PROXYv2) for a UDS backend with a probe, then ``PROXY LOCAL`` is sent for the probe request. From phk at FreeBSD.org Mon Aug 19 12:47:18 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:18 +0000 (UTC) Subject: [master] 2f9293201 spelling: together Message-ID: <20240819124718.69E36120E69@lists.varnish-cache.org> commit 2f92932011c4c5fef0f4dfaeffb1dad4e0975437 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: together Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/somethinghappened.rst b/doc/sphinx/phk/somethinghappened.rst index ba7a4418d..5fa6b9959 100644 --- a/doc/sphinx/phk/somethinghappened.rst +++ b/doc/sphinx/phk/somethinghappened.rst @@ -78,7 +78,7 @@ from our users for another half year, for no particular reason. So yeah, it was pretty embarrassing to have to amend our 5.1 release twice in two weeks, but it did prove that the "release by calendar" strategy is right for our project: It forced us to get our s**t -toggether so users can benefit from the work we do in a timely +together so users can benefit from the work we do in a timely fashion. And thanks to the heroic testing efforts of Simon and Xcir, you may From phk at FreeBSD.org Mon Aug 19 12:47:18 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:18 +0000 (UTC) Subject: [master] a93ba7592 spelling: top Message-ID: <20240819124718.8605F120E72@lists.varnish-cache.org> commit a93ba7592f0728ce97ea44b5c5a9982fa5f5b186 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: top Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/conf.py.in b/doc/sphinx/conf.py.in index a0bb5d40b..4984b660b 100644 --- a/doc/sphinx/conf.py.in +++ b/doc/sphinx/conf.py.in @@ -102,7 +102,7 @@ else: # further. For a list of options available for each theme, see the # documentation. # -# topp background: #437EB2 +# top background: #437EB2 # left column: #EEEEEE; # h3: #222222; # color: #222222; From phk at FreeBSD.org Mon Aug 19 12:47:18 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:18 +0000 (UTC) Subject: [master] d7687f0e2 spelling: traffic Message-ID: <20240819124718.A7204120E84@lists.varnish-cache.org> commit d7687f0e2ff597179f66f1a355e0f8e17fec3370 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: traffic Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 97cf10ec8..49edc8f1f 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -1259,7 +1259,7 @@ Varnish Cache 6.6.0 (2021-03-15) ``req.is_hitmiss`` on the client side. * The ``set_ip_tos()`` function from the bundled ``std`` vmod now sets - the IPv6 Taffic Class (TCLASS) when used on an IPv6 connection. + the IPv6 Traffic Class (TCLASS) when used on an IPv6 connection. * A bug has been fixed which could lead to varnish failing to start after updates due to outdated content of the ``vmod_cache`` diff --git a/doc/sphinx/whats-new/changes-6.6.rst b/doc/sphinx/whats-new/changes-6.6.rst index 1505f63bb..4dba423a3 100644 --- a/doc/sphinx/whats-new/changes-6.6.rst +++ b/doc/sphinx/whats-new/changes-6.6.rst @@ -174,7 +174,7 @@ VMODs ~~~~~~~~~~~~~~~~~~~~ The ``set_ip_tos()`` function from the bundled ``std`` vmod now sets -the IPv6 Taffic Class (TCLASS) when used on an IPv6 connection. +the IPv6 Traffic Class (TCLASS) when used on an IPv6 connection. .. _whatsnew_changes_6.6_ban: From phk at FreeBSD.org Mon Aug 19 12:47:18 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:18 +0000 (UTC) Subject: [master] d275421f1 spelling: transaction Message-ID: <20240819124718.E2FA6120E9C@lists.varnish-cache.org> commit d275421f1895a1789a42d5949feb008f1349f220 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: transaction Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/reference/vsl-query.rst b/doc/sphinx/reference/vsl-query.rst index 4bfd3f348..68b1285b3 100644 --- a/doc/sphinx/reference/vsl-query.rst +++ b/doc/sphinx/reference/vsl-query.rst @@ -131,7 +131,7 @@ itself rather than log records belonging to the transaction. :: vxid -A ``vxid`` query allows you to directly target a specific transacion, +A ``vxid`` query allows you to directly target a specific transaction, whose id can be obtained from an ``X-Varnish`` HTTP header, the default "guru meditation" error page, or ``Begin`` and ``Link`` log records. From phk at FreeBSD.org Mon Aug 19 12:47:19 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:19 +0000 (UTC) Subject: [master] 89a01d8cd spelling: triples Message-ID: <20240819124719.071AF120EA0@lists.varnish-cache.org> commit 89a01d8cd6f92176d0179748f64e724382218607 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: triples Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/apispaces.rst b/doc/sphinx/phk/apispaces.rst index e71eb2928..23d04aa4b 100644 --- a/doc/sphinx/phk/apispaces.rst +++ b/doc/sphinx/phk/apispaces.rst @@ -50,7 +50,7 @@ our flat namespace and our include files. Frederick P. Brooks points out in his classic "The Mythical Man-Month", that is the difference between a program-product and a programming-product, -and he makes the case that the effort required tripples, going from +and he makes the case that the effort required triples, going from the former to the latter. Having spent some weeks on what I thought would be a three day task From phk at FreeBSD.org Mon Aug 19 12:47:19 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:19 +0000 (UTC) Subject: [master] 113092163 spelling: trivial Message-ID: <20240819124719.22D01120EB1@lists.varnish-cache.org> commit 1130921638346331ce4fa7c3b2a72e928de670c3 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: trivial Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/firstdesign.rst b/doc/sphinx/phk/firstdesign.rst index 09726d5b5..f46ccdecf 100644 --- a/doc/sphinx/phk/firstdesign.rst +++ b/doc/sphinx/phk/firstdesign.rst @@ -323,7 +323,7 @@ where we kept thinking in the old frame of reference (ie: Squid):: can be used by making a 1-file filesystem on them. More complex storage methods are object per file and object - in database models. They are relatively trival and well + in database models. They are relatively trivial and well understood. May offer persistence. Read-Only storage methods may make sense for getting hold From phk at FreeBSD.org Mon Aug 19 12:47:19 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:19 +0000 (UTC) Subject: [master] 8149df5f4 spelling: ugliness Message-ID: <20240819124719.3C44F120EBC@lists.varnish-cache.org> commit 8149df5f457f917771f12091b27cdd6980c1f347 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: ugliness Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/cheri6.rst b/doc/sphinx/phk/cheri6.rst index 6c52b9621..a34793e53 100644 --- a/doc/sphinx/phk/cheri6.rst +++ b/doc/sphinx/phk/cheri6.rst @@ -9,7 +9,7 @@ Varnish Socket Addresses Socket addresses are a bit of a mess, in particular because nobody dared shake up all the IPv4 legacy code when IPv6 was introduced. -In varnish we encapsulate all that uglyness in a ``struct suckaddr``, +In varnish we encapsulate all that ugliness in a ``struct suckaddr``, so named because it sucks that we have to spend time and code on this. In a case like this, it makes sense to make the internals strictly From phk at FreeBSD.org Mon Aug 19 12:47:19 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:19 +0000 (UTC) Subject: [master] 11b23e73f spelling: uncacheable Message-ID: <20240819124719.63401120EC6@lists.varnish-cache.org> commit 11b23e73f6f5a83d098c2229580a61c024f77047 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 09:13:17 2024 -0400 spelling: uncacheable Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/users-guide/increasing-your-hitrate.rst b/doc/sphinx/users-guide/increasing-your-hitrate.rst index 00336e99b..72fd2f544 100644 --- a/doc/sphinx/users-guide/increasing-your-hitrate.rst +++ b/doc/sphinx/users-guide/increasing-your-hitrate.rst @@ -524,7 +524,7 @@ on. When a request is passed, this can be recognized in the ``vcl_backend_*`` subroutines by the fact that ``bereq.uncacheable`` -and ``beresp.uncachable`` are both true. The backend response will not +and ``beresp.uncacheable`` are both true. The backend response will not be cached, even if it fulfills conditions that otherwise would allow it, for example if ``Cache-Control`` sets a positive TTL. From phk at FreeBSD.org Mon Aug 19 12:47:19 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:19 +0000 (UTC) Subject: [master] 6d3cb380a spelling: unintentionally Message-ID: <20240819124719.84E47120ED7@lists.varnish-cache.org> commit 6d3cb380acd721567626015b0e97a36849509ed1 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: unintentionally Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/README.WRITING_RST.rst b/doc/README.WRITING_RST.rst index 5bb846a69..0df908231 100644 --- a/doc/README.WRITING_RST.rst +++ b/doc/README.WRITING_RST.rst @@ -75,7 +75,7 @@ Document Structure While RST supports a great deal of flexibility for adornments of titles and section headers, we should adhere to a consistent style to -avoid breaking the document structure unintentially. +avoid breaking the document structure unintentionally. Within the Varnish-Cache project, we should use these characters: From phk at FreeBSD.org Mon Aug 19 12:47:19 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:19 +0000 (UTC) Subject: [master] aba90542c spelling: unsettable Message-ID: <20240819124719.B644D120EE6@lists.varnish-cache.org> commit aba90542c488a341e194c67f8a2148e9f0b59b6c Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 09:14:01 2024 -0400 spelling: unsettable Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/reference/vcl_var.rst b/doc/sphinx/reference/vcl_var.rst index b277150e9..e895753b2 100644 --- a/doc/sphinx/reference/vcl_var.rst +++ b/doc/sphinx/reference/vcl_var.rst @@ -337,7 +337,7 @@ req.http.* Writable from: client - Unsetable from: client + Unsettable from: client The headers of request, things like ``req.http.date``. @@ -652,7 +652,7 @@ bereq.between_bytes_timeout Writable from: backend - Unsetable from: vcl_pipe, backend + Unsettable from: vcl_pipe, backend Default: ``.between_bytes_timeout`` attribute from the :ref:`backend_definition`, which defaults to the @@ -668,7 +668,7 @@ bereq.body Type: BODY - Unsetable from: vcl_backend_fetch + Unsettable from: vcl_backend_fetch The request body. @@ -684,7 +684,7 @@ bereq.connect_timeout Writable from: vcl_pipe, backend - Unsetable from: vcl_pipe, backend + Unsettable from: vcl_pipe, backend Default: ``.connect_timeout`` attribute from the :ref:`backend_definition`, which defaults to the @@ -704,7 +704,7 @@ bereq.first_byte_timeout Writable from: backend - Unsetable from: vcl_pipe, backend + Unsettable from: vcl_pipe, backend Default: ``.first_byte_timeout`` attribute from the :ref:`backend_definition`, which defaults to the @@ -735,7 +735,7 @@ bereq.http.* Writable from: vcl_pipe, backend - Unsetable from: vcl_pipe, backend + Unsettable from: vcl_pipe, backend The headers to be sent to the backend. @@ -856,7 +856,7 @@ bereq.task_deadline Writable from: vcl_pipe - Unsetable from: vcl_pipe + Unsettable from: vcl_pipe Deadline for pipe sessions, defaults ``0s``, which falls back to the ``pipe_task_deadline`` parameter, see :ref:`varnishd(1)` @@ -1175,7 +1175,7 @@ beresp.http.* Writable from: vcl_backend_response, vcl_backend_error - Unsetable from: vcl_backend_response, vcl_backend_error + Unsettable from: vcl_backend_response, vcl_backend_error The HTTP headers returned from the server. @@ -1625,7 +1625,7 @@ resp.http.* Writable from: vcl_deliver, vcl_synth - Unsetable from: vcl_deliver, vcl_synth + Unsettable from: vcl_deliver, vcl_synth The HTTP headers that will be returned. @@ -1787,7 +1787,7 @@ sess.idle_send_timeout Writable from: client - Unsetable from: client + Unsettable from: client Send timeout for individual pieces of data on client connections, defaults to the ``idle_send_timeout`` parameter, @@ -1804,7 +1804,7 @@ sess.send_timeout Writable from: client - Unsetable from: client + Unsettable from: client Total timeout for ordinary HTTP1 responses, defaults to the ``send_timeout`` parameter, see :ref:`varnishd(1)` @@ -1820,7 +1820,7 @@ sess.timeout_idle Writable from: client - Unsetable from: client + Unsettable from: client Idle timeout for this session, defaults to the ``timeout_idle`` parameter, see :ref:`varnishd(1)` @@ -1836,7 +1836,7 @@ sess.timeout_linger Writable from: client - Unsetable from: client + Unsettable from: client Linger timeout for this session, defaults to the ``timeout_linger`` parameter, see :ref:`varnishd(1)` From phk at FreeBSD.org Mon Aug 19 12:47:19 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:19 +0000 (UTC) Subject: [master] 692bdfbc7 spelling: voluntarily Message-ID: <20240819124719.DA6CE120EF5@lists.varnish-cache.org> commit 692bdfbc75bfa335ea6332a6faead6ef38adb1cb Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: voluntarily Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/trialerror.rst b/doc/sphinx/phk/trialerror.rst index 94eb2fea9..7ab50660f 100644 --- a/doc/sphinx/phk/trialerror.rst +++ b/doc/sphinx/phk/trialerror.rst @@ -71,7 +71,7 @@ program-test-framework-cloud-thingies, and they're fine up to a point, but they are inadequate tools for me in too many ways. Jenkins is written in Java, which is not something I want to inflict -on computers volutarily, in particular not on computers people lend +on computers voluntarily, in particular not on computers people lend us to test varnish on. Travis is Linux only, which is fine if you run Linux only, but I don't. From phk at FreeBSD.org Mon Aug 19 12:47:19 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:19 +0000 (UTC) Subject: [master] 6fad92caa spelling: where Message-ID: <20240819124720.1446F120F04@lists.varnish-cache.org> commit 6fad92caa3c5fd137f2778529a3ba215e7953031 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: where Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/http20.rst b/doc/sphinx/phk/http20.rst index 9c0cd7caa..3bca19955 100644 --- a/doc/sphinx/phk/http20.rst +++ b/doc/sphinx/phk/http20.rst @@ -105,7 +105,7 @@ seeing cookies being crypto-signed, to prevent forgeries. The term "bass ackwards" comes to mind. Cookies are also one of the main wasters of bandwidth, disabling -caching by default, sending lots of cookies were they are not +caching by default, sending lots of cookies where they are not needed, which made many sites register separate domains for image content, to "save" bandwidth by avoiding cookies. From phk at FreeBSD.org Mon Aug 19 12:47:20 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:20 +0000 (UTC) Subject: [master] 989b315bf spelling: workaround Message-ID: <20240819124720.3E36D120F0F@lists.varnish-cache.org> commit 989b315bf91af2b548856e3589ef754c2d52d30b Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:03 2024 -0400 spelling: workaround Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am index 58e680ff0..b120649fe 100644 --- a/doc/sphinx/Makefile.am +++ b/doc/sphinx/Makefile.am @@ -30,7 +30,7 @@ link_srcdir: graphviz conf.py $(BUILT_SOURCES) done \ fi -# work around for make html called within doc/sphinx +# workaround for make html called within doc/sphinx .PHONY: graphviz graphviz: cd ../graphviz && $(MAKE) html From phk at FreeBSD.org Mon Aug 19 12:47:20 2024 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Mon, 19 Aug 2024 12:47:20 +0000 (UTC) Subject: [master] d29dbda13 spelling: workspace Message-ID: <20240819124720.5C251120F25@lists.varnish-cache.org> commit d29dbda13bcba53b1ff1cc6ce67871614469c529 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:03 2024 -0400 spelling: workspace Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/changes.rst b/doc/changes.rst index 49edc8f1f..788160c50 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -1072,7 +1072,7 @@ Varnish Cache 7.0.0 (2021-09-15) * New feature checks in ``varnishtest``: ``sanitizer``, ``asan``, ``lsan``, ``msan``, ``ubsan`` and ``coverage``. -* New ``--enable-workspace-emulator`` configure flag to swap the worksapce +* New ``--enable-workspace-emulator`` configure flag to swap the workspace implementation with a sparse one ideal for fuzzing (3644_). * Strict comparison of items from the HTTP grammar (3650_). @@ -1853,7 +1853,7 @@ Varnish Cache 6.4.0 (2020-03-16) * Add vi-stype CTRL-f / CTRL-b for page down/up to interactive varnishstat -* Fixed wrong handling of an out-of-workspae condition in the proxy +* Fixed wrong handling of an out-of-workspace condition in the proxy vmod and in the workspace allocator, bug 3131_ * Raised the minimum for the ``vcl_cooldown`` parameter to 1s to fix From nils.goroll at uplex.de Mon Aug 19 13:42:04 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Mon, 19 Aug 2024 13:42:04 +0000 (UTC) Subject: [master] a8b3a8b81 Emit a warning if mlock() of VSM fails Message-ID: <20240819134204.EA5DA106FCC@lists.varnish-cache.org> commit a8b3a8b812acc4eae5f30222bd5f80e7ad7bf6e4 Author: Nils Goroll Date: Mon Aug 12 16:01:57 2024 +0200 Emit a warning if mlock() of VSM fails diff --git a/bin/varnishd/common/common_vsmw.c b/bin/varnishd/common/common_vsmw.c index 1e0710996..3a9aeb001 100644 --- a/bin/varnishd/common/common_vsmw.c +++ b/bin/varnishd/common/common_vsmw.c @@ -278,6 +278,7 @@ static struct vsmw_cluster * vsmw_newcluster(struct vsmw *vsmw, size_t len, const char *pfx) { struct vsmw_cluster *vc; + static int warn = 0; int fd; size_t ps; @@ -307,7 +308,10 @@ vsmw_newcluster(struct vsmw *vsmw, size_t len, const char *pfx) closefd(&fd); assert(vc->ptr != MAP_FAILED); - (void)mlock(vc->ptr, len); + if (mlock(vc->ptr, len) && warn++ == 0) { + fprintf(stderr, "Warning: mlock() of VSM failed: %s (%d)\n", + VAS_errtxt(errno), errno); + } return (vc); } From nils.goroll at uplex.de Mon Aug 19 14:26:05 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Mon, 19 Aug 2024 14:26:05 +0000 (UTC) Subject: [master] fa5e46fb6 vcp: Only generate required RB-tree functions Message-ID: <20240819142605.7F45C108C92@lists.varnish-cache.org> commit fa5e46fb62fa0d42e26c7afbb47b9c9c781dff85 Author: Nils Goroll Date: Mon Aug 19 16:24:18 2024 +0200 vcp: Only generate required RB-tree functions Should address flexelint and SunCC complaints Ref 3efb24ea66052c8387a32901d92c8386dfe399e1 diff --git a/bin/varnishd/cache/cache_conn_pool.c b/bin/varnishd/cache/cache_conn_pool.c index 5bfda524b..76e36040d 100644 --- a/bin/varnishd/cache/cache_conn_pool.c +++ b/bin/varnishd/cache/cache_conn_pool.c @@ -108,7 +108,12 @@ struct conn_pool { static struct lock conn_pools_mtx; static VRBT_HEAD(vrb, conn_pool) conn_pools = VRBT_INITIALIZER(&conn_pools); -VRBT_GENERATE_STATIC(vrb, conn_pool, entry, vcp_cmp); +VRBT_GENERATE_REMOVE_COLOR(vrb, conn_pool, entry, static) +VRBT_GENERATE_REMOVE(vrb, conn_pool, entry, static) +VRBT_GENERATE_FIND(vrb, conn_pool, entry, vcp_cmp, static) +VRBT_GENERATE_INSERT_COLOR(vrb, conn_pool, entry, static) +VRBT_GENERATE_INSERT_FINISH(vrb, conn_pool, entry, static) +VRBT_GENERATE_INSERT(vrb, conn_pool, entry, vcp_cmp, static) /*-------------------------------------------------------------------- */ From nils.goroll at uplex.de Mon Aug 19 14:47:05 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Mon, 19 Aug 2024 14:47:05 +0000 (UTC) Subject: [master] 7367d302b Flexelint Message-ID: <20240819144705.3AFDF1098F7@lists.varnish-cache.org> commit 7367d302be79671776bcc1dd1b9468401ac82112 Author: Nils Goroll Date: Mon Aug 19 16:45:05 2024 +0200 Flexelint Ref e46f97278f1036f4e648dd64d3f34ada8d29f64a Info 775: non-negative quantity cannot be less than zero diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c index fe10c21a8..bd60f4e0d 100644 --- a/bin/varnishd/cache/cache_backend.c +++ b/bin/varnishd/cache/cache_backend.c @@ -158,7 +158,7 @@ VBE_connwait_signal_all(const struct backend *bp) FIND_BE_PARAM(backend_wait_limit, wait_limit, bp); FIND_BE_TMO(backend_wait_timeout, wait_tmod, bp); - if (wait_limit <= 0 || wait_tmod <= 0) + if (wait_limit == 0 || wait_tmod <= 0) return; Lck_Lock(bp->director->mtx); From nils.goroll at uplex.de Mon Aug 19 14:47:05 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Mon, 19 Aug 2024 14:47:05 +0000 (UTC) Subject: [master] a643a29d4 Flexelint inline declaration Message-ID: <20240819144705.51ADB1098FB@lists.varnish-cache.org> commit a643a29d4215ba53e0a96f812caac67f3586fc72 Author: Nils Goroll Date: Mon Aug 19 16:46:11 2024 +0200 Flexelint inline declaration Info 1727: inline 'vcp_cmp(const struct conn_pool *, const struct conn_pool *)' not previously defined inline at (line 52) Ref 3efb24ea66052c8387a32901d92c8386dfe399e1 diff --git a/bin/varnishd/cache/cache_conn_pool.c b/bin/varnishd/cache/cache_conn_pool.c index 76e36040d..b865c3f94 100644 --- a/bin/varnishd/cache/cache_conn_pool.c +++ b/bin/varnishd/cache/cache_conn_pool.c @@ -49,7 +49,7 @@ #include "cache_pool.h" struct conn_pool; -static int vcp_cmp(const struct conn_pool *a, const struct conn_pool *b); +static inline int vcp_cmp(const struct conn_pool *a, const struct conn_pool *b); /*-------------------------------------------------------------------- */ From nils.goroll at uplex.de Tue Aug 20 08:44:07 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Tue, 20 Aug 2024 08:44:07 +0000 (UTC) Subject: [master] e034ec823 spelling: catastrophe Message-ID: <20240820084407.DC5EE10D2EC@lists.varnish-cache.org> commit e034ec8234a45d42d047f16c2d9542fb72d180f7 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Mon Aug 19 12:11:25 2024 -0400 spelling: catastrophe Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/storage/storage_malloc.c b/bin/varnishd/storage/storage_malloc.c index 7e7a7b8ac..8e245ef17 100644 --- a/bin/varnishd/storage/storage_malloc.c +++ b/bin/varnishd/storage/storage_malloc.c @@ -94,7 +94,7 @@ sma_alloc(const struct stevedore *st, size_t size) /* * Do not collapse the sma allocation with sma->s.ptr: it is not * a good idea. Not only would it make ->trim impossible, - * performance-wise it would be a catastropy with chunksized + * performance-wise it would be a catastrophe with chunksized * allocations growing another full page, just to accommodate the sma. */ diff --git a/bin/varnishd/storage/storage_umem.c b/bin/varnishd/storage/storage_umem.c index 6d3402246..b1dbdbba2 100644 --- a/bin/varnishd/storage/storage_umem.c +++ b/bin/varnishd/storage/storage_umem.c @@ -170,7 +170,7 @@ smu_alloc(const struct stevedore *st, size_t size) /* * Do not collapse the smu allocation with smu->s.ptr: it is not * a good idea. Not only would it make ->trim impossible, - * performance-wise it would be a catastropy with chunksized + * performance-wise it would be a catastrophe with chunksized * allocations growing another full page, just to accommodate the smu. */ From nils.goroll at uplex.de Tue Aug 20 08:44:07 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Tue, 20 Aug 2024 08:44:07 +0000 (UTC) Subject: [master] 48fcdfe3a spelling: crlf Message-ID: <20240820084408.015F610D2EF@lists.varnish-cache.org> commit 48fcdfe3a0faa8f8f3e89da7e49bb6edbb479a51 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Mon Aug 19 11:23:57 2024 -0400 spelling: crlf Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/reference/vcl-probe.rst b/doc/sphinx/reference/vcl-probe.rst index d53d2e265..858affe96 100644 --- a/doc/sphinx/reference/vcl-probe.rst +++ b/doc/sphinx/reference/vcl-probe.rst @@ -82,8 +82,8 @@ Can be used to specify a full HTTP/1.1 request to be sent:: "X-Magic: We're fine with this." "Connection: close"; -Each of the strings will have ``CRNL`` appended and a final HTTP -header block terminating ``CRNL`` will be appended as well. +Each of the strings will have ``CRLF`` appended and a final HTTP +header block terminating ``CRLF`` will be appended as well. Because connection shutdown is part of the health check, ``Connection: close`` is mandatory. From nils.goroll at uplex.de Tue Aug 20 08:44:08 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Tue, 20 Aug 2024 08:44:08 +0000 (UTC) Subject: [master] f3f41ede4 spelling: github Message-ID: <20240820084408.1C1E710D2F3@lists.varnish-cache.org> commit f3f41ede43e7f7088e5e27232b9d5c3b84f9c14c Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:57 2024 -0400 spelling: github Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/CONTRIBUTING b/CONTRIBUTING index ed97b395f..e5a889c6d 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -20,7 +20,7 @@ through new (and old) tickets. It speeds things up a lot if you can join the channel and answer questions directly when we go over the ticket. -Github pull requests +GitHub pull requests -------------------- Pull requests are handled like other tickets. From nils.goroll at uplex.de Tue Aug 20 08:44:08 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Tue, 20 Aug 2024 08:44:08 +0000 (UTC) Subject: [master] c8d46df89 spelling: implicit Message-ID: <20240820084408.3A24110D2FA@lists.varnish-cache.org> commit c8d46df89e88258d244a9f055f11065f392b5f69 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Mon Aug 19 11:35:06 2024 -0400 spelling: implicit Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c index c6f05478f..8b3ccfad6 100644 --- a/bin/varnishd/mgt/mgt_main.c +++ b/bin/varnishd/mgt/mgt_main.c @@ -925,7 +925,7 @@ main(int argc, char * const *argv) alp->priv = create_pid_file(&pid, "%s", alp->val); } - /* Implict -P argument */ + /* Implicit -P argument */ alp = arg_list_add('P', NULL); alp->priv = create_pid_file(&pid, "%s/_.pid", workdir); From nils.goroll at uplex.de Tue Aug 20 08:44:08 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Tue, 20 Aug 2024 08:44:08 +0000 (UTC) Subject: [master] d779670d6 spelling: mutexes Message-ID: <20240820084408.54C6D10D303@lists.varnish-cache.org> commit d779670d664023123782545107d66efe9d8bb7d3 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: mutexes Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/wflags.py b/wflags.py index 85598719d..1c1da40d0 100644 --- a/wflags.py +++ b/wflags.py @@ -70,7 +70,7 @@ DESIRABLE_WFLAGS = [ UNDESIRABLE_WFLAGS = [ "-Wno-system-headers", # Outside of our control - "-Wno-thread-safety", # Does not understand our mutexs are wrapped + "-Wno-thread-safety", # Does not understand our mutexes are wrapped "-Wno-sign-compare", # Fixable ] From nils.goroll at uplex.de Tue Aug 20 08:44:08 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Tue, 20 Aug 2024 08:44:08 +0000 (UTC) Subject: [master] b95bd67cc spelling: oil company Message-ID: <20240820084408.728CA10D314@lists.varnish-cache.org> commit b95bd67cc1490fe49c3406ecb6423c2822b02994 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Mon Aug 19 12:33:10 2024 -0400 spelling: oil company Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/thatslow.rst b/doc/sphinx/phk/thatslow.rst index db148c559..179dea2c4 100644 --- a/doc/sphinx/phk/thatslow.rst +++ b/doc/sphinx/phk/thatslow.rst @@ -167,7 +167,7 @@ I'll take that. .. [#f2] Which is to be expected really: We don't program on punched cards. -.. [#f3] And I did. Migrating an oilcompany from IBM mainframes +.. [#f3] And I did. Migrating an oil company from IBM mainframes to 16-bit UNIX computers in 198x was an interesting challenge. .. [#f4] Having half the world adopt your hastily hacked up md5crypt From nils.goroll at uplex.de Tue Aug 20 08:44:08 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Tue, 20 Aug 2024 08:44:08 +0000 (UTC) Subject: [master] c41692eee spelling: persistent Message-ID: <20240820084408.8D53A10D31D@lists.varnish-cache.org> commit c41692eeecefb73c92fe19b4a8e21824e0f37179 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:30:59 2024 -0400 spelling: persistent Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/configure.ac b/configure.ac index 25959ebaf..258c81adf 100644 --- a/configure.ac +++ b/configure.ac @@ -490,7 +490,7 @@ AC_ARG_WITH(persistent-storage, if test "$with_persistent_storage" = yes; then AC_DEFINE([WITH_PERSISTENT_STORAGE], [1], - [Define to 1 to build the deprecated peristent storage.]) + [Define to 1 to build the deprecated persistent storage.]) fi AM_CONDITIONAL([WITH_PERSISTENT_STORAGE], From nils.goroll at uplex.de Tue Aug 20 08:44:08 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Tue, 20 Aug 2024 08:44:08 +0000 (UTC) Subject: [master] a11247e2a spelling: prerequisites Message-ID: <20240820084408.A774C10D323@lists.varnish-cache.org> commit a11247e2a90e2447090fa9305a694aeecd82495b Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:00 2024 -0400 spelling: prerequisites Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/INSTALL b/INSTALL index 6122bcb55..b170fb785 100644 --- a/INSTALL +++ b/INSTALL @@ -5,7 +5,7 @@ for complete and up to date install instructions. This file only mentions the basic steps: -* Install prerequesites +* Install prerequisites * When building from the source repository, run From nils.goroll at uplex.de Tue Aug 20 08:44:08 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Tue, 20 Aug 2024 08:44:08 +0000 (UTC) Subject: [master] 633063eb2 spelling: scenarios Message-ID: <20240820084408.C40EC10D342@lists.varnish-cache.org> commit 633063eb2cac7baf1975c7add6d3a843d9478791 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 09:06:06 2024 -0400 spelling: scenarios Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/varnish.m4 b/varnish.m4 index a816db451..e5f8f5447 100644 --- a/varnish.m4 +++ b/varnish.m4 @@ -391,7 +391,7 @@ AC_DEFUN([VARNISH_VMODS], [ # If that VCC file only needs to be generated once and is distributed, builds # from the dist archive will have the VCC file in the source directory. # -# With Varnish's ability to run VMODTOOL in a VPATH build both scnerarios are +# With Varnish's ability to run VMODTOOL in a VPATH build both scenarios are # taken care of. This macro works otherwise exactly like VARNISH_VMODS. # AC_DEFUN([VARNISH_VMODS_GENERATED], [ From nils.goroll at uplex.de Tue Aug 20 08:44:08 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Tue, 20 Aug 2024 08:44:08 +0000 (UTC) Subject: [master] 5775fe5f3 spelling: snowden's Message-ID: <20240820084408.E2F9310D34D@lists.varnish-cache.org> commit 5775fe5f33d109946047412c65f3e63ba8204aa6 Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Mon Aug 19 11:38:36 2024 -0400 spelling: snowden's Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/doc/sphinx/phk/ssl_again.rst b/doc/sphinx/phk/ssl_again.rst index 8e7b66b46..2413703e3 100644 --- a/doc/sphinx/phk/ssl_again.rst +++ b/doc/sphinx/phk/ssl_again.rst @@ -31,7 +31,7 @@ about being able to pay the bills come the next month. We're not there yet, but it's certainly getting better. However, implementing TLS and SSL is still insanely complex, and -thanks to Edward Snowdens whistle-blowing, we have very good reasons +thanks to Edward Snowden's whistle-blowing, we have very good reasons to believe that didn't happen by accident. The issue of finding a good TLS/SSL implementation is still the From nils.goroll at uplex.de Tue Aug 20 08:44:09 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Tue, 20 Aug 2024 08:44:09 +0000 (UTC) Subject: [master] 64b5ebe63 spelling: suppress Message-ID: <20240820084409.0D25C10D357@lists.varnish-cache.org> commit 64b5ebe63b49fd32e6640074b98210ebb8e24a7d Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Mon Aug 19 11:38:51 2024 -0400 spelling: suppress Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/include/tbl/http_headers.h b/include/tbl/http_headers.h index 3fe1aaa00..5e345459a 100644 --- a/include/tbl/http_headers.h +++ b/include/tbl/http_headers.h @@ -32,7 +32,7 @@ * --------------------------------------- * a Http header name * b enum name - * c Supress header in filter ops + * c Suppress header in filter ops * * see [RFC2616 13.5.1 End-to-end and Hop-by-hop Headers] * From nils.goroll at uplex.de Tue Aug 20 08:44:09 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Tue, 20 Aug 2024 08:44:09 +0000 (UTC) Subject: [master] 463569f99 spelling: wextra Message-ID: <20240820084409.2BCE610D35E@lists.varnish-cache.org> commit 463569f99437ebe5ea5af4232695974d22c0c45e Author: Josh Soref <2119212+jsoref at users.noreply.github.com> Date: Wed Aug 7 08:31:02 2024 -0400 spelling: wextra Signed-off-by: Josh Soref <2119212+jsoref at users.noreply.github.com> diff --git a/configure.ac b/configure.ac index 258c81adf..f0d1a3b1f 100644 --- a/configure.ac +++ b/configure.ac @@ -747,7 +747,7 @@ AC_ARG_ENABLE(developer-warnings, if test "x$SUNCC" != "xyes" && test "x$enable_developer_warnings" != "xno"; then # no known way to specifically disabling missing-field-initializers - # warnings keeping the rest of Wextra + # warnings keeping the rest of -Wextra AX_CHECK_COMPILE_FLAG([-Wno-missing-field-initializers], [DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wno-missing-field-initializers"], [DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wno-extra"], From nils.goroll at uplex.de Tue Aug 20 09:45:05 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Tue, 20 Aug 2024 09:45:05 +0000 (UTC) Subject: [master] f6dc44eca vbe: Assert to only dequeue queued connection requests Message-ID: <20240820094505.D4B41110634@lists.varnish-cache.org> commit f6dc44ecab840a18005c5d4c1c94e0ea6b6c2893 Author: Nils Goroll Date: Tue Aug 20 11:42:42 2024 +0200 vbe: Assert to only dequeue queued connection requests Motivated by #4154 diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c index bd60f4e0d..4a0e0a424 100644 --- a/bin/varnishd/cache/cache_backend.c +++ b/bin/varnishd/cache/cache_backend.c @@ -191,6 +191,7 @@ static void vbe_connwait_dequeue_locked(struct backend *bp, struct connwait *cw) { Lck_AssertHeld(bp->director->mtx); + assert(cw->cw_state == CW_QUEUED); VTAILQ_REMOVE(&bp->cw_head, cw, cw_list); vbe_connwait_signal_locked(bp); cw->cw_state = CW_DEQUEUED; From nils.goroll at uplex.de Wed Aug 21 12:22:08 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Wed, 21 Aug 2024 12:22:08 +0000 (UTC) Subject: [master] 68c88469e vmod_debug: fix vdp rot13 function names Message-ID: <20240821122208.25DD3120855@lists.varnish-cache.org> commit 68c88469e8401fd759efb2418dfaaa70bce3dd19 Author: Nils Goroll Date: Wed Aug 21 14:20:02 2024 +0200 vmod_debug: fix vdp rot13 function names diff --git a/vmod/vmod_debug.c b/vmod/vmod_debug.c index 82ce5c5c8..92e171461 100644 --- a/vmod/vmod_debug.c +++ b/vmod/vmod_debug.c @@ -105,7 +105,7 @@ static const struct vfp xyzzy_vfp_rot13 = { #define ROT13_BUFSZ 8 static int v_matchproto_(vdp_init_f) -xyzzy_vfp_rot13_init(VRT_CTX, struct vdp_ctx *vdc, void **priv, struct objcore *oc) +xyzzy_vdp_rot13_init(VRT_CTX, struct vdp_ctx *vdc, void **priv, struct objcore *oc) { (void)vdc; (void)oc; @@ -119,7 +119,7 @@ xyzzy_vfp_rot13_init(VRT_CTX, struct vdp_ctx *vdc, void **priv, struct objcore * } static int v_matchproto_(vdp_bytes_f) -xyzzy_vfp_rot13_bytes(struct vdp_ctx *vdc, enum vdp_action act, void **priv, +xyzzy_vdp_rot13_bytes(struct vdp_ctx *vdc, enum vdp_action act, void **priv, const void *ptr, ssize_t len) { char *q; @@ -157,7 +157,7 @@ xyzzy_vfp_rot13_bytes(struct vdp_ctx *vdc, enum vdp_action act, void **priv, } static int v_matchproto_(vdp_fini_f) -xyzzy_vfp_rot13_fini(struct vdp_ctx *vdc, void **priv) +xyzzy_vdp_rot13_fini(struct vdp_ctx *vdc, void **priv) { (void)vdc; AN(priv); @@ -168,9 +168,9 @@ xyzzy_vfp_rot13_fini(struct vdp_ctx *vdc, void **priv) static const struct vdp xyzzy_vdp_rot13 = { .name = "rot13", - .init = xyzzy_vfp_rot13_init, - .bytes = xyzzy_vfp_rot13_bytes, - .fini = xyzzy_vfp_rot13_fini, + .init = xyzzy_vdp_rot13_init, + .bytes = xyzzy_vdp_rot13_bytes, + .fini = xyzzy_vdp_rot13_fini, }; /********************************************************************** From nils.goroll at uplex.de Wed Aug 21 17:48:05 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Wed, 21 Aug 2024 17:48:05 +0000 (UTC) Subject: [master] 7a2e13ff0 VDP: allow for init-only filter implementations Message-ID: <20240821174805.2E36D1027DF@lists.varnish-cache.org> commit 7a2e13ff0fa32631bf2e270418f98e9b7cd3bdc0 Author: Nils Goroll Date: Wed Aug 21 19:35:07 2024 +0200 VDP: allow for init-only filter implementations VDPs can remove themselves from the filter list with a positive return value of the init function, so VDPs which do not implement a bytes function can already exist. Except there was an assertion requiring a non-NULL bytes function pointer. We now move the assertion such that a bytes function is only required if the init function returns zero. diff --git a/bin/varnishd/cache/cache_deliver_proc.c b/bin/varnishd/cache/cache_deliver_proc.c index b0af89c74..04ff3bbec 100644 --- a/bin/varnishd/cache/cache_deliver_proc.c +++ b/bin/varnishd/cache/cache_deliver_proc.c @@ -155,7 +155,6 @@ VDP_Push(VRT_CTX, struct vdp_ctx *vdc, struct ws *ws, const struct vdp *vdp, AN(ws); AN(vdp); AN(vdp->name); - AN(vdp->bytes); if (vdc->retval) return (vdc->retval); @@ -176,17 +175,18 @@ VDP_Push(VRT_CTX, struct vdp_ctx *vdc, struct ws *ws, const struct vdp *vdp, vdc->nxt = VTAILQ_FIRST(&vdc->vdp); AZ(vdc->retval); - if (vdpe->vdp->init == NULL) - return (vdc->retval); - - vdc->retval = vdpe->vdp->init(ctx, vdc, &vdpe->priv, - vdpe == vdc->nxt ? vdc->req->objcore : NULL); + if (vdpe->vdp->init != NULL) { + vdc->retval = vdpe->vdp->init(ctx, vdc, &vdpe->priv, + vdpe == vdc->nxt ? vdc->req->objcore : NULL); + } if (vdc->retval > 0) { VTAILQ_REMOVE(&vdc->vdp, vdpe, list); vdc->nxt = VTAILQ_FIRST(&vdc->vdp); vdc->retval = 0; } + else if (vdc->retval == 0) + AN(vdp->bytes); return (vdc->retval); } From nils.goroll at uplex.de Wed Aug 21 17:48:05 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Wed, 21 Aug 2024 17:48:05 +0000 (UTC) Subject: [master] 493288e6a vmod_debug: Add debug.chunked filter Message-ID: <20240821174805.4C2471027E3@lists.varnish-cache.org> commit 493288e6afa25a41be12d9eb15c4a2d9a5266446 Author: Nils Goroll Date: Wed Aug 21 19:45:06 2024 +0200 vmod_debug: Add debug.chunked filter to force chunked encoding delivery for testing diff --git a/bin/varnishtest/tests/m00048.vtc b/bin/varnishtest/tests/m00048.vtc index 60440cdf9..6e4263224 100644 --- a/bin/varnishtest/tests/m00048.vtc +++ b/bin/varnishtest/tests/m00048.vtc @@ -90,7 +90,7 @@ varnish v1 -vcl { sub vcl_synth { set resp.body = "Ponto Facto, Caesar Transit!"; if (req.http.Rot13) { - set resp.filters += "rot13 debug.pedantic"; + set resp.filters += "rot13 debug.chunked debug.pedantic"; } return (deliver); } @@ -99,8 +99,11 @@ varnish v1 -vcl { client c1 -repeat 2 { txreq rxresp + expect resp.http.Content-Length == 28 expect resp.body == "Ponto Facto, Caesar Transit!" txreq -hdr "Rot13: please" rxresp + expect resp.http.Content-Length == + expect resp.http.Transfer-Encoding == "chunked" expect resp.body == "Cbagb Snpgb, Pnrfne Genafvg!" } -run diff --git a/vmod/vmod_debug.c b/vmod/vmod_debug.c index 92e171461..cea472a09 100644 --- a/vmod/vmod_debug.c +++ b/vmod/vmod_debug.c @@ -173,6 +173,38 @@ static const struct vdp xyzzy_vdp_rot13 = { .fini = xyzzy_vdp_rot13_fini, }; +/********************************************************************** + * vdp debug_chunked: force http1 chunked encoding by removing the + * Content-Length header + * + * this happens in a VDP because cnt_transmit() runs after VCL and + * restores it + */ + +static int v_matchproto_(vdp_init_f) +xyzzy_vdp_chunked_init(VRT_CTX, struct vdp_ctx *vdc, void **priv, struct objcore *oc) +{ + struct http *hp; + + (void)vdc; + (void)oc; + (void)priv; + + CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC); + CHECK_OBJ_NOTNULL(vdc, VDP_CTX_MAGIC); + CHECK_OBJ_NOTNULL(vdc->req, REQ_MAGIC); + hp = vdc->req->resp; + CHECK_OBJ_NOTNULL(hp, HTTP_MAGIC); + http_Unset(hp, H_Content_Length); + + return (1); +} + +static const struct vdp xyzzy_vdp_chunked = { + .name = "debug.chunked", + .init = xyzzy_vdp_chunked_init, +}; + /********************************************************************** * pedantic tests of the VDP API: * - assert that we see a VDP_END @@ -555,6 +587,7 @@ event_load(VRT_CTX, struct vmod_priv *priv) AZ(VRT_AddFilter(ctx, &xyzzy_vfp_rot13, &xyzzy_vdp_rot13)); AZ(VRT_AddFilter(ctx, NULL, &xyzzy_vdp_pedantic)); + AZ(VRT_AddFilter(ctx, NULL, &xyzzy_vdp_chunked)); return (0); } @@ -718,6 +751,7 @@ event_discard(VRT_CTX, void *priv) VRT_RemoveFilter(ctx, &xyzzy_vfp_rot13, &xyzzy_vdp_rot13); VRT_RemoveFilter(ctx, NULL, &xyzzy_vdp_pedantic); + VRT_RemoveFilter(ctx, NULL, &xyzzy_vdp_chunked); if (--loads) return (0); From nils.goroll at uplex.de Thu Aug 22 09:32:05 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Thu, 22 Aug 2024 09:32:05 +0000 (UTC) Subject: [master] 233534e29 vmod_debug: the debug.chunked vdp needs to do one more thing Message-ID: <20240822093205.E74BD4133@lists.varnish-cache.org> commit 233534e29c627b73dfa3a3350a2bf89c86a93375 Author: Nils Goroll Date: Thu Aug 22 11:24:34 2024 +0200 vmod_debug: the debug.chunked vdp needs to do one more thing cnt_transmit() keeps the existing C-L header only if the value from http_GetContentLength() agrees with ObjGetLen(), so, for example, if the response does not have a Content-Length header, but the length is known, C-L is added again using http_PrintfHeader(). So to force chunked delivery for all cases, we also need to set resp_len to "unknown". Side note: This is actually what I expected to need to do in the first place, and I was surprised that only removing C-L already worked. It did, but not for all cases. diff --git a/vmod/vmod_debug.c b/vmod/vmod_debug.c index cea472a09..e78208941 100644 --- a/vmod/vmod_debug.c +++ b/vmod/vmod_debug.c @@ -196,6 +196,7 @@ xyzzy_vdp_chunked_init(VRT_CTX, struct vdp_ctx *vdc, void **priv, struct objcore hp = vdc->req->resp; CHECK_OBJ_NOTNULL(hp, HTTP_MAGIC); http_Unset(hp, H_Content_Length); + vdc->req->resp_len = -1; return (1); } From nils.goroll at uplex.de Thu Aug 22 15:48:07 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Thu, 22 Aug 2024 15:48:07 +0000 (UTC) Subject: [master] bea5de922 ban lurker: add vsl to wrk Message-ID: <20240822154807.E64AF107F50@lists.varnish-cache.org> commit bea5de922d826d880d76e32ef13bccb6dc0a0a06 Author: Nils Goroll Date: Thu Aug 22 17:37:28 2024 +0200 ban lurker: add vsl to wrk Seen when injecting errors with a custom storage engine: The ban lurker calls into the object API, and a storage engine might emit VSL. diff --git a/bin/varnishd/cache/cache_ban_lurker.c b/bin/varnishd/cache/cache_ban_lurker.c index 76ac772b9..d9a1899c3 100644 --- a/bin/varnishd/cache/cache_ban_lurker.c +++ b/bin/varnishd/cache/cache_ban_lurker.c @@ -420,6 +420,8 @@ ban_lurker(struct worker *wrk, void *priv) AZ(priv); VSL_Setup(&vsl, NULL, 0); + AZ(wrk->vsl); + wrk->vsl = &vsl; while (!ban_shutdown) { dt = ban_lurker_work(wrk, &vsl); @@ -435,6 +437,7 @@ ban_lurker(struct worker *wrk, void *priv) gen = ban_generation; Lck_Unlock(&ban_mtx); } + wrk->vsl = NULL; pthread_exit(0); NEEDLESS(return (NULL)); } From nils.goroll at uplex.de Thu Aug 22 15:48:07 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Thu, 22 Aug 2024 15:48:07 +0000 (UTC) Subject: [master] 7a9fc904f Handle ObjGetAttr failure Message-ID: <20240822154807.CADA4107F4E@lists.varnish-cache.org> commit 7a9fc904fa89b5cc6c9b21ae8cb057852641b8de Author: Nils Goroll Date: Thu Aug 22 16:51:22 2024 +0200 Handle ObjGetAttr failure seen with custom storage engine error injection. diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c index ed97a0110..45f66defc 100644 --- a/bin/varnishd/cache/cache_req_fsm.c +++ b/bin/varnishd/cache/cache_req_fsm.c @@ -136,6 +136,7 @@ Resp_Setup_Deliver(struct req *req) { struct http *h; struct objcore *oc; + const void *hdrs; CHECK_OBJ_NOTNULL(req, REQ_MAGIC); oc = req->objcore; @@ -145,7 +146,8 @@ Resp_Setup_Deliver(struct req *req) HTTP_Setup(h, req->ws, req->vsl, SLT_RespMethod); - if (HTTP_Decode(h, ObjGetAttr(req->wrk, oc, OA_HEADERS, NULL))) + hdrs = ObjGetAttr(req->wrk, oc, OA_HEADERS, NULL); + if (hdrs == NULL || HTTP_Decode(h, hdrs)) return (-1); http_ForceField(h, HTTP_HDR_PROTO, "HTTP/1.1"); From nils.goroll at uplex.de Thu Aug 22 15:48:08 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Thu, 22 Aug 2024 15:48:08 +0000 (UTC) Subject: [master] 3885b7bab ban lurker: Refactor use of vsl to wrk->vsl for consistency Message-ID: <20240822154808.2FCF6107F53@lists.varnish-cache.org> commit 3885b7bab580e86c7ff3d4a3bd0bfa37d57be78a Author: Nils Goroll Date: Thu Aug 22 17:41:22 2024 +0200 ban lurker: Refactor use of vsl to wrk->vsl for consistency diff --git a/bin/varnishd/cache/cache_ban_lurker.c b/bin/varnishd/cache/cache_ban_lurker.c index d9a1899c3..17087a8e2 100644 --- a/bin/varnishd/cache/cache_ban_lurker.c +++ b/bin/varnishd/cache/cache_ban_lurker.c @@ -229,7 +229,7 @@ ban_lurker_getfirst(struct vsl_log *vsl, struct ban *bt) } static void -ban_lurker_test_ban(struct worker *wrk, struct vsl_log *vsl, struct ban *bt, +ban_lurker_test_ban(struct worker *wrk, struct ban *bt, struct banhead_s *obans, struct ban *bd, int kill) { struct ban *bl, *bln; @@ -258,7 +258,7 @@ ban_lurker_test_ban(struct worker *wrk, struct vsl_log *vsl, struct ban *bt, VTIM_sleep(cache_param->ban_lurker_sleep); ban_batch = 0; } - oc = ban_lurker_getfirst(vsl, bt); + oc = ban_lurker_getfirst(wrk->vsl, bt); if (oc == NULL) { if (tested == 0 && lokc == 0) { AZ(tested_tests); @@ -299,12 +299,12 @@ ban_lurker_test_ban(struct worker *wrk, struct vsl_log *vsl, struct ban *bt, } if (i) { if (kill) { - VSLb(vsl, SLT_ExpBan, + VSLb(wrk->vsl, SLT_ExpBan, "%ju killed for lurker cutoff", VXID(ObjGetXID(wrk, oc))); lokc++; } else { - VSLb(vsl, SLT_ExpBan, + VSLb(wrk->vsl, SLT_ExpBan, "%ju banned by lurker", VXID(ObjGetXID(wrk, oc))); lok++; @@ -347,7 +347,7 @@ ban_lurker_test_ban(struct worker *wrk, struct vsl_log *vsl, struct ban *bt, */ static vtim_dur -ban_lurker_work(struct worker *wrk, struct vsl_log *vsl) +ban_lurker_work(struct worker *wrk) { struct ban *b, *bd; struct banhead_s obans; @@ -373,7 +373,7 @@ ban_lurker_work(struct worker *wrk, struct vsl_log *vsl) VTAILQ_INIT(&obans); for (; b != NULL; b = VTAILQ_NEXT(b, list), count++) { if (bd != NULL) - ban_lurker_test_ban(wrk, vsl, b, &obans, bd, + ban_lurker_test_ban(wrk, b, &obans, bd, count > cutoff ? 1 : 0); if (b->flags & BANS_FLAG_COMPLETED) continue; @@ -424,7 +424,7 @@ ban_lurker(struct worker *wrk, void *priv) wrk->vsl = &vsl; while (!ban_shutdown) { - dt = ban_lurker_work(wrk, &vsl); + dt = ban_lurker_work(wrk); if (DO_DEBUG(DBG_LURKER)) VSLb(&vsl, SLT_Debug, "lurker: sleep = %lf", dt); Lck_Lock(&ban_mtx); From nils.goroll at uplex.de Thu Aug 22 15:48:08 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Thu, 22 Aug 2024 15:48:08 +0000 (UTC) Subject: [master] 36d69b3a3 expire thread: add vsl to wrk Message-ID: <20240822154808.549DF107F58@lists.varnish-cache.org> commit 36d69b3a3dc90759afddcc9f7997f0bfd7552639 Author: Nils Goroll Date: Thu Aug 22 17:44:02 2024 +0200 expire thread: add vsl to wrk Seen when injecting errors with a custom storage engine: The ban lurker calls into the object API, and a storage engine might emit VSL. Assert error in vsl_sanity(), cache/cache_shmlog.c line 109: Condition((vsl) != 0) not true. Backtrace: ... ip=0x5570eb31ebc0 sp=0x7f40181ded90 ip=0x5570eb31feee sp=0x7f40181dedb0 ip=0x7f4023cc5a75 sp=0x7f40181deeb0 ip=0x7f4023cc4727 sp=0x7f40181def40 ip=0x5570eb30b5f0 sp=0x7f40181deff0 ip=0x5570eb30bd5e sp=0x7f40181df030 ip=0x5570eb30bb8c sp=0x7f40181df070 ip=0x5570eb2f0617 sp=0x7f40181df0a0 ip=0x5570eb2f1229 sp=0x7f40181df0e0 ... diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c index 40362f109..ff1c04152 100644 --- a/bin/varnishd/cache/cache_expire.c +++ b/bin/varnishd/cache/cache_expire.c @@ -429,6 +429,8 @@ exp_thread(struct worker *wrk, void *priv) CAST_OBJ_NOTNULL(ep, priv, EXP_PRIV_MAGIC); ep->wrk = wrk; VSL_Setup(&ep->vsl, NULL, 0); + AZ(wrk->vsl); + wrk->vsl = &ep->vsl; ep->heap = VBH_new(NULL, object_cmp, object_update); AN(ep->heap); while (exp_shutdown == 0) { @@ -460,6 +462,7 @@ exp_thread(struct worker *wrk, void *priv) else tnext = exp_expire(ep, t); } + wrk->vsl = NULL; return (NULL); } From nils.goroll at uplex.de Fri Aug 23 09:54:06 2024 From: nils.goroll at uplex.de (Nils Goroll) Date: Fri, 23 Aug 2024 09:54:06 +0000 (UTC) Subject: [master] 4217acf99 Polish assertion in ObjExtend() Message-ID: <20240823095407.0BDEE950AB@lists.varnish-cache.org> commit 4217acf9976c8002ba206f389b8c715785a164f0 Author: Nils Goroll Date: Fri Aug 23 11:48:32 2024 +0200 Polish assertion in ObjExtend() We require a busy objcore (boc) to be held for the duration of the function call, so it makes no sense to suddenly also accept a null boc. This looks like a minor oversight when trimstore was made a part of ObjExtend() in 115742b07c8bad6d465f1c981ee264f934a4492b, because previously trimstore was an independent Object API function which was originally intended to also be called on unbusy objects. diff --git a/bin/varnishd/cache/cache_obj.c b/bin/varnishd/cache/cache_obj.c index 1f4ca9876..bdf78c162 100644 --- a/bin/varnishd/cache/cache_obj.c +++ b/bin/varnishd/cache/cache_obj.c @@ -256,7 +256,7 @@ ObjExtend(struct worker *wrk, struct objcore *oc, ssize_t l, int final) } Lck_Unlock(&oc->boc->mtx); - assert(oc->boc == NULL || oc->boc->state < BOS_FINISHED); + assert(oc->boc->state < BOS_FINISHED); if (final && om->objtrimstore != NULL) om->objtrimstore(wrk, oc); } From asadsa at varnish-software.com Fri Aug 23 14:20:07 2024 From: asadsa at varnish-software.com (Asad Sajjad Ahmed) Date: Fri, 23 Aug 2024 14:20:07 +0000 (UTC) Subject: [master] 885688b76 b000{87,88}.vtc: skip tests for SunOS Message-ID: <20240823142007.6E686A54C2@lists.varnish-cache.org> commit 885688b76c75ff3bbf5d060ba1699f2d8c728908 Author: Asad Sajjad Ahmed Date: Fri Aug 23 16:08:22 2024 +0200 b000{87,88}.vtc: skip tests for SunOS The Waiter implementation poll & ports lacks a portable way for us to know when a client has closed the connection. For now skip tests on SunOS, in the future we could maybe feature test the default Waiter implementation. Signed-off-by: Asad Sajjad Ahmed diff --git a/bin/varnishtest/tests/b00087.vtc b/bin/varnishtest/tests/b00087.vtc index 2e1100b22..753965398 100644 --- a/bin/varnishtest/tests/b00087.vtc +++ b/bin/varnishtest/tests/b00087.vtc @@ -1,5 +1,8 @@ varnishtest "waiter counters" +# XXX: Waiter implementation for poll & ports do not signal WAITER_REMCLOSE +feature cmd {test $(uname) != SunOS} + barrier b1 cond 2 barrier b2 cond 2 barrier b3 cond 2 diff --git a/bin/varnishtest/tests/b00088.vtc b/bin/varnishtest/tests/b00088.vtc index 8f9399aa6..026f6e627 100644 --- a/bin/varnishtest/tests/b00088.vtc +++ b/bin/varnishtest/tests/b00088.vtc @@ -1,6 +1,8 @@ - varnishtest "waiter & shutdown" +# XXX: Waiter implementation for poll & ports do not signal WAITER_REMCLOSE +feature cmd {test $(uname) != SunOS} + barrier b1 cond 2 barrier b2 cond 2 barrier b3 cond 3