From ce95017bf16f7937013134fc5188900d3e2cd9c7 Mon Sep 17 00:00:00 2001 From: Reyk Floeter Date: Wed, 16 Aug 2017 09:27:36 +0200 Subject: sync --- regress/tests/Httpd.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'regress/tests/Httpd.pm') diff --git a/regress/tests/Httpd.pm b/regress/tests/Httpd.pm index d5b9df0..485ff68 100644 --- a/regress/tests/Httpd.pm +++ b/regress/tests/Httpd.pm @@ -1,4 +1,4 @@ -# $OpenBSD: Httpd.pm,v 1.1 2015/07/16 16:35:57 reyk Exp $ +# $OpenBSD: Httpd.pm,v 1.2 2017/01/30 21:18:24 reyk Exp $ # Copyright (c) 2010-2015 Alexander Bluhm # Copyright (c) 2015 Reyk Floeter @@ -27,6 +27,7 @@ sub new { my $class = shift; my %args = @_; $args{chroot} ||= "."; + $args{docroot} ||= "htdocs"; $args{logfile} ||= $args{chroot}."/httpd.log"; $args{up} ||= $args{dryrun} || "server_launch: "; $args{down} ||= $args{dryrun} ? "httpd.conf:" : "parent terminating"; @@ -54,7 +55,7 @@ sub new { my $listenport = $self->{listenport}; print $fh "prefork 1\n"; # only crashes of first child are observed - print $fh "chroot \"".$args{chroot}."\"\n"; + print $fh "chroot \"".$args{docroot}."\"\n"; print $fh "logdir \"".$args{chroot}."\"\n"; my @http = @{$self->{http}}; -- cgit v1.2.3-54-g00ecf