mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-11-27 23:49:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

merge r3488:

Browse Source 
revert partially r1555 and fix the error "memcached sent invalid trailer"
This commit is contained in:
Igor Sysoev 2010-06-07 11:49:03 +00:00
parent 6b2bcfcd0d
commit 7fbe27b79f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/http/modules/ngx_http_memcached_module.c
View File

@ -423,15 +423,20 @@ ngx_http_memcached_filter(void *data, ssize_t bytes)
if (ngx_strncmp(b->last,
ngx_http_memcached_end + NGX_HTTP_MEMCACHED_END - ctx->rest,
ctx->rest)
bytes)
!= 0)
{
ngx_log_error(NGX_LOG_ERR, ctx->request->connection->log, 0,
"memcached sent invalid trailer");
u->length = 0;
ctx->rest = 0;
return NGX_OK;
}
u->length = 0;
ctx->rest = 0;
u->length -= bytes;
ctx->rest -= bytes;
return NGX_OK;
}