diff options
author | Sebastian Benoit <benno@cvs.openbsd.org> | 2014-07-12 15:47:19 +0000 |
---|---|---|
committer | Sebastian Benoit <benno@cvs.openbsd.org> | 2014-07-12 15:47:19 +0000 |
commit | 6a6bdf51d050bd64e21dc788bf739acda349e1be (patch) | |
tree | 9d7254b0704a1b005d76aa7bf854d01ea176f746 /usr.sbin/relayd | |
parent | 5035ff8a1ebd35b86dba73727e6d348a2dd4430f (diff) |
fix relay "append header" action, add regression test for append
ok reyk
Diffstat (limited to 'usr.sbin/relayd')
-rw-r--r-- | usr.sbin/relayd/relay_http.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/usr.sbin/relayd/relay_http.c b/usr.sbin/relayd/relay_http.c index 4928fcf445e..9e30487d525 100644 --- a/usr.sbin/relayd/relay_http.c +++ b/usr.sbin/relayd/relay_http.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relay_http.c,v 1.26 2014/07/12 14:34:13 reyk Exp $ */ +/* $OpenBSD: relay_http.c,v 1.27 2014/07/12 15:47:18 benno Exp $ */ /* * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -1437,11 +1437,8 @@ relay_apply_actions(struct ctl_relay_event *cre, struct kvlist *actions) if (kv_set(match, "%s", kv->kv_value) == -1) goto fail; - } else { - if (kv_setkey(match, "%s,%s", - match->kv_key, kv->kv_key) == -1) - goto fail; - } + } else + addkv = 1; break; default: /* query, url not supported */ |