On Mon, Nov 12, 2007 at 09:40:29 -0800, Steven Grimm wrote: > This seems obviously correct to me. I will commit it. Thanks.
Steven, when you committed my patch, you re-edited the whitespace, and introduced some invalid characters (that are invisible at least in UTF-8). Could you please apply the attached whitespace fix then? Though I'm not sure the patch will survive the transfer. If not, please re-edit leading whitespace of the lines marked with leading minus. Place spaces there. Thanks! I guess it's the problem of several text editors. Every now and then I see mail with funny chars instead of ' or ". -- Tomash Brechko
--- Begin Message ------ trunk/server/memcached.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/trunk/server/memcached.c b/trunk/server/memcached.c index 73795ed..9e7c6a5 100644 --- a/trunk/server/memcached.c +++ b/trunk/server/memcached.c @@ -1229,13 +1229,13 @@ static inline void process_get_command(conn *c, token_t *tokens, size_t ntokens, if (settings.verbose > 1) fprintf(stderr, ">%d END\n", c->sfd); - Â Â Â /* - Â Â Â Â Â If the loop was terminated because of out-of-memory, it is not - Â Â Â Â Â reliable to add END\r\n to the buffer, because it might not end - Â Â Â Â Â in \r\n. Â So we send SERVER_ERROR instead. - Â Â Â */ - Â Â Â if (key_token->value != NULL || add_iov(c, "END\r\n", 5) != 0 - Â Â Â Â Â Â Â || (c->udp && build_udp_headers(c) != 0)) { + /* + If the loop was terminated because of out-of-memory, it is not + reliable to add END\r\n to the buffer, because it might not end + in \r\n. Â So we send SERVER_ERROR instead. + */ + if (key_token->value != NULL || add_iov(c, "END\r\n", 5) != 0 + || (c->udp && build_udp_headers(c) != 0)) { out_string(c, "SERVER_ERROR out of memory"); } else { -- 1.5.3.5.652.gf192c
--- End Message ---
