Merge lp:~mordred/libmemcached/fix-valgrind-race-condition into lp:~tangent-org/libmemcached/trunk

[Monty Taylor]

Fixed the build race condition around dtrace.

=== modified file 'ChangeLog'
--- ChangeLog	2010-06-11 01:43:08 +0000
+++ ChangeLog	2010-06-29 17:06:27 +0000
@@ -1,6 +1,9 @@
 0.41
   * Added --file for memcat.
   * Added limemcached_ping() to libmemcached_util
+  * Bugfix for some cases where connect would have issues with timeout.
+  * Wrong value for errno given as error on an IO failure inside of poll.
+  * Bug fix for issue where multiple interfaces with bad DNS were not being caught.
 
 0.40 Thu Apr 22 19:01:25 PDT 2010
   * Placed retry logic in for busted resolvers

=== modified file 'clients/execute.c'
--- clients/execute.c	2010-01-16 01:50:37 +0000
+++ clients/execute.c	2010-06-29 17:06:27 +0000
@@ -14,8 +14,7 @@
   Return the number of rows set.
 */
 
-#include "libmemcached/common.h"
-
+#include "config.h"
 #include "execute.h"
 
 unsigned int execute_set(memcached_st *memc, pairs_st *pairs, unsigned int number_of)
@@ -108,12 +107,11 @@
   rc= memcached_mget_execute(memc, keys, key_length,
                              (size_t)number_of, callbacks, &retrieved, 1);
 
