Mercurial > hg > nginx-quic
view auto/lib/perl/conf @ 4147:7f64de1cc2c0
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 27 Sep 2011 11:11:30 +0000 |
parents | 9581fba9ea12 |
children | d620f497c50f |
line wrap: on
line source
# Copyright (C) Igor Sysoev echo "checking for perl" NGX_PERL_VER=`$NGX_PERL -v 2>&1 | grep '^This is perl' 2>&1 \ | sed -e 's/^This is perl, \(.*\)/\1/'` if test -n "$NGX_PERL_VER"; then echo " + perl version: $NGX_PERL_VER" if [ "`echo 'use 5.006001; print "OK"' | $NGX_PERL 2>&1`" != OK ]; then echo echo "$0: error: perl 5.6.1 or higher is required" echo exit 1; fi NGX_PERL_CFLAGS="$CFLAGS `$NGX_PERL -MExtUtils::Embed -e ccopts`" NGX_PM_CFLAGS=`$NGX_PERL -MExtUtils::Embed -e ccopts` # gcc 4.1/4.2 warn about unused values in pTHX_ NGX_PERL_CFLAGS=`echo $NGX_PERL_CFLAGS \ | sed -e 's/-Wunused-value/-Wno-unused-value/'` # icc8 warns 'declaration hides parameter "my_perl"' in ENTER and LEAVE NGX_PERL_CFLAGS=`echo $NGX_PERL_CFLAGS \ | sed -e 's/-wd171/-wd171 -wd1599/'` ngx_perl_ldopts=`$NGX_PERL -MExtUtils::Embed -e ldopts` if $NGX_PERL -V:usemultiplicity | grep define > /dev/null; then have=NGX_HAVE_PERL_MULTIPLICITY . auto/have echo " + perl interpreter multiplicity found" fi if $NGX_PERL -V:useithreads | grep undef > /dev/null; then # FreeBSD port wants to link with -pthread non-threaded perl ngx_perl_ldopts=`echo $ngx_perl_ldopts | sed 's/ -pthread//'` fi CORE_LINK="$CORE_LINK $ngx_perl_ldopts" LINK_DEPS="$LINK_DEPS $NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.so" if test -n "$NGX_PERL_MODULES"; then have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\"" . auto/define NGX_PERL_MODULES_MAN=$NGX_PERL_MODULES/man3 fi else echo echo "$0: error: perl 5.6.1 or higher is required" echo exit 1; fi