Mercurial > hg > nginx-quic
comparison src/http/modules/ngx_http_memcached_module.c @ 1347:142d979bc738 stable-0.5
r1333, r1334 merge:
omit unnecessary code,
escape space, etc in $memcached_key
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sun, 29 Jul 2007 17:27:10 +0000 |
parents | 82a8ffe51d11 |
children | d5db0e96bcc6 |
comparison
equal
deleted
inserted
replaced
1346:175edf225f10 | 1347:142d979bc738 |
---|---|
224 | 224 |
225 static ngx_int_t | 225 static ngx_int_t |
226 ngx_http_memcached_create_request(ngx_http_request_t *r) | 226 ngx_http_memcached_create_request(ngx_http_request_t *r) |
227 { | 227 { |
228 size_t len; | 228 size_t len; |
229 uintptr_t escape; | |
229 ngx_buf_t *b; | 230 ngx_buf_t *b; |
230 ngx_chain_t *cl; | 231 ngx_chain_t *cl; |
231 ngx_http_memcached_ctx_t *ctx; | 232 ngx_http_memcached_ctx_t *ctx; |
232 ngx_http_variable_value_t *vv; | 233 ngx_http_variable_value_t *vv; |
233 ngx_http_memcached_loc_conf_t *mlcf; | 234 ngx_http_memcached_loc_conf_t *mlcf; |
240 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | 241 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
241 "the \"$memcached_key\" variable is not set"); | 242 "the \"$memcached_key\" variable is not set"); |
242 return NGX_ERROR; | 243 return NGX_ERROR; |
243 } | 244 } |
244 | 245 |
245 len = sizeof("get ") - 1 + vv->len + sizeof(CRLF) - 1; | 246 escape = 2 * ngx_escape_uri(NULL, vv->data, vv->len, NGX_ESCAPE_MEMCACHED); |
246 if (vv->len) { | 247 |
247 len += 1 + vv->len; | 248 len = sizeof("get ") - 1 + vv->len + escape + sizeof(CRLF) - 1; |
248 } | |
249 | 249 |
250 b = ngx_create_temp_buf(r->pool, len); | 250 b = ngx_create_temp_buf(r->pool, len); |
251 if (b == NULL) { | 251 if (b == NULL) { |
252 return NGX_ERROR; | 252 return NGX_ERROR; |
253 } | 253 } |
266 | 266 |
267 ctx = ngx_http_get_module_ctx(r, ngx_http_memcached_module); | 267 ctx = ngx_http_get_module_ctx(r, ngx_http_memcached_module); |
268 | 268 |
269 ctx->key.data = b->last; | 269 ctx->key.data = b->last; |
270 | 270 |
271 b->last = ngx_copy(b->last, vv->data, vv->len); | 271 if (escape == 0) { |
272 b->last = ngx_copy(b->last, vv->data, vv->len); | |
273 | |
274 } else { | |
275 b->last = (u_char *) ngx_escape_uri(b->last, vv->data, vv->len, | |
276 NGX_ESCAPE_MEMCACHED); | |
277 } | |
272 | 278 |
273 ctx->key.len = b->last - ctx->key.data; | 279 ctx->key.len = b->last - ctx->key.data; |
274 | 280 |
275 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | 281 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
276 "http memcached request: \"%V\"", &ctx->key); | 282 "http memcached request: \"%V\"", &ctx->key); |