Changeset e7b311 for server/src/http/ngx_http_upstream.c

Timestamp:

02/03/09 19:41:37 (3 years ago)

Author:

George Potapov <nephrite@…>

Branches:

master-v0.7, nginx-v0.7, nginx-v0.8, upstream_count_limit

Children:

2ac4f5

Parents:

2240a4

git-author:

George Potapov <nephrite@…> (02/03/09 19:41:37)

git-committer:

George Potapov <nephrite@…> (02/03/09 19:41:37)

Message:

vendor drop nginx 0.7.31

File:

• server/src/http/ngx_http_upstream.c (modified) (5 diffs)

server/src/http/ngx_http_upstream.c

@@ -1442 +1442 @@
         }
 
-        if (status == NGX_HTTP_NOT_FOUND && u->conf->intercept_404) {
-            ngx_http_upstream_finalize_request(r, u, NGX_HTTP_NOT_FOUND);
-            return NGX_OK;
-        }
-
 #if (NGX_HTTP_CACHE)
 
@@ -1472 +1467 @@
     ngx_http_core_loc_conf_t  *clcf;
 
+    status = u->headers_in.status_n;
+
+    if (status == NGX_HTTP_NOT_FOUND && u->conf->intercept_404) {
+        ngx_http_upstream_finalize_request(r, u, NGX_HTTP_NOT_FOUND);
+        return NGX_OK;
+    }
+
     if (!u->conf->intercept_errors) {
         return NGX_DECLINED;
@@ -1481 +1483 @@
         return NGX_DECLINED;
     }
-
-    status = u->headers_in.status_n;
 
     err_page = clcf->error_pages->elts;
@@ -2202 +2202 @@
 ngx_http_upstream_process_request(ngx_http_request_t *r)
 {
+    ngx_uint_t            del;
     ngx_temp_file_t      *tf;
     ngx_event_pipe_t     *p;
@@ -2213 +2214 @@
         if (u->store) {
 
+            del = p->upstream_error;
+
             tf = u->pipe->temp_file;
 
-            if (p->upstream_eof
-                && u->headers_in.status_n == NGX_HTTP_OK
-                && (u->headers_in.content_length_n == -1
-                    || (u->headers_in.content_length_n == tf->offset)))
-            {
-                ngx_http_upstream_store(r, u);
-
-            } else if ((p->upstream_error
-                        || (p->upstream_eof
-                            && u->headers_in.status_n != NGX_HTTP_OK))
-                       && tf->file.fd != NGX_INVALID_FILE)
-            {
+            if (p->upstream_eof) {
+
+                if (u->headers_in.status_n == NGX_HTTP_OK
+                    && (u->headers_in.content_length_n == -1
+                        || (u->headers_in.content_length_n == tf->offset)))
+                {
+                    ngx_http_upstream_store(r, u);
+
+                } else {
+                    del = 1;
+                }
+            }
+
+            if (del && tf->file.fd != NGX_INVALID_FILE) {
+
                 if (ngx_delete_file(tf->file.name.data) == NGX_FILE_ERROR) {