Changeset feb0c3 for server/src/http/ngx_http_special_response.c

Timestamp:

02/03/09 19:54:45 (3 years ago)

Author:

George Potapov <nephrite@…>

Branches:

master-v0.6, nginx-v0.6

Children:

209e69, 6c857c, e8c363f79fad03918abb189d5a026fd0cd6d14f4

Parents:

60af37

git-author:

George Potapov <nephrite@…> (02/03/09 19:54:45)

git-committer:

George Potapov <nephrite@…> (02/03/09 19:54:45)

Message:

vendor drop nginx 0.6.35

File:

• server/src/http/ngx_http_special_response.c (modified) (2 diffs)

server/src/http/ngx_http_special_response.c

@@ -379 +379 @@
     }
 
+    r->expect_tested = 1;
+
     if (ngx_http_discard_request_body(r) != NGX_OK) {
         error = NGX_HTTP_INTERNAL_SERVER_ERROR;
@@ -431 +433 @@
 {
     u_char                     ch, *p, *last;
+    ngx_int_t                  overwrite;
     ngx_str_t                 *uri, *args, u, a;
     ngx_table_elt_t           *location;
     ngx_http_core_loc_conf_t  *clcf;
 
-    r->err_status = err_page->overwrite;
+    overwrite = err_page->overwrite;
+
+    if (overwrite && overwrite != NGX_HTTP_OK) {
+        r->expect_tested = 1;
+    }
+
+    r->err_status = overwrite;
 
     r->zero_in_uri = 0;