View | Details | Raw Unified | Return to bug 27555
Collapse All | Expand All

(-)a/C4/Auth.pm (-6 / +7 lines)
Lines 52-64 use C4::Log qw/logaction/; Link Here
52
# use utf8;
52
# use utf8;
53
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas $caslogout);
53
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas $caslogout);
54
54
55
BEGIN {
55
sub psgi_env { any { /(^psgi\.|^plack\.)/i } keys %ENV }
56
    sub psgi_env { any { /^psgi\./ } keys %ENV }
57
56
58
    sub safe_exit {
57
sub safe_exit {
59
        if   (psgi_env) { die 'psgi:exit' }
58
    if   (psgi_env) { die 'psgi:exit' }
60
        else            { exit }
59
    else            { exit }
61
    }
60
}
61
62
BEGIN {
62
63
63
    C4::Context->set_remote_address;
64
    C4::Context->set_remote_address;
64
65
(-)a/errors/400.pl (-1 / +1 lines)
Lines 39-45 $template->param ( Link Here
39
    errno => 400,
39
    errno => 400,
40
);
40
);
41
my $status = '400 Bad Request';
41
my $status = '400 Bad Request';
42
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
42
if ( C4::Auth::psgi_env() ) {
43
    $status = '200 OK';
43
    $status = '200 OK';
44
}
44
}
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
(-)a/errors/401.pl (-1 / +1 lines)
Lines 38-44 $template->param ( Link Here
38
    errno => 401,
38
    errno => 401,
39
);
39
);
40
my $status = '401 Unauthorized';
40
my $status = '401 Unauthorized';
41
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
41
if ( C4::Auth::psgi_env() ) {
42
    $status = '200 OK';
42
    $status = '200 OK';
43
}
43
}
44
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
44
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
(-)a/errors/402.pl (-1 / +1 lines)
Lines 39-45 $template->param ( Link Here
39
    errno => 402,
39
    errno => 402,
40
);
40
);
41
my $status = '402 Payment Required';
41
my $status = '402 Payment Required';
42
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
42
if ( C4::Auth::psgi_env() ) {
43
    $status = '200 OK';
43
    $status = '200 OK';
44
}
44
}
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
(-)a/errors/403.pl (-1 / +1 lines)
Lines 39-45 $template->param ( Link Here
39
    errno => 403,
39
    errno => 403,
40
);
40
);
41
my $status = '403 Forbidden';
41
my $status = '403 Forbidden';
42
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
42
if ( C4::Auth::psgi_env() ) {
43
    $status = '200 OK';
43
    $status = '200 OK';
44
}
44
}
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
(-)a/errors/404.pl (-1 / +1 lines)
Lines 39-45 $template->param ( Link Here
39
    errno => 404,
39
    errno => 404,
40
);
40
);
41
my $status = '404 Not Found';
41
my $status = '404 Not Found';
42
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
42
if ( C4::Auth::psgi_env() ) {
43
    $status = '200 OK';
43
    $status = '200 OK';
44
}
44
}
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
(-)a/errors/500.pl (-1 / +1 lines)
Lines 39-45 $template->param ( Link Here
39
    errno => 500,
39
    errno => 500,
40
);
40
);
41
my $status = '500 Internal Server Error';
41
my $status = '500 Internal Server Error';
42
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
42
if ( C4::Auth::psgi_env() ) {
43
    $status = '200 OK';
43
    $status = '200 OK';
44
}
44
}
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
(-)a/opac/errors/400.pl (-1 / +1 lines)
Lines 39-45 $template->param ( Link Here
39
    errno => 400,
39
    errno => 400,
40
);
40
);
41
my $status = '400 Bad Request';
41
my $status = '400 Bad Request';
42
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
42
if ( C4::Auth::psgi_env() ) {
43
    $status = '200 OK';
43
    $status = '200 OK';
44
}
44
}
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
(-)a/opac/errors/401.pl (-1 / +1 lines)
Lines 39-45 $template->param ( Link Here
39
    errno => 401,
39
    errno => 401,
40
);
40
);
41
my $status = '401 Unauthorized';
41
my $status = '401 Unauthorized';
42
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
42
if ( C4::Auth::psgi_env() ) {
43
    $status = '200 OK';
43
    $status = '200 OK';
44
}
44
}
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
(-)a/opac/errors/402.pl (-1 / +1 lines)
Lines 39-45 $template->param ( Link Here
39
    errno => 402,
39
    errno => 402,
40
);
40
);
41
my $status = '402 Payment Required';
41
my $status = '402 Payment Required';
42
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
42
if ( C4::Auth::psgi_env() ) {
43
    $status = '200 OK';
43
    $status = '200 OK';
44
}
44
}
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
(-)a/opac/errors/403.pl (-1 / +1 lines)
Lines 39-45 $template->param ( Link Here
39
    errno => 403,
39
    errno => 403,
40
);
40
);
41
my $status = '403 Forbidden';
41
my $status = '403 Forbidden';
42
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
42
if ( C4::Auth::psgi_env() ) {
43
    $status = '200 OK';
43
    $status = '200 OK';
44
}
44
}
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
(-)a/opac/errors/404.pl (-1 / +1 lines)
Lines 39-45 $template->param ( Link Here
39
    errno => 404,
39
    errno => 404,
40
);
40
);
41
my $status = '404 Not Found';
41
my $status = '404 Not Found';
42
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
42
if ( C4::Auth::psgi_env() ) {
43
    $status = '200 OK';
43
    $status = '200 OK';
44
}
44
}
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
(-)a/opac/errors/500.pl (-2 / +1 lines)
Lines 39-45 $template->param ( Link Here
39
    errno => 500,
39
    errno => 500,
40
);
40
);
41
my $status = '500 Internal Server Error';
41
my $status = '500 Internal Server Error';
42
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
42
if ( C4::Auth::psgi_env() ) {
43
    $status = '200 OK';
43
    $status = '200 OK';
44
}
44
}
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
45
output_with_http_headers $query, $cookie, $template->output, 'html', $status;
46
- 

Return to bug 27555