-  likely (rc == MEMCACHED_SUCCESS || rc == MEMCACHED_NOTFOUND ||
+  if (rc == MEMCACHED_SUCCESS || rc == MEMCACHED_NOTFOUND ||
           rc == MEMCACHED_BUFFERED || rc == MEMCACHED_END)
   {
     rc= memcached_fetch_execute(memc, callbacks, (void *)&retrieved, 1);
-    unlikely (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_NOTFOUND &&
-              rc != MEMCACHED_END)
+    if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_NOTFOUND && rc != MEMCACHED_END)
     {
       fprintf(stderr, "Failed to execute mget: %s\n",
               memcached_strerror(memc, rc));

=== modified file 'clients/execute.h'
--- clients/execute.h	2009-12-16 19:03:49 +0000
+++ clients/execute.h	2010-06-29 17:06:27 +0000
@@ -11,6 +11,9 @@
 
 #ifndef CLIENTS_EXECUTE_H
 #define CLIENTS_EXECUTE_H
+
+#include <stdio.h>
+
 #include "libmemcached/memcached.h"
 #include "generator.h"
 

=== modified file 'clients/generator.c'
--- clients/generator.c	2010-04-22 00:49:09 +0000
+++ clients/generator.c	2010-06-29 17:06:27 +0000
@@ -9,7 +9,7 @@
  *
  */
 
-#include "libmemcached/common.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

=== modified file 'clients/memcat.c'
--- clients/memcat.c	2010-06-08 19:05:16 +0000
+++ clients/memcat.c	2010-06-29 17:06:27 +0000
@@ -9,7 +9,8 @@
  *
  */
 
-#include "libmemcached/common.h"
+#include "config.h"
+
 #include <stdio.h>
 #include <inttypes.h>
 #include <string.h>

=== modified file 'clients/memcp.c'
--- clients/memcp.c	2010-03-03 10:50:13 +0000
+++ clients/memcp.c	2010-06-29 17:06:27 +0000
@@ -9,7 +9,8 @@
  *
  */
 
-#include "libmemcached/common.h"
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
@@ -54,7 +55,7 @@
 
   /* Check for various possible errors */
 
-  if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN))
+  if ((errno == ERANGE && (val == INTMAX_MAX || val == INTMAX_MIN))
       || (errno != 0 && val == 0))
   {
     *error= true;

=== modified file 'clients/memdump.c'
--- clients/memdump.c	2010-03-03 10:50:13 +0000
+++ clients/memdump.c	2010-06-29 17:06:27 +0000
@@ -9,7 +9,8 @@
  *
  */
 
-#include "libmemcached/common.h"
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>

=== modified file 'clients/memerror.c'
--- clients/memerror.c	2010-01-14 21:37:53 +0000
+++ clients/memerror.c	2010-06-29 17:06:27 +0000
@@ -8,8 +8,8 @@
  * Summary:
  *
  */
+#include "config.h"
 
-#include "libmemcached/common.h"
 #include <stdio.h>
 #include <inttypes.h>
 #include <string.h>

=== modified file 'clients/memflush.c'
--- clients/memflush.c	2010-03-03 10:50:13 +0000
+++ clients/memflush.c	2010-06-29 17:06:27 +0000
@@ -8,8 +8,8 @@
  * Summary:
  *
  */
+#include "config.h"
 
-#include "libmemcached/common.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>

=== modified file 'clients/memrm.c'
--- clients/memrm.c	2010-03-03 10:50:13 +0000
+++ clients/memrm.c	2010-06-29 17:06:27 +0000
@@ -8,8 +8,8 @@
  * Summary:
  *
  */
+#include "config.h"
 
-#include "libmemcached/common.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <getopt.h>

=== modified file 'clients/memstat.c'
--- clients/memstat.c	2010-03-10 00:45:36 +0000
+++ clients/memstat.c	2010-06-29 17:06:27 +0000
@@ -11,8 +11,8 @@
  *          Brian Aker
  *          Toru Maesaka
  */
+#include "config.h"
 
-#include "libmemcached/common.h"
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>

=== modified file 'clients/utilities.c'
--- clients/utilities.c	2010-05-24 09:08:06 +0000
+++ clients/utilities.c	2010-06-29 17:06:27 +0000
@@ -8,8 +8,8 @@
  * Summary:
  *
  */
+#include "config.h"
 
-#include "libmemcached/common.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>

=== modified file 'clients/utilities.h'
--- clients/utilities.h	2010-03-03 10:50:13 +0000
+++ clients/utilities.h	2010-06-29 17:06:27 +0000
@@ -11,6 +11,7 @@
 
 #include <getopt.h>
 #include <libmemcached/memcached.h>
+#include "libmemcached/watchpoint.h"
 #include "client_options.h"
 
 #if TIME_WITH_SYS_TIME

=== modified file 'libmemcached/connect.c'
--- libmemcached/connect.c	2010-06-13 21:04:20 +0000
+++ libmemcached/connect.c	2010-06-29 17:06:27 +0000
@@ -1,9 +1,96 @@
+/* LibMemcached
+ * Copyright (C) 2006-2010 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary: Server IO, Not public!
+ *
+ */
+
 #include "common.h"
 #include <netdb.h>
 #include <poll.h>
 #include <sys/time.h>
 #include <time.h>
 
+static memcached_return_t connect_poll(memcached_server_st *ptr)
+{
+  struct pollfd fds[1];
+  fds[0].fd = ptr->fd;
+  fds[0].events = POLLOUT;
+
+  int timeout= ptr->root->connect_timeout;
+  if (ptr->root->flags.no_block == true)
+    timeout= -1;
+
+  int error;
+  size_t loop_max= 5;
+
+  while (--loop_max) // Should only loop on cases of ERESTART or EINTR
+  {
+    error= poll(fds, 1, timeout);
+
+    switch (error)
+    {
+    case 1:
+      {
+        int err;
+        socklen_t len= sizeof (err);
+        (void)getsockopt(ptr->fd, SOL_SOCKET, SO_ERROR, &err, &len);
+
+        // We check the value to see what happened wth the socket.
+        if (err == 0)
+        {
+          return MEMCACHED_SUCCESS;
+        }
+        else
+        {
+          ptr->cached_errno= errno;
+
+          return MEMCACHED_ERRNO;
+        }
+      }
+    case 0:
+      return MEMCACHED_TIMEOUT;
+    default: // A real error occurred and we need to completely bail
+      WATCHPOINT_ERRNO(errno);
+      switch (errno)
+      {
+#ifdef TARGET_OS_LINUX
+      case ERESTART:
+#endif
+      case EINTR:
+        continue;
+      default:
+        if (fds[0].revents & POLLERR)
+        {
+          int err;
+          socklen_t len= sizeof (err);
+          (void)getsockopt(ptr->fd, SOL_SOCKET, SO_ERROR, &err, &len);
+          ptr->cached_errno= (err == 0) ? errno : err;
+        }
+        else
+        {
+          ptr->cached_errno= errno;
+        }
+
+        (void)close(ptr->fd);
+        ptr->fd= -1;
+
+        return MEMCACHED_ERRNO;
+      }
+    }
+    WATCHPOINT_ASSERT(0); // Programming error
+  }
+
+  // This should only be possible from ERESTART or EINTR;
+  ptr->cached_errno= errno;
+
+  return MEMCACHED_ERRNO;
+}
+
 static memcached_return_t set_hostinfo(memcached_server_st *server)
 {
   struct addrinfo *ai;
@@ -265,6 +352,8 @@
 
 static memcached_return_t network_connect(memcached_server_st *ptr)
 {
+  bool timeout_error_occured= false;
+
   if (ptr->fd == -1)
   {
     struct addrinfo *use;
@@ -305,93 +394,39 @@
       (void)set_socket_options(ptr);
 
       /* connect to server */
-      if ((connect(ptr->fd, use->ai_addr, use->ai_addrlen) == -1))
-      {
-        ptr->cached_errno= errno;
-        if (errno == EINPROGRESS || /* nonblocking mode - first return, */
-            errno == EALREADY) /* nonblocking mode - subsequent returns */
-        {
-          struct pollfd fds[1];
-          fds[0].fd = ptr->fd;
-          fds[0].events = POLLOUT;
-
-          int timeout= ptr->root->connect_timeout;
-          if (ptr->root->flags.no_block == true)
-            timeout= -1;
-
-          size_t loop_max= 5;
-          while (--loop_max)
-          {
-            int error= poll(fds, 1, timeout);
-
-            switch (error)
-            {
-            case 1:
-              loop_max= 1;
-              break;
-            case 0:
-              if (loop_max==1) 
-                return MEMCACHED_TIMEOUT;
-              continue;
-              // A real error occurred and we need to completely bail
-            default:
-              WATCHPOINT_ERRNO(errno);
-              switch (errno)
-              {
-#ifdef TARGET_OS_LINUX
-              case ERESTART:
-#endif
-              case EINTR:
-                continue;
-              default:
-                if (fds[0].revents & POLLERR)
-                {
-                  int err;
-                  socklen_t len= sizeof (err);
-                  (void)getsockopt(ptr->fd, SOL_SOCKET, SO_ERROR, &err, &len);
-                  ptr->cached_errno= (err == 0) ? errno : err;
-                }
-
-                (void)close(ptr->fd);
-                ptr->fd= -1;
-
-                break;
-              }
-            }
-          }
-        }
-        else if (errno == EISCONN) /* we are connected :-) */
-        {
-          break;
-        }
-        else if (errno != EINTR)
-        {
-          (void)close(ptr->fd);
-          ptr->fd= -1;
-          break;
-        }
-      }
-
-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
-      if (ptr->fd != -1 && ptr->root->sasl && ptr->root->sasl->callbacks)
-      {
-        memcached_return rc= memcached_sasl_authenticate_connection(ptr);
-        if (rc != MEMCACHED_SUCCESS)
-        {
-          (void)close(ptr->fd);
-          ptr->fd= -1;
-
-          return rc;
-        }
-      }
-#endif
-
-
-      if (ptr->fd != -1)
-      {
-        return MEMCACHED_SUCCESS;
-      }
-      use = use->ai_next;
+      if ((connect(ptr->fd, use->ai_addr, use->ai_addrlen) > -1))
+      {
+        break; // Success
+      }
+
+      /* An error occurred */
+      ptr->cached_errno= errno;
+      if (errno == EINPROGRESS || /* nonblocking mode - first return, */
+          errno == EALREADY) /* nonblocking mode - subsequent returns */
+      {
+        memcached_return_t rc;
+        rc= connect_poll(ptr);
+
+        if (rc == MEMCACHED_TIMEOUT)
+          timeout_error_occured= true;
+
+        if (rc == MEMCACHED_SUCCESS)
+          break;
+      }
+      else if (errno == EISCONN) /* we are connected :-) */
+      {
+        break;
+      }
+      else if (errno == EINTR) // Special case, we retry ai_addr
+      {
+        (void)close(ptr->fd);
+        ptr->fd= -1;
+        continue;
+      }
+
+      (void)close(ptr->fd);
+      ptr->fd= -1;
+      use= use->ai_next;
     }
   }
 
@@ -408,7 +443,7 @@
         ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
     }
 
-    if (ptr->cached_errno == 0)
+    if (timeout_error_occured)
       return MEMCACHED_TIMEOUT;
 
     return MEMCACHED_ERRNO; /* The last error should be from connect() */
@@ -481,6 +516,17 @@
   case MEMCACHED_CONNECTION_UDP:
   case MEMCACHED_CONNECTION_TCP:
     rc= network_connect(ptr);
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
+    if (ptr->fd != -1 && ptr->root->sasl && ptr->root->sasl->callbacks)
+    {
+      rc= memcached_sasl_authenticate_connection(ptr);
+      if (rc != MEMCACHED_SUCCESS)
+      {
+        (void)close(ptr->fd);
+        ptr->fd= -1;
+      }
+    }
+#endif
     break;
   case MEMCACHED_CONNECTION_UNIX_SOCKET:
     rc= unix_socket_connect(ptr);

=== modified file 'libmemcached/delete.c'
--- libmemcached/delete.c	2010-04-02 19:55:21 +0000
+++ libmemcached/delete.c	2010-06-29 17:06:27 +0000
@@ -45,7 +45,7 @@
 
   if (ptr->flags.binary_protocol)
   {
-    likely (!expiration)
+    likely (! expiration)
     {
       rc= binary_delete(ptr, server_key, key, key_length, to_write);
     }

=== modified file 'libmemcached/include.am'
--- libmemcached/include.am	2010-06-15 06:31:25 +0000
+++ libmemcached/include.am	2010-06-29 17:06:27 +0000
@@ -158,6 +158,7 @@
 if DTRACE_NEEDS_OBJECTS
 libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
 libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
+CLEANFILES+= libmemcached/libmemcached_probes.o
 endif
 
 SUFFIXES+= .d
@@ -165,7 +166,7 @@
 libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
 	$(DTRACE) $(DTRACEFLAGS) -h -o libmemcached/dtrace_probes.h -s ${top_srcdir}/libmemcached/libmemcached_probes.d
 
-libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_OBJECTS} config.h
+libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS} config.h
 
 .d.o:
 	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/libmemcached_probes.o -G -s ${top_srcdir}/libmemcached/libmemcached_probes.d `grep '^pic_object' ${top_builddir}/libmemcached/*.lo | cut -f 2 -d\' | sed "s/^/${top_builddir}\//"`

