# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1159778231 0
# Node ID 7b71936d52996ac1dc7cc97c069876365e9b31b6
# Parent  86862ad988da15a0dab7e1a283f26e9bec7d1fae
fix: "return" always overrode "error_page" response code

diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c
--- 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_reques
         code(e);
     }
 
-    return e->status;
+    if (r->err_status == 0) {
+        return e->status;
+    }
+
+    return r->err_status;
 }