From: bluhm <bluhm@openbsd.org>
Date: Mon, 5 Jan 2015 22:41:37 +0000 (+0000)
Subject: Fix relayd http regression tests.  If http response is not ok, the
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=32fc6e3de2f1f448afc1cb8f4dafd2ff5542c232;p=openbsd

Fix relayd http regression tests.  If http response is not ok, the
response's content length may be an unexpected value as an error
page is shown.
---

diff --git a/regress/usr.sbin/relayd/funcs.pl b/regress/usr.sbin/relayd/funcs.pl
index eef726435e9..98aee4390ab 100644
--- a/regress/usr.sbin/relayd/funcs.pl
+++ b/regress/usr.sbin/relayd/funcs.pl
@@ -1,4 +1,4 @@
-#	$OpenBSD: funcs.pl,v 1.17 2014/08/18 22:58:19 bluhm Exp $
+#	$OpenBSD: funcs.pl,v 1.18 2015/01/05 22:41:37 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -175,8 +175,12 @@ sub http_request {
 			print STDERR "<<< $_\n";
 			last if /^$/;
 			if (/^Content-Length: (.*)/) {
-				$1 == $len or die ref($self),
-				    " bad content length $1";
+				if ($self->{httpnok}) {
+					$len = $1;
+				} else {
+					$1 == $len or die ref($self),
+					    " bad content length $1";
+				}
 			}
 			if (/^Transfer-Encoding: chunked$/) {
 				$chunked = 1;