=== modified file 'libmemcached/io.c'
--- libmemcached/io.c	2010-04-22 22:51:37 +0000
+++ libmemcached/io.c	2010-06-29 17:06:27 +0000
@@ -62,45 +62,50 @@
     timeout= -1;
 
   size_t loop_max= 5;
-  while (--loop_max)
+  while (--loop_max) // While loop is for ERESTART or EINTR
   {
     error= poll(&fds, 1, timeout);
 
     switch (error)
     {
-    case 1:
+    case 1: // Success!
       WATCHPOINT_IF_LABELED_NUMBER(read_or_write && loop_max < 4, "read() times we had to loop, decremented down from 5", loop_max);
       WATCHPOINT_IF_LABELED_NUMBER(!read_or_write && loop_max < 4, "write() times we had to loop, decremented down from 5", loop_max);
 
       return MEMCACHED_SUCCESS;
-    case 0:
+    case 0: // Timeout occured, we let the while() loop do its thing.
       return MEMCACHED_TIMEOUT;
     default:
       WATCHPOINT_ERRNO(errno);
+      switch (errno)
       {
-        switch (errno)
-        {
 #ifdef TARGET_OS_LINUX
-        case ERESTART:
+      case ERESTART:
 #endif
-        case EINTR:
-          continue;
-        default:
-          ptr->cached_errno= error;
-          memcached_quit_server(ptr, true);
+      case EINTR:
+        break;
+      default:
+        if (fds.revents & POLLERR)
+        {
+          int err;
+          socklen_t len= sizeof (err);
+          (void)getsockopt(ptr->fd, SOL_SOCKET, SO_ERROR, &err, &len);
+          ptr->cached_errno= (err == 0) ? errno : err;
+        }
+        else
+        {
+          ptr->cached_errno= errno;
+        }
+        memcached_quit_server(ptr, true);
 
-          return MEMCACHED_FAILURE;
-        }
+        return MEMCACHED_FAILURE;
       }
     }
   }
 
