Cleanup's for Tim. Also dropping support back to ipv4 only while I find out

what broke in IPV6 on OSX.

diff --git a/THANKS b/THANKS
index d5ee9764c8a4609febf46b72b4847add799456cf..a62f3d948af63bbfdc5560024dd7b4deef4c228b 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -4,3 +4,4 @@ Dustin Sallings - Insight into protocol
 Tobias Luetke - Performance Feedback
 Andre Cruz - Help with getting the CRC Hash function to match other connectors
 Brian Pontz - Hsieh hash
+Tim Bunce - Perl Driver work and feedback on API

diff --git a/docs/memcached_get.pod b/docs/memcached_get.pod
index 2cd7a173a5af1b161d71e0a15baff33d0f9db42e..1cf0a60ca053443c9e6d41f627e25883ce17069d 100755 (executable)
--- a/docs/memcached_get.pod
+++ b/docs/memcached_get.pod
@@ -88,8 +88,8 @@ if you do not pass one to the function.
 memcached_fetch_execute() is a callback function for result sets. Instead
 of returning the results to you for processing, it passes each of the
 result sets to the list of functions you provide. It passes to the function
-a memcached_st that can be cloned for use in called the cluster (it can not 
-be used directly). It also passed a result set which does not need to be freed.
+a memcached_st that can be cloned for use in the called function (it can not 
+be used directly). It also passes a result set which does not need to be freed.
 Finally it passes a "context". This is just a pointer to a memory reference
 you supply the calling function. Currently only one value is being passed
 to each function call. In the future there will be an option to allow this

diff --git a/include/memcached.h b/include/memcached.h
index bff81a61d376445cb68747b1fb32d7d985113186..605c4a4cbcb6a8655de0747fe377b2c001e44074 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -26,14 +26,12 @@ typedef struct memcached_string_st memcached_string_st;
 typedef struct memcached_server_st memcached_server_st;
 
 /* These are Private and should not be used by applications */
-#define SMALL_STRING_LEN 1024
-#define HUGE_STRING_LEN 8196
+#define MEMCACHED_VERSION_STRING_LENGTH 12
 
-#define MEMCACHED_VERSION_STRING 12
+/* Public defines */
 #define MEMCACHED_DEFAULT_PORT 11211
-#define MEMCACHED_DEFAULT_COMMAND_SIZE 350
 #define MEMCACHED_MAX_KEY 251 /* We add one to have it null terminated */
-#define MEMCACHED_MAX_BUFFER HUGE_STRING_LEN
+#define MEMCACHED_MAX_BUFFER 8196
 #define MEMCACHED_MAX_HOST_LENGTH 64
 #define MEMCACHED_WHEEL_SIZE 1024
 #define MEMCACHED_STRIDE 4
@@ -165,7 +163,7 @@ struct memcached_stat_st {
   uint64_t evictions;
   uint64_t bytes_read;
   uint64_t bytes_written;
-  char version[MEMCACHED_VERSION_STRING];
+  char version[MEMCACHED_VERSION_STRING_LENGTH];
 };
 
 struct memcached_string_st {

diff --git a/lib/common.h b/lib/common.h
index 35775ba8e873ac58f6f3fa901d8569a0a7a74d26..268109b31a2969d29fe8fb0a612280a871c3f1af 100644 (file)
--- a/lib/common.h
+++ b/lib/common.h
@@ -50,6 +50,10 @@
 #include "libmemcached_probes.h"
 
 #define MEMCACHED_BLOCK_SIZE 1024
+#define MEMCACHED_DEFAULT_COMMAND_SIZE 350
+#define SMALL_STRING_LEN 1024
+#define HUGE_STRING_LEN 8196
+
 
 typedef enum {
   MEM_NO_BLOCK= (1 << 0),

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 278f9da3292710d91a553491b235c9e3606d8ece..d3237fa8978509f134a6dfce4878addc1ffc0061 100644 (file)
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -10,8 +10,9 @@ static memcached_return set_hostinfo(memcached_server_st *server)
   sprintf(str_port, "%u", server->port);
 
   memset(&hints, 0, sizeof(hints));
+  hints.ai_family= AF_INET;
   hints.ai_socktype= SOCK_STREAM;
-  hints.ai_protocol= 0;
+  hints.ai_protocol= IPPROTO_TCP;
 
   e= getaddrinfo(server->hostname, str_port, &hints, &ai);
   if (e != 0)
@@ -217,6 +218,7 @@ test_connect:
         break;
       default:
         ptr->cached_errno= errno;
+        WATCHPOINT_ASSERT(errno == ECONNREFUSED);
         WATCHPOINT_ERRNO(ptr->cached_errno);
         close(ptr->hosts[server_key].fd);
         ptr->hosts[server_key].fd= -1;