psgi optionalize until can rebuild vendor bundle

2 files changed, 30 insertions, 3 deletions

diff --git a/Bugzilla/PSGI.pm b/Bugzilla/PSGI.pm
index 854ae733a..46352b319 100644
--- a/Bugzilla/PSGI.pm
+++ b/Bugzilla/PSGI.pm
@@ -13,13 +13,13 @@ use warnings;
 use base qw(Exporter);
 
 use Bugzilla::Logging;
-use CGI::Compile;
-use CGI::Emulate::PSGI;
-
 our @EXPORT_OK = qw(compile_cgi);
 
 sub compile_cgi {
     my ($script) = @_;
+    require CGI::Compile;
+    require CGI::Emulate::PSGI;
+
     my $cgi = CGI::Compile->compile($script);
     my $app = CGI::Emulate::PSGI->handler(
         sub {
diff --git a/Makefile.PL b/Makefile.PL
index 97caea271..57bc06001 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -325,6 +325,32 @@ my %optional_features = (
             }
         }
     },
+<<<<<<< HEAD
+=======
+    psgi => {
+        description => "PSGI Support",
+        prereqs => {
+            runtime => {
+                requires => {
+                    'Plack'                    => '1.0031',
+                    'CGI::Compile'             => 0,
+                    'CGI::Emulate::PSGI'       => 0,
+                },
+            },
+        },
+    },
+    csp => {
+        description => 'Content-Security-Policy support',
+        prereqs     => {
+            runtime => {
+                requires => {
+                    'Type::Tiny' => 1,
+                    'MooX::StrictConstructor' => 0.008,
+                }
+            }
+        }
+    },
+>>>>>>> 741eeec31... psgi optionalize until can rebuild vendor bundle
     elasticsearch => {
         description => 'Elasticsearch-powered searches',
         prereqs     => {
@@ -370,6 +396,7 @@ my @bmo_features = grep {
         (?: pg
           | oracle
           | mod_perl
+          | psgi
           | sqlite
           | auth_ldap
           | auth_radius