Commit ff57b8d5 authored by antirez's avatar antirez
Browse files

Merge branch 'unstable' of github.com:/antirez/redis into unstable

parents c1e9186f 2ef829d6
...@@ -1466,7 +1466,7 @@ void readQueryFromClient(aeEventLoop *el, int fd, void *privdata, int mask) { ...@@ -1466,7 +1466,7 @@ void readQueryFromClient(aeEventLoop *el, int fd, void *privdata, int mask) {
{ {
ssize_t remaining = (size_t)(c->bulklen+2)-sdslen(c->querybuf); ssize_t remaining = (size_t)(c->bulklen+2)-sdslen(c->querybuf);
if (remaining < readlen) readlen = remaining; if (remaining > 0 && remaining < readlen) readlen = remaining;
} }
qblen = sdslen(c->querybuf); qblen = sdslen(c->querybuf);
......
...@@ -4,7 +4,7 @@ set ::valgrind_errors {} ...@@ -4,7 +4,7 @@ set ::valgrind_errors {}
proc start_server_error {config_file error} { proc start_server_error {config_file error} {
set err {} set err {}
append err "Cant' start the Redis server\n" append err "Can't start the Redis server\n"
append err "CONFIGURATION:" append err "CONFIGURATION:"
append err [exec cat $config_file] append err [exec cat $config_file]
append err "\nERROR:" append err "\nERROR:"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment