aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2006-10-02 08:37:11 +0000
committerIgor Sysoev <igor@sysoev.ru>2006-10-02 08:37:11 +0000
commit97c7e1a98621857a5eb2d44c477f7f6384417b52 (patch)
tree884f4df65dfd91fe4634168004c0f45873f10154 /src
parent4c7f5113645ffdcf9d701bf32b4e8ff1492e5f45 (diff)
downloadnginx-97c7e1a98621857a5eb2d44c477f7f6384417b52.tar.gz
nginx-97c7e1a98621857a5eb2d44c477f7f6384417b52.zip
fix: "return" always overrode "error_page" response code
Diffstat (limited to 'src')
-rw-r--r--src/http/modules/ngx_http_rewrite_module.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c
index 6db1bc06f..31923755d 100644
--- a/src/http/modules/ngx_http_rewrite_module.c
+++ b/src/http/modules/ngx_http_rewrite_module.c
@@ -178,7 +178,11 @@ ngx_http_rewrite_handler(ngx_http_request_t *r)
code(e);
}
- return e->status;
+ if (r->err_status == 0) {
+ return e->status;
+ }
+
+ return r->err_status;
}