Merge branch 'master' into psgi

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Script / CGI.pm

diff --git a/lib/Catalyst/Script/CGI.pm b/lib/Catalyst/Script/CGI.pm
index e80a5f7..dc7f20f 100644 (file)
--- a/lib/Catalyst/Script/CGI.pm
+++ b/lib/Catalyst/Script/CGI.pm
@@ -1,8 +1,9 @@
 package Catalyst::Script::CGI;
 use Moose;
-BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' }
 use namespace::autoclean;
 
+sub _plack_engine_name { 'CGI' }
+
 with 'Catalyst::ScriptRole';
 
 __PACKAGE__->meta->make_immutable;
@@ -16,7 +17,7 @@ Catalyst::Script::CGI - The CGI Catalyst Script
   myapp_cgi.pl [options]
 
   Options:
-  -h     --help           display this help and exits
+  -?     --help           display this help and exits
 
 =head1 DESCRIPTION