Merge branch 'master' into unstable

[redis.git] / src / networking.c

diff --git a/src/networking.c b/src/networking.c
index 1dab8927586af844454abad521431a69437e7479..cd3e787eb8913e0b68b4f1d70848a04e2e520ffe 100644 (file)
--- a/src/networking.c
+++ b/src/networking.c
@@ -167,7 +167,6 @@ void _addReplyStringToList(redisClient *c, char *s, size_t len) {
 
 void addReply(redisClient *c, robj *obj) {
     if (_installWriteEvent(c) != REDIS_OK) return;
 
 void addReply(redisClient *c, robj *obj) {
     if (_installWriteEvent(c) != REDIS_OK) return;

-    redisAssert(!server.vm_enabled || obj->storage == REDIS_VM_MEMORY);

 
     /* This is an important place where we can avoid copy-on-write
      * when there is a saving child running, avoiding touching the
 
     /* This is an important place where we can avoid copy-on-write
      * when there is a saving child running, avoiding touching the


@@ -460,7 +459,7 @@ void freeClient(redisClient *c) {
     /* Remove from the list of clients waiting for swapped keys, or ready
      * to be restarted, but not yet woken up again. */
     if (c->flags & REDIS_IO_WAIT) {
     /* Remove from the list of clients waiting for swapped keys, or ready
      * to be restarted, but not yet woken up again. */
     if (c->flags & REDIS_IO_WAIT) {

-        redisAssert(server.vm_enabled);
+        redisAssert(server.ds_enabled);

         if (listLength(c->io_keys) == 0) {
             ln = listSearchKey(server.io_ready_clients,c);
 
         if (listLength(c->io_keys) == 0) {
             ln = listSearchKey(server.io_ready_clients,c);
 


@@ -474,7 +473,7 @@ void freeClient(redisClient *c) {
                 dontWaitForSwappedKey(c,ln->value);
             }
         }
                 dontWaitForSwappedKey(c,ln->value);
             }
         }

-        server.vm_blocked_clients--;
+        server.cache_blocked_clients--;

     }
     listRelease(c->io_keys);
     /* Master/slave cleanup.
     }
     listRelease(c->io_keys);
     /* Master/slave cleanup.


@@ -804,7 +803,7 @@ int processMultibulkBuffer(redisClient *c) {
                 bulklen = strtol(c->querybuf+pos+1,&eptr,10);
                 tolerr = (eptr[0] != '\r');
                 if (tolerr || bulklen == LONG_MIN || bulklen == LONG_MAX ||
                 bulklen = strtol(c->querybuf+pos+1,&eptr,10);
                 tolerr = (eptr[0] != '\r');
                 if (tolerr || bulklen == LONG_MIN || bulklen == LONG_MAX ||

-                    bulklen < 0 || bulklen > 1024*1024*1024)
+                    bulklen < 0 || bulklen > 512*1024*1024)

                 {
                     addReplyError(c,"Protocol error: invalid bulk length");
                     setProtocolError(c,pos);
                 {
                     addReplyError(c,"Protocol error: invalid bulk length");
                     setProtocolError(c,pos);