1 files changed, 31 insertions, 17 deletions

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 1188102d3..f5e64c371 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -58,6 +58,7 @@ use File::Spec::Functions;
 use Safe;
 use Sys::Syslog qw(:DEFAULT);
 use JSON::XS qw(decode_json);
+use URI;
 
 use parent qw(Bugzilla::CPAN);
 
@@ -117,20 +118,6 @@ sub init_page {
     # 001compile.t test).
     return if $^C;
 
-    # IIS prints out warnings to the webpage, so ignore them, or log them
-    # to a file if the file exists.
-    if ($ENV{SERVER_SOFTWARE} && $ENV{SERVER_SOFTWARE} =~ /microsoft-iis/i) {
-        $SIG{__WARN__} = sub {
-            my ($msg) = @_;
-            my $datadir = bz_locations()->{'datadir'};
-            if (-w "$datadir/errorlog") {
-                my $warning_log = new IO::File(">>$datadir/errorlog");
-                print $warning_log $msg;
-                $warning_log->close();
-            }
-        };
-    }
-
     my $script = basename($0);
 
     # BMO - init metrics collection if required
@@ -246,6 +233,15 @@ sub template_inner {
 
 sub extensions {
     my ($class) = @_;
+
+    # Guard against extensions querying the extension list during initialization
+    # (through this method or has_extension).
+    # The extension list is not fully populated at that point,
+    # so the results would not be meaningful.
+    state $recursive = 0;
+    die "Recursive attempt to load/query extensions" if $recursive;
+    $recursive = 1;
+
     my $cache = $class->request_cache;
     if (!$cache->{extensions}) {
         my $extension_packages = Bugzilla::Extension->load_all();
@@ -258,9 +254,20 @@ sub extensions {
         }
         $cache->{extensions} = \@extensions;
     }
+    $recursive = 0;
     return $cache->{extensions};
 }
 
+sub has_extension {
+    my ($class, $name) = @_;
+    my $cache = $class->request_cache;
+    if (!$cache->{extensions_hash}) {
+        my %extensions = map { $_->NAME => 1 } @{ Bugzilla->extensions };
+        $cache->{extensions_hash} = \%extensions;
+    }
+    return exists $cache->{extensions_hash}{$name};
+}
+
 sub cgi {
     return $_[0]->request_cache->{cgi} ||= new Bugzilla::CGI();
 }
@@ -285,6 +292,13 @@ sub localconfig {
     return $_[0]->process_cache->{localconfig} ||= read_localconfig();
 }
 
+sub urlbase {
+    my ($class) = @_;
+
+    # Since this could be modified, we have to return a new one every time.
+    return URI->new($class->localconfig->{urlbase});
+}
+
 sub params {
     return $_[0]->request_cache->{params} ||= Bugzilla::Config::read_param_file();
 }
@@ -369,7 +383,7 @@ sub login {
     return $class->user if $class->user->id;
 
     # Load all extensions here if not running under mod_perl
-    $class->extensions unless $ENV{MOD_PERL};
+    $class->extensions unless BZ_PERSISTENT;
 
     my $authorizer = new Bugzilla::Auth();
     $type = LOGIN_REQUIRED if $class->cgi->param('GoAheadAndLogIn');
@@ -902,10 +916,10 @@ sub _cleanup {
 
 sub END {
     # Bugzilla.pm cannot compile in mod_perl.pl if this runs.
-    _cleanup() unless $ENV{MOD_PERL};
+    _cleanup() unless BZ_PERSISTENT;
 }
 
-init_page() if !$ENV{MOD_PERL};
+init_page() unless BZ_PERSISTENT;
 
 1;