Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
b8febe60
Commit
b8febe60
authored
Oct 25, 2018
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
f5494b18
6dde56bf
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/server.c
View file @
b8febe60
...
...
@@ -2619,8 +2619,11 @@ int processCommand(client *c) {
if
(
server
.
current_client
==
NULL
)
return
C_ERR
;
/* It was impossible to free enough memory, and the command the client
* is trying to execute is denied during OOM conditions? Error. */
if
((
c
->
cmd
->
flags
&
CMD_DENYOOM
)
&&
out_of_memory
)
{
* is trying to execute is denied during OOM conditions or the client
* is in MULTI/EXEC context? Error. */
if
(
out_of_memory
&&
(
c
->
cmd
->
flags
&
CMD_DENYOOM
||
(
c
->
flags
&
CLIENT_MULTI
&&
c
->
cmd
->
proc
!=
execCommand
)))
{
flagTransaction
(
c
);
addReply
(
c
,
shared
.
oomerr
);
return
C_OK
;
...
...
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