-  if (loop_max == 0 && error == 0)
-    return MEMCACHED_TIMEOUT;
-
   /* Imposssible for anything other then -1 */
   WATCHPOINT_ASSERT(error == -1);
-  ptr->cached_errno= error;
+  ptr->cached_errno= errno;
   memcached_quit_server(ptr, true);
 
   return MEMCACHED_FAILURE;

=== modified file 'libmemcached/util/version.c'
--- libmemcached/util/version.c	2010-06-15 06:31:25 +0000
+++ libmemcached/util/version.c	2010-06-29 17:06:27 +0000
@@ -16,8 +16,8 @@
 struct local_context
 {
   uint8_t major_version;
+  uint8_t minor_version;
   uint8_t micro_version;
-  uint8_t minor_version;
 
   bool truth;
 };
@@ -30,8 +30,8 @@
   struct local_context *check= (struct local_context *)context;
 
   if (instance->major_version >= check->major_version &&
-      instance->micro_version >= check->micro_version &&
-      instance->minor_version >= check->minor_version)
+      instance->minor_version >= check->minor_version &&
+      instance->micro_version >= check->micro_version )
   {
     return MEMCACHED_SUCCESS;
   }
@@ -43,13 +43,13 @@
 
 bool libmemcached_util_version_check(memcached_st *memc, 
                                      uint8_t major_version,
-                                     uint8_t micro_version,
-                                     uint8_t minor_version)
+                                     uint8_t minor_version,
+                                     uint8_t micro_version)
 {
   memcached_server_fn callbacks[1];
   memcached_version(memc);
 
- struct local_context check= { .major_version= major_version, .micro_version= micro_version, .minor_version= minor_version, .truth= true };
+ struct local_context check= { .major_version= major_version, .minor_version= minor_version, .micro_version= micro_version, .truth= true };
 
   callbacks[0]= check_server_version;
   memcached_server_cursor(memc, callbacks, (void *)&check,  1);

=== modified file 'libmemcached/util/version.h'
--- libmemcached/util/version.h	2010-06-15 06:31:25 +0000
+++ libmemcached/util/version.h	2010-06-29 17:06:27 +0000
@@ -19,8 +19,8 @@
 LIBMEMCACHED_API
   bool libmemcached_util_version_check(memcached_st *memc, 
                                        uint8_t major_version,
-                                       uint8_t micro_version,
-                                       uint8_t minor_version);
+                                       uint8_t minor_version,
+                                       uint8_t micro_version);
 
 #ifdef __cplusplus
 }

