Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
ff57b8d5
Commit
ff57b8d5
authored
Sep 04, 2018
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
c1e9186f
2ef829d6
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/networking.c
View file @
ff57b8d5
...
...
@@ -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);
if (remaining < readlen) readlen = remaining;
if (remaining
> 0 && remaining
< readlen) readlen = remaining;
}
qblen = sdslen(c->querybuf);
...
...
tests/support/server.tcl
View file @
ff57b8d5
...
...
@@ -4,7 +4,7 @@ set ::valgrind_errors {}
proc start_server_error
{
config_file error
}
{
set err
{}
append err
"Can
t
' start the Redis server
\n
"
append err
"Can'
t
start the Redis server
\n
"
append err
"CONFIGURATION:"
append err
[
exec cat $config_file
]
append err
"
\n
ERROR:"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment