X-Git-Url: https://git.exim.org/buildfarm-server.git/blobdiff_plain/54efab99b33efe20a0c3c39dd36569310c5441b5..f0286f91a9ec65c30a27f070a179ca9f6de53dbd:/cgi-bin/eximstatus.pl

diff --git a/cgi-bin/eximstatus.pl b/cgi-bin/eximstatus.pl
index 244439e..d2e4638 100755
--- a/cgi-bin/eximstatus.pl
+++ b/cgi-bin/eximstatus.pl
@@ -9,6 +9,7 @@ See accompanying License file for license details
 =cut 
 
 use strict;
+use URI::Escape;
 
 use vars qw($dbhost $dbname $dbuser $dbpass $dbport
        $all_stat $fail_stat $change_stat $green_stat
@@ -30,8 +31,10 @@ use Mail::Send;
 use Time::ParseDate;
 use Storable qw(thaw);
 
-require "$ENV{BFConfDir}/BuildFarmWeb.pl";
-my $buildlogs = "$ENV{BFConfDir}/buildlogs";
+use FindBin qw($RealBin);
+require "$RealBin/../BuildFarmWeb.pl";
+
+my $buildlogs = "$RealBin/../buildlogs";
 
 die "no dbname" unless $dbname;
 die "no dbuser" unless $dbuser;
@@ -74,7 +77,7 @@ if (open($brhandle,"../htdocs/branches_of_interest.txt"))
 
 
 my $content = 
-	"branch=$branch&res=$res&stage=$stage&animal=$animal&".
+	'branch=' . uri_escape($branch) . "&res=$res&stage=$stage&animal=$animal&".
 	"ts=$ts&log=$log&conf=$conf";
 
 my $extra_content = 
@@ -297,6 +300,10 @@ if (@config_flags)
     @config_flags = grep {! m/=/ } @config_flags;
     map {s/\s+//g; $_=qq("$_"); } @config_flags;
     push @config_flags,'git' if $client_conf->{scm} eq 'git';
+    push(@config_flags, 'doc')
+      if (defined $client_conf->{'optional_steps'}->{'make-doc'});
+    push(@config_flags, 'test')
+      if (defined $client_conf->{'optional_steps'}->{'test'});
     $config_flags = '{' . join(',',@config_flags) . '}' ;
 }