From 058d07b770c16cab841f467826563027c0f20265 Mon Sep 17 00:00:00 2001 From: bluhm Date: Wed, 29 Apr 2015 08:45:53 +0000 Subject: [PATCH] Make some regular expressions more strict. This allows the tests to pass also if relayd is compiled with DEBUG. --- regress/usr.sbin/relayd/args-http-chunked.pl | 2 +- regress/usr.sbin/relayd/args-http-mark-marked2.pl | 2 +- regress/usr.sbin/relayd/args-https-chunked.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/regress/usr.sbin/relayd/args-http-chunked.pl b/regress/usr.sbin/relayd/args-http-chunked.pl index e3fa98e5817..5b0abfe3f80 100644 --- a/regress/usr.sbin/relayd/args-http-chunked.pl +++ b/regress/usr.sbin/relayd/args-http-chunked.pl @@ -16,7 +16,7 @@ our %args = ( "match response header log Transfer-Encoding", ], loggrep => { - "Transfer-Encoding: chunked" => 1, + "{Transfer-Encoding: chunked}" => 1, qr/\[\(null\)\]/ => 0, }, }, diff --git a/regress/usr.sbin/relayd/args-http-mark-marked2.pl b/regress/usr.sbin/relayd/args-http-mark-marked2.pl index 234c8af114e..2eb8b42e3b3 100644 --- a/regress/usr.sbin/relayd/args-http-mark-marked2.pl +++ b/regress/usr.sbin/relayd/args-http-mark-marked2.pl @@ -26,7 +26,7 @@ our %args = ( 'match request header log "MyHeader"', ], loggrep => { - 'User-Agent: BORK' => 1, + '\[User-Agent: BORK\]' => 1, 'MyHeader: FOO' => 0, }, }, diff --git a/regress/usr.sbin/relayd/args-https-chunked.pl b/regress/usr.sbin/relayd/args-https-chunked.pl index 0a62174e2cb..f13f5897271 100644 --- a/regress/usr.sbin/relayd/args-https-chunked.pl +++ b/regress/usr.sbin/relayd/args-https-chunked.pl @@ -17,7 +17,7 @@ our %args = ( "match response header log Transfer-Encoding", ], loggrep => { - "Transfer-Encoding: chunked" => 1, + "{Transfer-Encoding: chunked}" => 1, qr/\[\(null\)\]/ => 0, }, forwardssl => 1, -- 2.20.1