Deny EXEC under out of memory

diff --git a/Changelog b/Changelog
index 13871ebfc15ad1cd3f9f8ad7a60a836076879380..79355e4cd053a43fad67e817d842febc7208cba0 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,35 @@
+2010-03-29 No timeouts nor other commands for clients in a Pub/Sub context
+2010-03-29 free hash table entries about no longer active classes, so that PUBSUB can be abused with millions of different classes
+2010-03-29 Fixed a refcount stuff leading to PUBSUB crashes
+2010-03-29 fmacros added to linenoise, avoiding all the nice warnings...
+2010-03-29 First pubsub fix
+2010-03-29 PUBSUB implemented
+2010-03-29 Redis version is now 1.3.8
+2010-03-26 Merge branch 'hincrby' of git://github.com/pietern/redis
+2010-03-26 removed unnecessary refcount increase that caused the HINCRBY memleak
+2010-03-26 implements HINCRBY and tests (todo: find and fix small memleak)
+2010-03-26 Removed a useless if spotted by Pieter Noordhuis
+2010-03-26 Fixed a critical replication bug: binary values issued with the multi bulk protocol caused a protocol desync with slaves.
+2010-03-24 Fixed the reply about denied  write commands under maxmemory reached condition: now the error will no longer lead to a client-server protocol desync
+2010-03-24 CONFIG command implemened -- just a start but already useful
+2010-03-24 redis-cli prompt is now redis>
+2010-03-23 with --help states that you can use - as config file name to feed config via stdin
+2010-03-23 New INFO field: expired_keys
+2010-03-23 the Cron timer function is now called 10 times per second instead of 1 time per second to make Redis more responsibe to BGSAVE and to delete expired keys more incrementally
+2010-03-23 Use linenoise for line editing on redis-cli.
+2010-03-23 Fix authentication for redis-cli on non-interactive mode.
+2010-03-23 key deletion on empty value fix + some refactoring
+2010-03-23 Empty value trigger key removal in all the operations
+2010-03-22 Merged gnrfan patches fixing issues 191, 193, 194
+2010-03-22 Merge branch 'issue_193' of git://github.com/gnrfan/redis
+2010-03-22 Merge branch 'issue_191' of git://github.com/gnrfan/redis
+2010-03-22 Redis master version is now 1.3.7
 2010-03-19 support for include directive in config parser
 2010-03-19 Removed a stupid overriding of config values due to a wrong cut&paste
 2010-03-19 VM hash type swappability implemented. Handling of failed pthread_create() call.
+2010-03-19 Solving issue #191 on Google Code: -v and --version should print the version of Redis
+2010-03-19 Solves issue #194 on Google Code: --help parameter to redis-srver prints the usage message
+2010-03-19 Fixing issue 193
 2010-03-18 increment server.dirty on HDEL
 2010-03-18 Redis 1.3.6
 2010-03-18 test-redis.tcl dataset digest function Hash support

diff --git a/redis.c b/redis.c
index ecde1939ae470b2901c57e415bdb91dcf985cc70..097283da4675600eb743293b00e4e2a401e7640f 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -799,7 +799,7 @@ static struct redisCommand cmdTable[] = {
     {"lastsave",lastsaveCommand,1,REDIS_CMD_INLINE,NULL,0,0,0},
     {"type",typeCommand,2,REDIS_CMD_INLINE,NULL,1,1,1},
     {"multi",multiCommand,1,REDIS_CMD_INLINE,NULL,0,0,0},
-    {"exec",execCommand,1,REDIS_CMD_INLINE,NULL,0,0,0},
+    {"exec",execCommand,1,REDIS_CMD_INLINE|REDIS_CMD_DENYOOM,NULL,0,0,0},
     {"discard",discardCommand,1,REDIS_CMD_INLINE,NULL,0,0,0},
     {"sync",syncCommand,1,REDIS_CMD_INLINE,NULL,0,0,0},
     {"flushdb",flushdbCommand,1,REDIS_CMD_INLINE,NULL,0,0,0},