Changeset 66a597

Timestamp:

01/14/08 12:32:34 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master-v0.7, master-v0.6, next_upstream, upstream_count_limit

Children:

f54237

Parents:

1abb3d

git-author:

Tomash Brechko <tomash.brechko@…> (01/14/08 12:32:34)

git-committer:

Tomash Brechko <tomash.brechko@…> (01/14/08 12:32:34)

Message:

Add "http_507" to proxy_next_upstream/fastcgi_next_upstream.

Add support for "http_507" parameter in "proxy_next_upstream"
and "fastcgi_next_upstream" directives.

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) (2 diffs)
• ngx_http_upstream.h (modified) (1 diff)

server/src/http/modules/ngx_http_fastcgi_module.c

@@ -183 +183 @@
     { 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

@@ -137 +137 @@
     { 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

@@ -1124 +1124 @@
     }
 
+    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)
@@ -2223 +2233 @@
             break;
 
+        case NGX_HTTP_UPSTREAM_FT_HTTP_507:
+            status = NGX_HTTP_INSUFFICIENT_STORAGE;
+            break;
+
         /*
          * NGX_HTTP_UPSTREAM_FT_BUSY_LOCK and NGX_HTTP_UPSTREAM_FT_MAX_WAITING

server/src/http/ngx_http_upstream.h

@@ -27 +27 @@
 #define NGX_HTTP_UPSTREAM_FT_HTTP_502        0x00000200
 #define NGX_HTTP_UPSTREAM_FT_HTTP_504        0x00000400
+#define NGX_HTTP_UPSTREAM_FT_HTTP_507        0x00000800
 #define NGX_HTTP_UPSTREAM_FT_OFF             0x80000000