diff options
| author | Dustin Sallings <dustin@spy.net> | 2009-11-24 15:03:35 -0800 |
|---|---|---|
| committer | dormando <dormando@rydia.net> | 2009-11-26 21:45:13 -0800 |
| commit | 62a0cf9e0ba4592870b5e86e5cb2f79e1a78f9ba (patch) | |
| tree | 820bb631321e7c16af74a0234ba5c11c1023a0a5 /memcached.c | |
| parent | 6436b96cc4d78fec0ceb839e2d1cdf455c7385bd (diff) | |
| download | memcached-62a0cf9e0ba4592870b5e86e5cb2f79e1a78f9ba.tar.gz | |
Allow noreply mixed with 0 delay.1.4.4
Diffstat (limited to 'memcached.c')
| -rw-r--r-- | memcached.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/memcached.c b/memcached.c index 3428cc6..537fc86 100644 --- a/memcached.c +++ b/memcached.c @@ -2882,15 +2882,19 @@ static void process_delete_command(conn *c, token_t *tokens, const size_t ntoken assert(c != NULL); - if (ntokens == 4) { - if (strcmp(tokens[KEY_TOKEN+1].value, "0") != 0 - && !set_noreply_maybe(c, tokens, ntokens)) { + if (ntokens > 3) { + bool hold_is_zero = strcmp(tokens[KEY_TOKEN+1].value, "0") == 0; + bool sets_noreply = set_noreply_maybe(c, tokens, ntokens); + bool valid = (ntokens == 4 && (hold_is_zero || sets_noreply)) + || (ntokens == 5 && hold_is_zero && sets_noreply); + if (!valid) { out_string(c, "CLIENT_ERROR bad command line format. " "Usage: delete <key> [noreply]"); return; } } + key = tokens[KEY_TOKEN].value; nkey = tokens[KEY_TOKEN].length; @@ -2994,7 +2998,7 @@ static void process_command(conn *c, char *command) { process_arithmetic_command(c, tokens, ntokens, 0); - } else if (ntokens >= 3 && ntokens <= 4 && (strcmp(tokens[COMMAND_TOKEN].value, "delete") == 0)) { + } else if (ntokens >= 3 && ntokens <= 5 && (strcmp(tokens[COMMAND_TOKEN].value, "delete") == 0)) { process_delete_command(c, tokens, ntokens); |