Skip to content

Commit

Permalink
Issue #20: remove references and workarounds for PerlEx
Browse files Browse the repository at this point in the history
Windows is not supported.
  • Loading branch information
bschmalhofer committed May 14, 2020
1 parent 1f58671 commit 4b4790e
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 42 deletions.
2 changes: 1 addition & 1 deletion Custom/README
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ and they will be used if the theme is selected.

It also works for unit test files. Just place them in Custom/scripts/test.

If you use Apache + mod_perl or PerlEx, any Perl module files placed in this directory
If you use Apache + mod_perl or PSGI, any Perl module files placed in this directory
will only be loaded by your web server after you restarted it.
18 changes: 0 additions & 18 deletions Kernel/Modules/Installer.pm
Original file line number Diff line number Diff line change
Expand Up @@ -698,15 +698,6 @@ sub Run {
Name => 'DatabaseResultItemDone',
);

# If running under PerlEx, reload the application (and thus the configuration).
if (
exists $ENV{'GATEWAY_INTERFACE'}
&& $ENV{'GATEWAY_INTERFACE'} eq "CGI-PerlEx"
)
{
PerlEx::ReloadAll();
}

$LayoutObject->Block(
Name => 'DatabaseResultSuccess',
);
Expand Down Expand Up @@ -947,15 +938,6 @@ sub Run {
UserID => 1,
);

# If running under PerlEx, reload the application (and thus the configuration).
if (
exists $ENV{'GATEWAY_INTERFACE'}
&& $ENV{'GATEWAY_INTERFACE'} eq "CGI-PerlEx"
)
{
PerlEx::ReloadAll();
}

# Set a generated password for the 'root@localhost' account.
my $UserObject = $Kernel::OM->Get('Kernel::System::User');
my $Password = $UserObject->GenerateRandomPassword( Size => 16 );
Expand Down
9 changes: 0 additions & 9 deletions Kernel/Modules/MigrateFromOTRS.pm
Original file line number Diff line number Diff line change
Expand Up @@ -561,15 +561,6 @@ sub _Finish {
UserID => 1,
);

# If running under PerlEx, reload the application (and thus the configuration).
if (
exists $ENV{'GATEWAY_INTERFACE'}
&& $ENV{'GATEWAY_INTERFACE'} eq "CGI-PerlEx"
)
{
PerlEx::ReloadAll();
}

# check web server - is a restart needed?
my $Webserver;

Expand Down
8 changes: 0 additions & 8 deletions Kernel/System/JSON.pm
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,6 @@ package Kernel::System::JSON;
use strict;
use warnings;

# on PerlEx JSON::XS causes problems so force JSON::PP as backend
# see http://bugs.otobo.org/show_bug.cgi?id=7337
BEGIN {
if ( $ENV{GATEWAY_INTERFACE} && $ENV{GATEWAY_INTERFACE} =~ m{\A CGI-PerlEx}xmsi ) {
$ENV{PERL_JSON_BACKEND} = 'JSON::PP'; ## no critic
}
}

use JSON;

our @ObjectDependencies = (
Expand Down
7 changes: 1 addition & 6 deletions Kernel/System/Web/Request.pm
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,8 @@ to get the error back
sub Error {
my ( $Self, %Param ) = @_;

# Workaround, do not check cgi_error() with perlex, CGI module is not
# working with perlex.
if ( $ENV{'GATEWAY_INTERFACE'} && $ENV{'GATEWAY_INTERFACE'} =~ /^CGI-PerlEx/ ) {
return;
}

return if !$Self->{Query}->cgi_error();

## no critic
return $Self->{Query}->cgi_error() . ' - POST_MAX=' . ( $CGI::POST_MAX / 1024 ) . 'KB';
## use critic
Expand Down

0 comments on commit 4b4790e

Please sign in to comment.