Mercurial > hg > nginx
view src/os/win32/ngx_errno.c @ 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 | e294f37401c0 |
children | d620f497c50f |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev */ #include <ngx_config.h> #include <ngx_core.h> u_char * ngx_strerror(ngx_err_t err, u_char *errstr, size_t size) { u_int len; static u_long lang = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US); if (size == 0) { return errstr; } len = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, lang, (char *) errstr, size, NULL); if (len == 0 && lang && GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND) { /* * Try to use English messages first and fallback to a language, * based on locale: non-English Windows have no English messages * at all. This way allows to use English messages at least on * Windows with MUI. */ lang = 0; len = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, lang, (char *) errstr, size, NULL); } if (len == 0) { return ngx_snprintf(errstr, size, "FormatMessage() error:(%d)", GetLastError()); } /* remove ".\r\n\0" */ while (errstr[len] == '\0' || errstr[len] == CR || errstr[len] == LF || errstr[len] == '.') { --len; } return &errstr[++len]; } ngx_uint_t ngx_strerror_init(void) { return NGX_OK; }