sync with OpenBSD -current

This commit is contained in:
purplerain 2024-07-08 18:11:41 +00:00
parent b97c2ce374
commit d93a7459f8
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
97 changed files with 717 additions and 833 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: relay_http.c,v 1.87 2023/12/01 16:48:40 millert Exp $ */
/* $OpenBSD: relay_http.c,v 1.88 2024/07/08 14:22:09 florian Exp $ */
/*
* Copyright (c) 2006 - 2016 Reyk Floeter <reyk@openbsd.org>
@ -1972,7 +1972,6 @@ relay_test(struct protocol *proto, struct ctl_relay_event *cre)
struct http_descriptor *desc = cre->desc;
struct relay_rule *r = NULL, *rule = NULL;
struct relay_table *tbl = NULL;
u_int cnt = 0;
u_int action = RES_PASS;
struct kvlist actions, matches;
struct kv *kv;
@ -1983,8 +1982,6 @@ relay_test(struct protocol *proto, struct ctl_relay_event *cre)
r = TAILQ_FIRST(&proto->rules);
while (r != NULL) {
cnt++;
TAILQ_INIT(&matches);
TAILQ_INIT(&r->rule_kvlist);