fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-30 22:31:03 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
antirez 2018-09-04 13:26:06 +02:00
commit ff57b8d550
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/networking.c
View File

@ -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);

2
tests/support/server.tcl
View File

@ -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:"