=== modified file 'tests/atomsmasher.c'
--- tests/atomsmasher.c	2010-01-15 21:49:15 +0000
+++ tests/atomsmasher.c	2010-06-29 17:06:27 +0000
@@ -12,10 +12,14 @@
 /*
   Sample test application.
 */
-#include "libmemcached/common.h"
+#include "config.h"
+
+#include "libmemcached/memcached.h"
+#include "libmemcached/watchpoint.h"
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -26,14 +30,6 @@
 #include "../clients/generator.h"
 #include "../clients/execute.h"
 
-#ifndef INT64_MAX
-#define INT64_MAX LONG_MAX
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX INT_MAX
-#endif
-
-
 #include "test.h"
 
 /* Number of items generated for tests */

=== modified file 'tests/hashkit_functions.c'
--- tests/hashkit_functions.c	2010-04-11 17:56:46 +0000
+++ tests/hashkit_functions.c	2010-06-29 17:06:27 +0000
@@ -6,6 +6,8 @@
  * the COPYING file in the parent directory for full text.
  */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

=== modified file 'tests/include.am'
--- tests/include.am	2010-06-13 16:43:30 +0000
+++ tests/include.am	2010-06-29 17:06:27 +0000
@@ -41,6 +41,7 @@
 tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_testapp_SOURCES= tests/mem_functions.c
 tests_testapp_DEPENDENCIES= \
+			    $(BUILT_SOURCES) \
 			    clients/libgenexec.la \
 			    tests/libserver.la \
 			    tests/libtest.la \

=== modified file 'tests/mem_functions.c'
--- tests/mem_functions.c	2010-06-15 06:31:25 +0000
+++ tests/mem_functions.c	2010-06-29 17:06:27 +0000
@@ -10,10 +10,11 @@
   Sample test application.
 */
 
-#include "libmemcached/common.h"
+#include "config.h"
 
 #include <assert.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
@@ -22,20 +23,18 @@
 #include <signal.h>
 #include <unistd.h>
 #include <time.h>
+
+#include "libmemcached/common.h"
+
 #include "server.h"
 #include "clients/generator.h"
 #include "clients/execute.h"
 
-#ifndef INT64_MAX
-#define INT64_MAX LONG_MAX
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX INT_MAX
-#endif
-
+#define SMALL_STRING_LEN 1024
 
 #include "test.h"
 
+
 #ifdef HAVE_LIBMEMCACHEDUTIL
 #include <pthread.h>
 #include "libmemcached/memcached_util.h"
