Merge pull request #119 from thefab/fix99

Try again later for EINTR errors (see issue #99)
This commit is contained in:
Pieter Noordhuis 2013-01-26 11:09:15 -08:00
commit 9df327e8fd

View File

@ -1077,7 +1077,7 @@ int redisBufferRead(redisContext *c) {
nread = read(c->fd,buf,sizeof(buf)); nread = read(c->fd,buf,sizeof(buf));
if (nread == -1) { if (nread == -1) {
if (errno == EAGAIN && !(c->flags & REDIS_BLOCK)) { if ((errno == EAGAIN && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
/* Try again later */ /* Try again later */
} else { } else {
__redisSetError(c,REDIS_ERR_IO,NULL); __redisSetError(c,REDIS_ERR_IO,NULL);
@ -1114,7 +1114,7 @@ int redisBufferWrite(redisContext *c, int *done) {
if (sdslen(c->obuf) > 0) { if (sdslen(c->obuf) > 0) {
nwritten = write(c->fd,c->obuf,sdslen(c->obuf)); nwritten = write(c->fd,c->obuf,sdslen(c->obuf));
if (nwritten == -1) { if (nwritten == -1) {
if (errno == EAGAIN && !(c->flags & REDIS_BLOCK)) { if ((errno == EAGAIN && !(c->flags & REDIS_BLOCK)) || (errno == EINTR)) {
/* Try again later */ /* Try again later */
} else { } else {
__redisSetError(c,REDIS_ERR_IO,NULL); __redisSetError(c,REDIS_ERR_IO,NULL);