commit ad5ef15e087983d1981a62d04f5fce6d9974f65c
author Maxim Dounin <mdounin@mdounin.ru> Tue Sep 27 11:11:30 2011 +0000
committer Maxim Dounin <mdounin@mdounin.ru> Tue Sep 27 11:11:30 2011 +0000
tree d00762c10b0cfc3d63fcdb810222db51ae0863dc
parent bfb42ad97c2ef1b04933b521f20540e7391e495e

Fix for double content when return is used in error_page handler.

Test case:

   location / {
       error_page 405 /nope;
       return 405;
   }

   location /nope {
       return 200;
   }

This is expected to return 405 with empty body, but in 0.8.42+ will return
builtin 405 error page as well (though not counted in Content-Length, thus
breaking protocol).

Fix is to use status provided by rewrite script execution in case
it's less than NGX_HTTP_BAD_REQUEST even if r->error_status set.  This
check is in line with one in ngx_http_script_return_code().

Note that this patch also changes behaviour for "return 302 ..." and
"rewrite ... redirect" used as error handler.  E.g.

    location / {
        error_page 405 /redirect;
        return 405;
    }

    location /redirect {
        rewrite ^ http://example.com/;
    }

will actually return redirect to "http://example.com/" instead of builtin 405
error page with meaningless Location header.  This looks like correct change
and it's in line with what happens on e.g. directory redirects in error
handlers.