Changeset b6797e

Timestamp:

02/04/09 21:15:09 (3 years ago)

Author:

George Potapov <nephrite@…>

Branches:

master-v0.7, upstream_count_limit

Children:

ad7c65, c522ec

Parents:

a81aea

git-author:

George Potapov <nephrite@…> (02/04/09 21:15:09)

git-committer:

George Potapov <nephrite@…> (02/04/09 21:15:09)

Message:

removed duplicate code which interfered with upstream request processing

Location:

server/src/http

Files:

• modules/ngx_http_fastcgi_module.c (modified) (1 diff)
• modules/ngx_http_proxy_module.c (modified) (1 diff)
• ngx_http_upstream.c (modified) (4 diffs)
• ngx_http_upstream.h (modified) (1 diff)

server/src/http/modules/ngx_http_fastcgi_module.c

@@ -166 +166 @@
     { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
     { ngx_string("http_504"), NGX_HTTP_UPSTREAM_FT_HTTP_504 },
-    { ngx_string("http_507"), NGX_HTTP_UPSTREAM_FT_HTTP_507 },
     { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
     { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },

server/src/http/modules/ngx_http_proxy_module.c

@@ -152 +152 @@
     { ngx_string("http_503"), NGX_HTTP_UPSTREAM_FT_HTTP_503 },
     { ngx_string("http_504"), NGX_HTTP_UPSTREAM_FT_HTTP_504 },
-    { ngx_string("http_507"), NGX_HTTP_UPSTREAM_FT_HTTP_507 },
     { ngx_string("http_404"), NGX_HTTP_UPSTREAM_FT_HTTP_404 },
     { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },

server/src/http/ngx_http_upstream.c

@@ -1125 +1125 @@
     ngx_http_upstream_header_t     *hh;
     ngx_http_upstream_main_conf_t  *umcf;
-    ngx_http_core_loc_conf_t       *clcf;
-    ngx_http_err_page_t            *err_page;
 
     c = u->peer.connection;
@@ -1257 +1255 @@
         if (ngx_http_upstream_intercept_errors(r, u) == NGX_OK) {
             return;
-        }
-    }
-
-    if (u->headers_in.status_n == NGX_HTTP_BAD_GATEWAY) {
-
-        if (u->peer.tries > 1
-            && u->conf->next_upstream & NGX_HTTP_UPSTREAM_FT_HTTP_502)
-        {
-            ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_HTTP_502);
-            return;
-        }
-    }
-
-    if (u->headers_in.status_n == NGX_HTTP_SERVICE_UNAVAILABLE) {
-
-        if (u->peer.tries > 1
-            && u->conf->next_upstream & NGX_HTTP_UPSTREAM_FT_HTTP_503)
-        {
-            ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_HTTP_503);
-            return;
-        }
-    }
-
-    if (u->headers_in.status_n == NGX_HTTP_GATEWAY_TIME_OUT) {
-
-        if (u->peer.tries > 1
-            && u->conf->next_upstream & NGX_HTTP_UPSTREAM_FT_HTTP_504)
-        {
-            ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_HTTP_504);
-            return;
-        }
-    }
-
-    if (u->headers_in.status_n == NGX_HTTP_INSUFFICIENT_STORAGE) {
-
-        if (u->peer.tries > 1
-            && u->conf->next_upstream & NGX_HTTP_UPSTREAM_FT_HTTP_507)
-        {
-            ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_HTTP_507);
-            return;
-        }
-    }
-
-    if (u->headers_in.status_n >= NGX_HTTP_BAD_REQUEST
-        && u->conf->intercept_errors)
-    {
-        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-
-        if (clcf->error_pages) {
-
-            err_page = clcf->error_pages->elts;
-            for (i = 0; i < clcf->error_pages->nelts; i++) {
-                if (err_page[i].status == (ngx_int_t) u->headers_in.status_n) {
-
-                    if (u->headers_in.status_n == NGX_HTTP_UNAUTHORIZED) {
-
-                        r->headers_out.www_authenticate =
-                                        ngx_list_push(&r->headers_out.headers);
-
-                        if (r->headers_out.www_authenticate == NULL) {
-                            ngx_http_upstream_finalize_request(r, u,
-                                               NGX_HTTP_INTERNAL_SERVER_ERROR);
-                            return;
-                        }
-
-                        *r->headers_out.www_authenticate =
-                                               *u->headers_in.www_authenticate;
-                    }
-
-                    ngx_http_upstream_finalize_request(r, u,
-                                                       u->headers_in.status_n);
-                    return;
-                }
-            }
         }
     }
@@ -2480 +2404 @@
         switch(ft_type) {
 
-        case NGX_HTTP_UPSTREAM_FT_HTTP_504:
         case NGX_HTTP_UPSTREAM_FT_TIMEOUT:
             status = NGX_HTTP_GATEWAY_TIME_OUT;
@@ -2491 +2414 @@
         case NGX_HTTP_UPSTREAM_FT_HTTP_404:
             status = NGX_HTTP_NOT_FOUND;
-            break;
-
-        case NGX_HTTP_UPSTREAM_FT_HTTP_502:
-            status = NGX_HTTP_BAD_GATEWAY;
-            break;
-
-        case NGX_HTTP_UPSTREAM_FT_HTTP_503:
-            status = NGX_HTTP_SERVICE_UNAVAILABLE;
-            break;
-
-        case NGX_HTTP_UPSTREAM_FT_HTTP_507:
-            status = NGX_HTTP_INSUFFICIENT_STORAGE;
             break;
 

server/src/http/ngx_http_upstream.h

@@ -27 +27 @@
 #define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK       0x00000200
 #define NGX_HTTP_UPSTREAM_FT_MAX_WAITING     0x00000400
-#define NGX_HTTP_UPSTREAM_FT_HTTP_507        0x00000800
 #define NGX_HTTP_UPSTREAM_FT_NOLIVE          0x40000000
 #define NGX_HTTP_UPSTREAM_FT_OFF             0x80000000