Changeset c79fa6 for server/src/http/modules/ngx_http_memcached_module.c

Timestamp:

02/19/08 16:28:06 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

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

Children:

034113

Parents:

2a12f7 (diff), 2340f0 (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@…> (02/19/08 16:28:06)

git-committer:

Tomash Brechko <tomash.brechko@…> (02/19/08 16:28:06)

Message:

Merge branch 'memcached_hash'

File:

• server/src/http/modules/ngx_http_memcached_module.c (modified) (7 diffs)

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;
 
@@ -158 +159 @@
 
 static ngx_str_t  ngx_http_memcached_key = ngx_string("memcached_key");
+static ngx_str_t  ngx_http_memcached_ns = ngx_string("memcached_namespace");
 
 
@@ -235 +237 @@
 {
     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;
 
@@ -254 +256 @@
     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);
@@ -276 +286 @@
 
     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) {
@@ -588 +608 @@
      *
      *     conf->index = 0;
+     *     conf->ns_index = 0;
      */
 
@@ -697 +718 @@
     }
 
+    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;
 }