From:  <brian@gir-3.local>
Date: Sat, 15 Nov 2008 17:07:50 +0000 (-0500)
Subject: Merge.
X-Git-Tag: 0.25~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=771bda0119369f89c075c9575c882338e78387d5;hp=-c;p=awesomized%2Flibmemcached

Merge.
---

771bda0119369f89c075c9575c882338e78387d5
diff --combined libmemcached/memcached_io.c
index 735a8d53,7ed2a403..0afcc29e
--- a/libmemcached/memcached_io.c
+++ b/libmemcached/memcached_io.c
@@@ -112,6 -112,7 +112,7 @@@ ssize_t memcached_io_read(memcached_ser
            switch (errno)
            {
            case EAGAIN:
+           case EINTR: 
              {
                memcached_return rc;
  
@@@ -219,17 -220,13 +220,17 @@@ ssize_t memcached_io_write(memcached_se
  memcached_return memcached_io_close(memcached_server_st *ptr)
  {
    int r;
 -  /* in case of death shutdown to avoid blocking at close() */
  
 +  if (ptr->fd == -1)
 +    return MEMCACHED_SUCCESS;
 +
 +  /* in case of death shutdown to avoid blocking at close() */
    r= shutdown(ptr->fd, SHUT_RDWR);
  
  #ifdef HAVE_DEBUG
    if (r && errno != ENOTCONN)
    {
 +    WATCHPOINT_NUMBER(ptr->fd);
      WATCHPOINT_ERRNO(errno);
      WATCHPOINT_ASSERT(errno);
    }