Merge.

diff --git a/libmemcached/memcached_io.c b/libmemcached/memcached_io.c
index 735a8d5312b625636c80a58e69bc83328fc0589e..0afcc29eaa4756670c25fa525b48d2fd93049fc1 100644 (file)
--- a/libmemcached/memcached_io.c
+++ b/libmemcached/memcached_io.c
@@ -112,6 +112,7 @@ ssize_t memcached_io_read(memcached_server_st *ptr,
           switch (errno)
           {
           case EAGAIN:
+          case EINTR: 
             {
               memcached_return rc;
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f739b4b0b45177c1d02ef5a92d800960508fb9c9..7a642be76478cb992bd946cda181867844cfe29c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,7 +15,7 @@ EXTRA_DIST = output.res output2.res\
 
 LIBS = 
 
-noinst_HEADERS = test.h server.h
+noinst_HEADERS = test.h server.h ketama_test_cases.h
 noinst_PROGRAMS = testapp testplus udptest atomsmasher startservers
 
 testapp_SOURCES = test.c function.c server.c ../clients/generator.c ../clients/execute.c