Changeset 1233ec

Timestamp:

04/13/08 13:20:27 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

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

Children:

ca9838, f54237

Parents:

afcdaf (diff), 56389f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Tomash Brechko <tomash.brechko@…> (04/13/08 13:20:27)

git-committer:

Tomash Brechko <tomash.brechko@…> (04/13/08 13:20:27)

Message:

Merge branch 'memcached_gzip'

Files:

• memcached_hash/Changes (added)
• memcached_hash/README (added)
• memcached_hash/TODO (added)
• memcached_hash/config (added)
• memcached_hash/dist.sh (added)
• memcached_hash/nginx.conf (added)
• memcached_hash/ngx_http_upstream_memcached_hash_module.c (added)
• memcached_hash/populate.pl (added)
• server/src/core/nginx.c (modified) (1 diff)
• server/src/core/ngx_crc32.c (modified) (1 diff)
• server/src/core/ngx_crc32.h (modified) (1 diff)
• server/src/core/ngx_string.h (modified) (1 diff)
• server/src/http/modules/ngx_http_fastcgi_module.c (modified) (1 diff)
• server/src/http/modules/ngx_http_gzip_filter_module.c (modified) (1 diff)
• server/src/http/modules/ngx_http_memcached_module.c (modified) (7 diffs)
• server/src/http/modules/ngx_http_proxy_module.c (modified) (1 diff)
• server/src/http/ngx_http_upstream.c (modified) (4 diffs)
• server/src/http/ngx_http_upstream.h (modified) (2 diffs)
• server/src/http/ngx_http_variables.c (modified) (2 diffs)

server/src/core/nginx.c

@@ -274 +274 @@
     }
 
