Re: gitweb: in-page errors don't work with mod_perl
- From
Jürgen Kreileder <jk@blackdown.de>
- Date
- Nov 28, 2011, 00:20 UTC
- Message-ID
- <CAKD0UuwJoRkd7J06d2mFgyN0tO8p8ETPrwW5DqX12m+c_tQz4A@mail.gmail.com>
- In-Reply-To
- <m339d9mbiu.fsf@localhost.localdomain>
2011/11/27 Jakub Narebski <jnareb@gmail.com>:
Show 10 quoted lines
> Jürgen Kreileder <jk@blackdown.de> writes: > >> when gitweb.perl (208a1cc3d3) is run with mod_perl2 (2.0.5-2ubuntu1 on >> Ubuntu 11.10) custom error pages don't work: Any page with status != >> 200 shows the plain Apache error document instead of a gitweb's error >> page. > > Thanks for reporting it. I wonder if it worked at all anytime... > > Anyway, does the following patch fixes this issue for you?
Not really. It does make the errors appear inline on the standard gitweb pages. But the HTTP status code is broken now: It's always 200 OK.
Show 26 quoted lines
> Reported-by: Jürgen Kreileder <jk@blackdown.de>
> Signed-off-by: Jakub Narębski <jnareb@gmail.com>
> ---
> gitweb/gitweb.perl | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 4f0c3bd..f51cce1 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -1239,6 +1239,11 @@ sub run {
>
> run();
>
> +if ($ENV{'MOD_PERL'}) {
> + # mod_perl needs to be told that error page was already created
> + my $r = $cgi->r;
> + $r->status(200);
> +}
> if (defined caller) {
> # wrapped in a subroutine processing requests,
> # e.g. mod_perl with ModPerl::Registry, or PSGI with Plack::App::WrapCGI
> --
> 1.7.6
>
>Jürgen