@@ -682,7 +681,6 @@
 */
 static test_return_t add_wrapper(memcached_st *memc)
 {
-  unsigned int x;
   unsigned int max= 10000;
 #ifdef __sun
   max= 10;
@@ -691,7 +689,7 @@
   max= 10;
 #endif
 
-  for (x= 0; x < max; x++)
+  for (uint32_t x= 0; x < max; x++)
     add_test(memc);
 
   return TEST_SUCCESS;
@@ -3599,7 +3597,7 @@
   // will not toggle protocol on an connection.
   memcached_version(memc_clone);
 
-  if (libmemcached_util_version_check(memc_clone, 1, 2, 0))
+  if (libmemcached_util_version_check(memc_clone, 1, 3, 0))
   {
     memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0);
     rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1);
@@ -3724,23 +3722,14 @@
 static test_return_t pre_binary(memcached_st *memc)
 {
   memcached_return_t rc= MEMCACHED_FAILURE;
-  memcached_st *memc_clone;
-
-  memc_clone= memcached_clone(NULL, memc);
-  test_true(memc_clone);
-  // The memcached_version needs to be done on a clone, because the server
-  // will not toggle protocol on an connection.
-  memcached_version(memc_clone);
-
-  if (libmemcached_util_version_check(memc_clone, 1, 2, 0))
+
+  if (libmemcached_util_version_check(memc, 1, 3, 0))
   {
     rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1);
     test_true(rc == MEMCACHED_SUCCESS);
     test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1);
   }
 
-  memcached_free(memc_clone);
-
   return rc == MEMCACHED_SUCCESS ? TEST_SUCCESS : TEST_SKIPPED;
 }
 
@@ -4432,24 +4421,24 @@
   memcached_version(memc);
 
   // We only use one binary when we test, so this should be just fine.
-  if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->micro_version, instance->minor_version);
-  test_true(if_successful == true);
-
-  if (instance->minor_version > 0)
-    if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->micro_version, instance->minor_version -1);
-  else if (instance->micro_version > 0)
-    if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->micro_version - 1, instance->minor_version);
-  else if (instance->major_version > 0)
-    if_successful= libmemcached_util_version_check(memc, instance->major_version -1, instance->micro_version, instance->minor_version);
-
-  test_true(if_successful == true);
-
-  if (instance->minor_version > 0)
-    if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->micro_version, instance->minor_version +1);
-  else if (instance->micro_version > 0)
-    if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->micro_version +1, instance->minor_version);
-  else if (instance->major_version > 0)
-    if_successful= libmemcached_util_version_check(memc, instance->major_version +1, instance->micro_version, instance->minor_version);
+  if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->minor_version, instance->micro_version);
+  test_true(if_successful == true);
+
+  if (instance->micro_version > 0)
+    if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->minor_version, instance->micro_version -1);
+  else if (instance->minor_version > 0)
+    if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->minor_version - 1, instance->micro_version);
+  else if (instance->major_version > 0)
+    if_successful= libmemcached_util_version_check(memc, instance->major_version -1, instance->minor_version, instance->micro_version);
+
+  test_true(if_successful == true);
+
+  if (instance->micro_version > 0)
+    if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->minor_version, instance->micro_version +1);
+  else if (instance->minor_version > 0)
+    if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->minor_version +1, instance->micro_version);
+  else if (instance->major_version > 0)
+    if_successful= libmemcached_util_version_check(memc, instance->major_version +1, instance->minor_version, instance->micro_version);
 
   test_true(if_successful == false);
 
@@ -5018,7 +5007,7 @@
   We are testing the error condition when we connect to a server via memcached_get() 
   but find that the server is not available.
 */
-static test_return_t memcached_get_MEMCACHED_SOME_ERRORS(memcached_st *memc)
+static test_return_t memcached_get_MEMCACHED_ERRNO(memcached_st *memc)
 {
   (void)memc;
   memcached_st *tl_memc_h;
@@ -5032,7 +5021,7 @@
 
   // Create a handle.
   tl_memc_h= memcached_create(NULL);
-  servers= memcached_servers_parse("localhost:9898"); // This server should not exist
+  servers= memcached_servers_parse("localhost:9898,localhost:9899"); // This server should not exist
   memcached_server_push(tl_memc_h, servers);
   memcached_server_list_free(servers);
 
@@ -5046,7 +5035,7 @@
   }
 
   test_true(len == 0);
-  test_true(rc == MEMCACHED_SOME_ERRORS);
+  test_true(rc == MEMCACHED_ERRNO);
 
   return TEST_SUCCESS;
 }
@@ -5083,7 +5072,7 @@
   We are testing the error condition when we connect to a server via memcached_get_by_key() 
   but find that the server is not available.
 */
