Simplify the code that handles the HTTP headers by using an RB tree

with associated lists instead of the complicated lookup table and
"others" list.  This might add a little malloc overhead for common
headers but also fixes some issues like the handling of repeated
headers -  for example, handling of multiple "Set-Cookie" headers.

ok bluhm@ (regress part)
ok benno@

3 files changed, 3 insertions, 3 deletions

diff --git a/regress/usr.sbin/relayd/args-http-change-cookie.pl b/regress/usr.sbin/relayd/args-http-change-cookie.pl
index ac0dd71c83f..c6808c98159 100644
--- a/regress/usr.sbin/relayd/args-http-change-cookie.pl
+++ b/regress/usr.sbin/relayd/args-http-change-cookie.pl
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-my $name = "X-Set-Cookie";
+my $name = "Set-Cookie";
 my %header = ("$name" => [ "test=a;", "test=b;" ]);
 our %args = (
     client => {
diff --git a/regress/usr.sbin/relayd/args-http-change-path.pl b/regress/usr.sbin/relayd/args-http-change-path.pl
index 41a547d672b..c4070b2a76b 100644
--- a/regress/usr.sbin/relayd/args-http-change-path.pl
+++ b/regress/usr.sbin/relayd/args-http-change-path.pl
@@ -13,7 +13,7 @@ our %args = (
 	    'match request path set "*" value "/foopath" \
 		url log "*"',
 	],
-	loggrep => { qr/\, done\, \[foo.bar\/foopath\]/ => 1 },
+	loggrep => { qr/ (?:done|last write \(done\)), \[foo.bar\/foopath\]/ => 1 },
     },
     server => {
 	func => \&http_server,
diff --git a/regress/usr.sbin/relayd/args-http-remove.pl b/regress/usr.sbin/relayd/args-http-remove.pl
index 6cc061d177a..45800210b6c 100644
--- a/regress/usr.sbin/relayd/args-http-remove.pl
+++ b/regress/usr.sbin/relayd/args-http-remove.pl
@@ -16,7 +16,7 @@ our %args = (
     relayd => {
 	protocol => [ "http",
 	    'match response header remove X-Header-Foo',
-	    'match response header log "*"',
+	    'match response header log "*Foo"',
 	],
 	loggrep => { qr/ (?:done|last write \(done\)), \[X-Header-Foo: foo \(removed\)\s*\]/ => 1 },
     },