vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix HTTPServerSimple.pl config option overrides

hinted-selects
Vitaliy Filippov 2014-10-27 17:17:06 +04:00
parent a1a11fcfec
commit 7986d0e7a9
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
HTTPServerSimple.pl
View File

@ -79,55 +79,58 @@ sub new
{
my ($class, @args) = @_;
my $self = HTTP::Server::Simple::new($class);
my @cfg;
my $cmdline = [];
my $series = [];
for (@args)
{
if (/^--([^=]+)(?:=(.*))?/s)
{
push @cfg, $1, $2||1;
push @$cmdline, $1, $2||1;
}
elsif (!$self->{_config})
else
{
$self->{_config} = Bugzilla::NetServerConfigParser->_read_conf($_);
push @$series, Bugzilla::NetServerConfigParser->_read_conf($_);
}
}
$self->{_config} ||= [];
for (my $i = 0; $i < @{$self->{_config}}; $i += 2)
push @$series, $cmdline;
unshift @$series, [ DEFAULT_CONFIG() ];
my $r = {};
for my $array (@$series)
{
if ($self->{_config}->[$i] eq 'port')
my $cfg = {};
for (my $i = 0; $i < @$array; $i += 2)
{
# Remove first 'port' option (workaround hardcode from HTTP::Server::Simple)
splice @{$self->{_config}}, $i, 2;
last;
push @{$cfg->{$array->[$i]}}, $array->[$i+1];
}
$r = { %$r, %$cfg };
}
$self->{_config} = [ DEFAULT_CONFIG(), @{$self->{_config}}, @cfg ];
$self->{_config_hash} = {};
for (my $i = 0; $i < @{$self->{_config}}; $i += 2)
# Preload scripts (before transforming $r)
for my $script (@{$r->{preload} || []})
{
$self->{_config_hash}->{$self->{_config}->[$i]} = $self->{_config}->[$i+1];
if ($self->{_config}->[$i] eq 'preload')
for (glob $script)
{
# Preload a script
my $script = $self->{_config}->[$i+1];
for (glob $script)
eval
{
eval
{
$self->load_script($_);
};
if ($@ && ref $@ eq 'Bugzilla::HTTPServerSimple::FakeExit')
{
print STDERR "Preloading $_ failed: $@->{error}->[2]\n";
}
$self->load_script($_);
};
if ($@ && ref $@ eq 'Bugzilla::HTTPServerSimple::FakeExit')
{
print STDERR "Preloading $_ failed: $@->{error}->[2]\n";
}
}
}
if ($self->{_config_hash}->{reload})
$self->{_config} = [];
for my $k (keys %$r)
{
push @{$self->{_config}}, map { $k => $_ } @{$r->{$k}};
($r->{$k}) = @{$r->{$k}} if @{$r->{$k}} < 2;
}
if ($r->{reload})
{
# Enable reload support
$^P |= 0x10;
}
$self->{_config_hash} = $r;
return $self;
}