-static test_return_t memcached_get_by_key_MEMCACHED_SOME_ERRORS(memcached_st *memc)
+static test_return_t memcached_get_by_key_MEMCACHED_ERRNO(memcached_st *memc)
 {
   (void)memc;
   memcached_st *tl_memc_h;
@@ -5097,7 +5086,7 @@
 
   // Create a handle.
   tl_memc_h= memcached_create(NULL);
-  servers= memcached_servers_parse("localhost:9898"); // This server should not exist
+  servers= memcached_servers_parse("localhost:9898,localhost:9899"); // This server should not exist
   memcached_server_push(tl_memc_h, servers);
   memcached_server_list_free(servers);
 
@@ -5111,7 +5100,7 @@
   }
 
   test_true(len == 0);
-  test_true(rc == MEMCACHED_SOME_ERRORS);
+  test_true(rc == MEMCACHED_ERRNO);
 
   return TEST_SUCCESS;
 }
@@ -5575,54 +5564,58 @@
 
 static test_return_t regression_bug_463297(memcached_st *memc)
 {
-  memcached_st *memc_clone= memcached_clone(NULL, memc);
-  test_true(memc_clone != NULL);
-  test_true(memcached_version(memc_clone) == MEMCACHED_SUCCESS);
-
-
-  if (libmemcached_util_version_check(memc_clone, 1, 1, 2))
+  memcached_st *memc_clone= memcached_clone(NULL, memc); 
+  test_true(memc_clone != NULL); 
+  test_true(memcached_version(memc_clone) == MEMCACHED_SUCCESS); 
+
+  memcached_server_instance_st instance= 
+    memcached_server_instance_by_position(memc_clone, 0); 
+
+  if (instance->major_version > 1 || 
+      (instance->major_version == 1 && 
+       instance->minor_version > 2)) 
   {
-     /* Binary protocol doesn't support deferred delete */
-     memcached_st *bin_clone= memcached_clone(NULL, memc);
-     test_true(bin_clone != NULL);
-     test_true(memcached_behavior_set(bin_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1) == MEMCACHED_SUCCESS);
-     test_true(memcached_delete(bin_clone, "foo", 3, 1) == MEMCACHED_INVALID_ARGUMENTS);
-     memcached_free(bin_clone);
-
-     memcached_quit(memc_clone);
-
-     /* If we know the server version, deferred delete should fail
-      * with invalid arguments */
-     test_true(memcached_delete(memc_clone, "foo", 3, 1) == MEMCACHED_INVALID_ARGUMENTS);
-
-     /* If we don't know the server version, we should get a protocol error */
-     memcached_return_t rc= memcached_delete(memc, "foo", 3, 1);
-
-     /* but there is a bug in some of the memcached servers (1.4) that treats
-      * the counter as noreply so it doesn't send the proper error message
-      */
-     test_true(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR);
-
-     /* And buffered mode should be disabled and we should get protocol error */
-     test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1) == MEMCACHED_SUCCESS);
-     rc= memcached_delete(memc, "foo", 3, 1);
-     test_true(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR);
-
-     /* Same goes for noreply... */
-     test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1) == MEMCACHED_SUCCESS);
-     rc= memcached_delete(memc, "foo", 3, 1);
-     test_true(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR);
-
-     /* but a normal request should go through (and be buffered) */
-     test_true((rc= memcached_delete(memc, "foo", 3, 0)) == MEMCACHED_BUFFERED);
-     test_true(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS);
-
-     test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 0) == MEMCACHED_SUCCESS);
-     /* unbuffered noreply should be success */
-     test_true(memcached_delete(memc, "foo", 3, 0) == MEMCACHED_SUCCESS);
-     /* unbuffered with reply should be not found... */
-     test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 0) == MEMCACHED_SUCCESS);
-     test_true(memcached_delete(memc, "foo", 3, 0) == MEMCACHED_NOTFOUND);
+    /* Binary protocol doesn't support deferred delete */
+    memcached_st *bin_clone= memcached_clone(NULL, memc);
+    test_true(bin_clone != NULL);
+    test_true(memcached_behavior_set(bin_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1) == MEMCACHED_SUCCESS);
+    test_true(memcached_delete(bin_clone, "foo", 3, 1) == MEMCACHED_INVALID_ARGUMENTS);
+    memcached_free(bin_clone);
+
+    memcached_quit(memc_clone);
+
+    /* If we know the server version, deferred delete should fail
+     * with invalid arguments */
+    test_true(memcached_delete(memc_clone, "foo", 3, 1) == MEMCACHED_INVALID_ARGUMENTS);
+
+    /* If we don't know the server version, we should get a protocol error */
+    memcached_return_t rc= memcached_delete(memc, "foo", 3, 1);
+
+    /* but there is a bug in some of the memcached servers (1.4) that treats
+     * the counter as noreply so it doesn't send the proper error message
+   */
+    test_true(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR);
+
+    /* And buffered mode should be disabled and we should get protocol error */
+    test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1) == MEMCACHED_SUCCESS);
+    rc= memcached_delete(memc, "foo", 3, 1);
+    test_true(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR);
+
+    /* Same goes for noreply... */
+    test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1) == MEMCACHED_SUCCESS);
+    rc= memcached_delete(memc, "foo", 3, 1);
+    test_true(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR);
+
+    /* but a normal request should go through (and be buffered) */
+    test_true((rc= memcached_delete(memc, "foo", 3, 0)) == MEMCACHED_BUFFERED);
+    test_true(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS);
+
+    test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 0) == MEMCACHED_SUCCESS);
+    /* unbuffered noreply should be success */
+    test_true(memcached_delete(memc, "foo", 3, 0) == MEMCACHED_SUCCESS);
+    /* unbuffered with reply should be not found... */
+    test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 0) == MEMCACHED_SUCCESS);
+    test_true(memcached_delete(memc, "foo", 3, 0) == MEMCACHED_NOTFOUND);
   }
 
   memcached_free(memc_clone);