-    /* ngx_crc32_init() requires ngx_cacheline_size set in ngx_os_init() */
-
-    if (ngx_crc32_init() != NGX_OK) {
+    /*
+     * ngx_crc32_table_init() requires ngx_cacheline_size set in ngx_os_init()
+     */
+
+    if (ngx_crc32_table_init() != NGX_OK) {
         return 1;
     }

server/src/core/ngx_crc32.c

@@ -103 +103 @@
 
 ngx_int_t
-ngx_crc32_init(void)
+ngx_crc32_table_init(void)
 {
     void  *p;

server/src/core/ngx_crc32.h

@@ -50 +50 @@
 
 
-ngx_int_t ngx_crc32_init(void);
+#define ngx_crc32_init(crc)                                                   \
+    crc = 0xffffffff
+
+
+static ngx_inline void
+ngx_crc32_update(uint32_t *crc, u_char *p, size_t len)
+{
+    uint32_t  c;
+
+    c = *crc;
+
+    while (len--) {
+        c = ngx_crc32_table256[(c ^ *p++) & 0xff] ^ (c >> 8);
+    }
+
+    *crc = c;
+}
+
+
+#define ngx_crc32_final(crc)                                                  \
+    crc ^= 0xffffffff
+
+
+ngx_int_t ngx_crc32_table_init(void);
 
 

server/src/core/ngx_string.h

@@ -64 +64 @@
 #define ngx_memset(buf, c, n)     (void) memset(buf, c, n)
 
+#define ngx_memmove(dst, src, n)  (void) memmove(dst, src, n)
 
 #if (NGX_MEMCPY_LIMIT)

server/src/http/modules/ngx_http_fastcgi_module.c

@@ -180 +180 @@
     { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER },
     { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 },
+    { ngx_string("http_502"), NGX_HTTP_UPSTREAM_FT_HTTP_502 },
     { 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_gzip_filter_module.c

@@ -629 +629 @@
                  * On decompression we could already output everything
                  * under (ctx->flush == Z_SYNC_FLUSH), so we test here
-                 * that the buffer is not empty.
+                 * that the buffer is not empty, or Transfer-Encoding:
+                 * is chunked.  In the latter case we output empty
+                 * buffer to get last zero length chunk.
                  */
-                if (!r->gunzip || ctx->out_buf->last > ctx->out_buf->pos) {
+                if (!r->gunzip || ctx->out_buf->last > ctx->out_buf->pos
+                    || r->chunked) {
                     cl->buf = ctx->out_buf;
                     cl->next = NULL;

server/src/http/modules/ngx_http_memcached_module.c

@@ -15 +15 @@
     ngx_int_t                  index;
     ngx_uint_t                 gzip_flag;
+    ngx_int_t                  ns_index;
 } ngx_http_memcached_loc_conf_t;
 
@@ -159 +160 @@
 
 static ngx_str_t  ngx_http_memcached_key = ngx_string("memcached_key");
+static ngx_str_t  ngx_http_memcached_ns = ngx_string("memcached_namespace");
 
 
@@ -236 +238 @@
 {
     size_t                          len;
-    uintptr_t                       escape;
+    uintptr_t                       escape, ns_escape = 0;
     ngx_buf_t                      *b;
     ngx_chain_t                    *cl;
     ngx_http_memcached_ctx_t       *ctx;
-    ngx_http_variable_value_t      *vv;
+    ngx_http_variable_value_t      *vv, *ns_vv;
     ngx_http_memcached_loc_conf_t  *mlcf;
 
@@ -255 +257 @@
     escape = 2 * ngx_escape_uri(NULL, vv->data, vv->len, NGX_ESCAPE_MEMCACHED);
 
-    len = sizeof("get ") - 1 + vv->len + escape + sizeof(CRLF) - 1;
+    ns_vv = ngx_http_get_indexed_variable(r, mlcf->ns_index);
+
+    if (ns_vv != NULL && !ns_vv->not_found && ns_vv->len != 0) {
+        ns_escape = 2 * ngx_escape_uri(NULL, ns_vv->data,
+                                       ns_vv->len, NGX_ESCAPE_MEMCACHED);
+    }
+
+    len = sizeof("get ") - 1 + ns_vv->len + ns_escape
+                             + vv->len + escape + sizeof(CRLF) - 1;
 
     b = ngx_create_temp_buf(r->pool, len);
@@ -277 +287 @@
 
     ctx->key.data = b->last;
+
+    if (ns_vv != NULL && !ns_vv->not_found && ns_vv->len != 0) {
+        if (ns_escape == 0) {
+            b->last = ngx_copy(b->last, ns_vv->data, ns_vv->len);
+        } else {
+            b->last = (u_char *) ngx_escape_uri(b->last, ns_vv->data,
+                                                ns_vv->len,
+                                                NGX_ESCAPE_MEMCACHED);
+        }
+    }
 
     if (escape == 0) {
@@ -589 +609 @@
      *
      *     conf->index = 0;
+     *     conf->ns_index = 0;
      */
 
@@ -698 +719 @@
     }
 
+    lcf->ns_index = ngx_http_get_variable_index(cf, &ngx_http_memcached_ns);
+
+    if (lcf->ns_index == NGX_ERROR) {
+        return NGX_CONF_ERROR;
+    }
+
     return NGX_CONF_OK;
 }

server/src/http/modules/ngx_http_proxy_module.c

@@ -134 +134 @@
     { ngx_string("invalid_header"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER },
     { ngx_string("http_500"), NGX_HTTP_UPSTREAM_FT_HTTP_500 },
+    { ngx_string("http_502"), NGX_HTTP_UPSTREAM_FT_HTTP_502 },
     { 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

@@ -1094 +1094 @@
     }
 
+    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
@@ -2173 +2212 @@
         switch(ft_type) {
 
+        case NGX_HTTP_UPSTREAM_FT_HTTP_504:
         case NGX_HTTP_UPSTREAM_FT_TIMEOUT:
             status = NGX_HTTP_GATEWAY_TIME_OUT;
@@ -2183 +2223 @@
         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;
 
@@ -3139 +3191 @@
     }
 
+    us->name = u.url;
     us->addrs = u.addrs;
     us->naddrs = u.naddrs;

server/src/http/ngx_http_upstream.h

@@ -25 +25 @@
 #define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK       0x00000080
 #define NGX_HTTP_UPSTREAM_FT_MAX_WAITING     0x00000100
+#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
 
@@ -65 +68 @@
 
 typedef struct {
+    ngx_str_t                       name;
     ngx_peer_addr_t                *addrs;
     ngx_uint_t                      naddrs;

server/src/http/ngx_http_variables.c

@@ -1313 +1313 @@
 
 
+static ngx_int_t
+ngx_http_optional_variable(ngx_http_request_t *r,
+    ngx_http_variable_value_t *v, uintptr_t data)
+{
+    *v = ngx_http_variable_null_value;
+    return NGX_OK;
+}
+
+
 ngx_int_t
 ngx_http_variables_init_vars(ngx_conf_t *cf)
@@ -1374 +1383 @@
         }
 
+        if (ngx_strncmp(v[i].name.data, "memcached_namespace", 19) == 0) {
+            v[i].get_handler = ngx_http_optional_variable;
+
+            continue;
+        }
+
         ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                       "unknown \"%V\" variable", &v[i].name);