[Rt-commit] rt branch, 4.4/migrate-cgi-env, repushed

[? sunnavy]

The branch 4.4/migrate-cgi-env was deleted and repushed:
       was 219e575da00f389624d5234dcfd7b5424479fbb3
       now 7b1e70ab9a50e10a667f117ce1bb049fbf777c85

1:  a12a694 = 1:  a12a694 abstract usage of cgi env variables
2:  75551ee ! 2:  afd7e41 use psgi env directly
    @@ -92,21 +92,34 @@
                  my $res = $self->CheckModPerlHandler($env);
                  return $self->_psgi_response_cb( $res->finalize ) if $res;
     @@
    +         }
    +         $env->{PATH_INFO} = $self->_mason_dir_index( $h->interp, $req->path_info);
      
    -         my $ret;
    -         {
    +-        my $ret;
    +-        {
     -            # XXX: until we get rid of all $ENV stuff.
     -            local %ENV = (%ENV, CGI::Emulate::PSGI->emulate_environment($env));
     -
    -             $ret = $h->handle_psgi($env);
    -         }
    +-            $ret = $h->handle_psgi($env);
    +-        }
    +-
    +-        $RT::Logger->crit($@) if $@ && $RT::Logger;
    +-        warn $@ if $@ && !$RT::Logger;
    +-        if (ref($ret) eq 'CODE') {
    +-            my $orig_ret = $ret;
    +-            $ret = sub {
    +-                my $respond = shift;
    +-                local %ENV = (%ENV, CGI::Emulate::PSGI->emulate_environment($env));
    +-                $orig_ret->($respond);
    +-            };
    +-        }
    +-
    +-        return $self->_psgi_response_cb($ret,
    +-                                        sub {
    +-                                            $self->CleanupRequest()
    +-                                        });
    ++        return $self->_psgi_response_cb($h->handle_psgi($env), sub { $self->CleanupRequest() });
    +     };
      
    -@@
    -             my $orig_ret = $ret;
    -             $ret = sub {
    -                 my $respond = shift;
    --                local %ENV = (%ENV, CGI::Emulate::PSGI->emulate_environment($env));
    -                 $orig_ret->($respond);
    -             };
    -         }
    +     my $app = $self->StaticWrap($mason);
     
3:  219e575 = 3:  7b1e70a update the mock of $m to reflect the cgi env migration