@@ -6080,6 +6073,7 @@
 
 /* Clean the server before beginning testing */
 test_st tests[] ={
+  {"util_version", 1, (test_callback_fn)util_version_test },
   {"flush", 0, (test_callback_fn)flush_test },
   {"init", 0, (test_callback_fn)init_test },
   {"allocation", 0, (test_callback_fn)allocation_test },
@@ -6135,7 +6129,6 @@
 #ifdef HAVE_LIBMEMCACHEDUTIL
   {"connectionpool", 1, (test_callback_fn)connection_pool_test },
   {"ping", 1, (test_callback_fn)ping_test },
-  {"util_version", 1, (test_callback_fn)util_version_test },
 #endif
   {"test_get_last_disconnect", 1, (test_callback_fn)test_get_last_disconnect},
   {"verbosity", 1, (test_callback_fn)test_verbosity},
@@ -6332,9 +6325,9 @@
 };
 
 test_st error_conditions[] ={
-  {"memcached_get_MEMCACHED_SOME_ERRORS", 0, (test_callback_fn)memcached_get_MEMCACHED_SOME_ERRORS },
+  {"memcached_get_MEMCACHED_ERRNO", 0, (test_callback_fn)memcached_get_MEMCACHED_ERRNO },
   {"memcached_get_MEMCACHED_NOTFOUND", 0, (test_callback_fn)memcached_get_MEMCACHED_NOTFOUND },
-  {"memcached_get_by_key_MEMCACHED_SOME_ERRORS", 0, (test_callback_fn)memcached_get_by_key_MEMCACHED_SOME_ERRORS },
+  {"memcached_get_by_key_MEMCACHED_ERRNO", 0, (test_callback_fn)memcached_get_by_key_MEMCACHED_ERRNO },
   {"memcached_get_by_key_MEMCACHED_NOTFOUND", 0, (test_callback_fn)memcached_get_by_key_MEMCACHED_NOTFOUND },
   {0, 0, (test_callback_fn)0}
 };

=== modified file 'tests/mem_udp.c'
--- tests/mem_udp.c	2010-02-18 06:22:15 +0000
+++ tests/mem_udp.c	2010-06-29 17:06:27 +0000
@@ -10,10 +10,13 @@
   Sample test application.
 */
 
+#include "config.h"
+
 #include "libmemcached/common.h"
 
 #include <assert.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
@@ -25,14 +28,6 @@
 
 #include "server.h"
 
-#ifndef INT64_MAX
-#define INT64_MAX LONG_MAX
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX INT_MAX
-#endif
-
-
 #include "test.h"
 
 #define SERVERS_TO_CREATE 5

=== modified file 'tests/start.c'
--- tests/start.c	2009-12-16 19:03:49 +0000
+++ tests/start.c	2010-06-29 17:06:27 +0000
@@ -9,6 +9,8 @@
  *
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 #include "server.h"

=== modified file 'tests/test.c'
--- tests/test.c	2010-04-22 00:49:09 +0000
+++ tests/test.c	2010-06-29 17:06:27 +0000
@@ -9,6 +9,9 @@
 /*
   Sample test application.
 */
+
+#include "config.h"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>