summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--regress/usr.sbin/relayd/args-http-persistent.pl4
-rw-r--r--regress/usr.sbin/relayd/args-http-put.pl4
-rw-r--r--regress/usr.sbin/relayd/args-https-persistent.pl4
-rw-r--r--regress/usr.sbin/relayd/args-https-put.pl4
4 files changed, 12 insertions, 4 deletions
diff --git a/regress/usr.sbin/relayd/args-http-persistent.pl b/regress/usr.sbin/relayd/args-http-persistent.pl
index cd532c1b30b..bb2279f205b 100644
--- a/regress/usr.sbin/relayd/args-http-persistent.pl
+++ b/regress/usr.sbin/relayd/args-http-persistent.pl
@@ -14,7 +14,9 @@ our %args = (
"match request header log foo",
"match response header log bar",
],
- loggrep => qr/\, done/,
+ loggrep => {
+ qr/, (?:done|last write \(done\))/ => (1 + @lengths),
+ }
},
server => {
func => \&http_server,
diff --git a/regress/usr.sbin/relayd/args-http-put.pl b/regress/usr.sbin/relayd/args-http-put.pl
index a498a043517..39abc8579a0 100644
--- a/regress/usr.sbin/relayd/args-http-put.pl
+++ b/regress/usr.sbin/relayd/args-http-put.pl
@@ -15,7 +15,9 @@ our %args = (
"match request header log foo",
"match response header log bar",
],
- loggrep => qr/\, done/,
+ loggrep => {
+ qr/, (?:done|last write \(done\))/ => (1 + @lengths),
+ }
},
server => {
func => \&http_server,
diff --git a/regress/usr.sbin/relayd/args-https-persistent.pl b/regress/usr.sbin/relayd/args-https-persistent.pl
index 9ca2eaee06c..f6ba0f54dcb 100644
--- a/regress/usr.sbin/relayd/args-https-persistent.pl
+++ b/regress/usr.sbin/relayd/args-https-persistent.pl
@@ -15,7 +15,9 @@ our %args = (
"match request header log foo",
"match response header log bar",
],
- loggrep => qr/\, done/,
+ loggrep => {
+ qr/, (?:done|last write \(done\))/ => (1 + @lengths),
+ },
forwardssl => 1,
listenssl => 1,
},
diff --git a/regress/usr.sbin/relayd/args-https-put.pl b/regress/usr.sbin/relayd/args-https-put.pl
index 1e6973726b2..9ea50cbab5a 100644
--- a/regress/usr.sbin/relayd/args-https-put.pl
+++ b/regress/usr.sbin/relayd/args-https-put.pl
@@ -16,9 +16,11 @@ our %args = (
"match request header log foo",
"match response header log bar",
],
+ loggrep => {
+ qr/, (?:done|last write \(done\))/ => (1 + @lengths),
+ },
forwardssl => 1,
listenssl => 1,
- loggrep => qr/\, done/,
},
server => {
func => \&http_server,