Merge lp:~mordred/libmemcached/pandora-build into lp:~tangent-org/libmemcached/trunk

[Monty Taylor]

[Monty Taylor (mordred)]

Updated pandora-build. Also, fixed a header include - because it sure is used in the server protocol headers.

[lp:~mordred/libmemcached/pandora-build]

698. By Brian Aker <brian@gaz> on 2010-01-11

Style cleanup.

699. By Brian Aker <brian@gaz> on 2010-01-11

Name correction for test system.

700. By Brian Aker <brian@gaz> on 2010-01-11

New stats output for collection information.

701. By Brian Aker <brian@gaz> on 2010-01-11

Absorb test bits into anonymous structure.

702. By Brian Aker <brian@gaz> on 2010-01-11

Fix structure of test.c where we call code before/after a collection runs.

703. By Brian Aker <brian@gaz> on 2010-01-11

Updated test framework.

704. By Brian Aker <brian@gaz> on 2010-01-11

Updated .spec file for release.

705. By Brian Aker <brian@gaz> on 2010-01-11

.pop now ignored.

706. By Brian Aker <brian@gaz> on 2010-01-12

Updates for version 0.37.

707. By Brian Aker <brian@gaz> on 2010-01-12

Spec fix.

=== modified file '.bzrignore'
--- .bzrignore	2009-12-19 00:22:26 +0000
+++ .bzrignore	2010-01-12 00:36:12 +0000
@@ -39,20 +39,127 @@
 config/plugin.ac
 configure
 docs/*.[13]
+docs/*.html
+docs/pod2htmd.tmp
+docs/pod2htmi.tmp
 example/memcached_light
+hashkit_clone.pop
+hashkit_crc32.pop
+hashkit_create.pop
+hashkit_fnv1_32.pop
+hashkit_fnv1_64.pop
+hashkit_fnv1a_32.pop
+hashkit_fnv1a_64.pop
+hashkit_free.pop
+hashkit_functions.pop
+hashkit_hsieh.pop
+hashkit_is_allocated.pop
+hashkit_jenkins.pop
+hashkit_md5.pop
+hashkit_murmur.pop
+hashkit_value.pop
 libmemcached-*.tar.gz
 libmemcached-0.30-1.src.rpm
 libmemcached-0.30-1.x86_64.rpm
 libmemcached-0.31-1.src.rpm
 libmemcached-0.31-1.x86_64.rpm
 libmemcached-?.??/
+libmemcached.pop
+libmemcached/configure.h
 libmemcached/memcached_configure.h
+libmemcached_examples.pop
+libmemcachedutil.pop
 libtool
 libtool.m4
 ltoptions.m4
 ltsugar.m4
 ltversion.m4
 lt~obsolete.m4
+memcached_add.pop
+memcached_add_by_key.pop
+memcached_analyze.pop
+memcached_append.pop
+memcached_append_by_key.pop
+memcached_behavior_get.pop
+memcached_behavior_set.pop
+memcached_callback_get.pop
+memcached_callback_set.pop
+memcached_cas.pop
+memcached_cas_by_key.pop
+memcached_clone.pop
+memcached_create.pop
+memcached_decrement.pop
+memcached_decrement_with_initial.pop
+memcached_delete.pop
+memcached_delete_by_key.pop
+memcached_dump.pop
+memcached_fetch.pop
+memcached_fetch_execute.pop
+memcached_fetch_result.pop
+memcached_flush.pop
+memcached_flush_buffers.pop
+memcached_free.pop
+memcached_generate_hash_value.pop
+memcached_get.pop
+memcached_get_by_key.pop
+memcached_get_memory_allocators.pop
+memcached_get_user_data.pop
+memcached_increment.pop
+memcached_increment_with_initial.pop
+memcached_lib_version.pop
+memcached_mget.pop
+memcached_mget_by_key.pop
+memcached_mget_execute.pop
+memcached_mget_execute_by_key.pop
+memcached_pool_behavior_get.pop
+memcached_pool_behavior_set.pop
+memcached_pool_create.pop
+memcached_pool_destroy.pop
+memcached_pool_pop.pop
+memcached_pool_push.pop
+memcached_prepend.pop
+memcached_prepend_by_key.pop
+memcached_quit.pop
+memcached_replace.pop
+memcached_replace_by_key.pop
+memcached_result_cas.pop
+memcached_result_create.pop
+memcached_result_flags.pop
+memcached_result_free.pop
+memcached_result_key_length.pop
+memcached_result_key_value.pop
+memcached_result_length.pop
+memcached_result_st.pop
+memcached_result_value.pop
+memcached_server_add.pop
+memcached_server_add_unix_socket.pop
+memcached_server_count.pop
+memcached_server_list.pop
+memcached_server_list_append.pop
+memcached_server_list_count.pop
+memcached_server_list_free.pop
+memcached_server_push.pop
+memcached_servers_parse.pop
+memcached_set.pop
+memcached_set_by_key.pop
+memcached_set_memory_allocators.pop
+memcached_set_user_data.pop
+memcached_stat.pop
+memcached_stat_get_keys.pop
+memcached_stat_get_value.pop
+memcached_stat_servername.pop
+memcached_strerror.pop
+memcached_verbosity.pop
+memcached_version.pop
+memcapable.pop
+memcat.pop
+memcp.pop
+memdump.pop
+memerror.pop
+memflush.pop
+memrm.pop
+memslap.pop
+memstat.pop
 stamp-h1
 support/Makefile
 support/Makefile.in

=== modified file 'AUTHORS'
--- AUTHORS	2009-12-16 19:03:49 +0000
+++ AUTHORS	2010-01-12 00:36:12 +0000
@@ -3,7 +3,7 @@
 Patrick Galbraith, -- C++ Interface
 Padraig O'Sullivan, -- C++ Interface (current one)
 Tim Bunce, -- Docs
-Trond Norbye, [e-mail] -- Binary protocol, Misc
+Trond Norbye, [e-mail] -- Binary protocol, Misc
 Yin Chen, -- Ketama Work
 Toru Maesaka, [e-mail] -- Stats analysis
 Eric Lambert, -- UDP work

=== modified file 'ChangeLog'
--- ChangeLog	2010-01-06 17:22:43 +0000
+++ ChangeLog	2010-01-12 00:36:12 +0000
@@ -1,4 +1,14 @@
-0.36
+0.37
+ * Fixed build for libhashkit.
+ * Fixed install path regression.  
+ * Modified RPM to strict check install. 
+ * Added documentation for memcached_server_cursor();
+
+ * Added memcached_servers_reset().
+
+ * Modified memcached_st to remove dead cursor_server member.
+
+0.36 Wed Jan  6 18:23:50 PST 2010
   * Merged in new memslap utility.
   * All of constants.h has been updated to match style (all old identifiers
     continue to work).

=== modified file 'Makefile.am'
--- Makefile.am	2009-12-20 21:29:01 +0000
+++ Makefile.am	2010-01-12 00:36:12 +0000
@@ -10,18 +10,19 @@
 lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
-pkginclude_HEADERS =
-nobase_pkginclude_HEADERS =
+include_HEADERS =
+nobase_include_HEADERS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST = README.FIRST
 
-SUBDIRS = docs libhashkit
+SUBDIRS = docs
 
 test-docs:
 	(cd docs && $(MAKE) test-docs)
 include libmemcached/include.am
 include clients/include.am
+include libhashkit/include.am
 include tests/include.am
 include example/include.am
 include support/include.am

=== modified file 'clients/include.am'
--- clients/include.am	2009-12-17 21:24:01 +0000
+++ clients/include.am	2010-01-12 00:36:12 +0000
@@ -69,7 +69,7 @@
 		clients/ms_stats.c \
 		clients/ms_task.c \
 		clients/ms_thread.c
-clients_memslap_LDADD= $(LTLIBEVENT) clients/libgenexec.la $(CLIENTS_LDADDS)
+clients_memslap_LDADD= $(LTLIBEVENT) clients/libgenexec.la $(CLIENTS_LDADDS) $(LIBM)
 
 clients_memcapable_SOURCES= clients/memcapable.c
 if BUILD_BYTEORDER

=== modified file 'configure.ac'
--- configure.ac	2009-12-20 11:18:07 +0000
+++ configure.ac	2010-01-12 00:36:12 +0000
@@ -6,7 +6,7 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.35],[http://tangent.org/552/libmemcached.html])
+AC_INIT([libmemcached],[0.37],[http://tangent.org/552/libmemcached.html])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER([config.h])
@@ -14,6 +14,21 @@
 
 PANDORA_CANONICAL_TARGET
 
+#shared library versioning
+MEMCACHED_LIBRARY_VERSION=3:0:0
+#                         | | |
+#                  +------+ | +---+
+#                  |        |     |
+#                 current:revision:age
+#                  |        |     |
+#                  |        |     +- increment if interfaces have been added
+#                  |        |        set to zero if interfaces have been removed or changed
+#                  |        +- increment if source code has changed
+#                  |           set to zero if current is incremented
+#                  +- increment if interfaces have been added, removed or changed
+AC_SUBST(MEMCACHED_LIBRARY_VERSION)
+
+
 HASHKIT_LIBRARY_VERSION=0:0:0
 AC_SUBST(HASHKIT_LIBRARY_VERSION)
 
@@ -51,8 +66,7 @@
 AC_CONFIG_FILES([
   Makefile
   docs/Makefile
-  libmemcached/memcached_configure.h
-  libhashkit/Makefile
+  libmemcached/configure.h
   support/libmemcached.pc
   support/libmemcached.spec
   support/libmemcached-fc.spec

=== modified file 'docs/Makefile.am'
--- docs/Makefile.am	2009-12-20 11:18:07 +0000
+++ docs/Makefile.am	2010-01-12 00:36:12 +0000
@@ -1,116 +1,419 @@
-CLEANFILES= *.1 *.3
-
-
-EXTRA_DIST = \
-	  hashkit_create.pod \
-	  hashkit_functions.pod \
-	  hashkit_value.pod \
-	  libmemcached.pod \
-	  libmemcached_examples.pod \
-	  libmemcachedutil.pod \
-	  memcached_analyze.pod \
-	  memcached_auto.pod \
-	  memcached_behavior.pod \
-	  memcached_callback.pod \
-	  memcached_create.pod \
-	  memcached_delete.pod \
-	  memcached_dump.pod \
-	  memcached_flush.pod \
-	  memcached_flush_buffers.pod \
-	  memcached_generate_hash_value.pod \
-	  memcached_get.pod \
-	  memcached_memory_allocators.pod \
-	  memcached_pool.pod \
-	  memcached_quit.pod \
-	  memcached_server_st.pod \
-	  memcached_servers.pod \
-	  memcached_set.pod \
-	  memcached_stats.pod \
-	  memcached_strerror.pod \
-	  memcached_user_data.pod \
-	  memcached_verbosity.pod \
-	  memcached_version.pod \
-	  memcapable.pod \
-	  memcat.pod \
-	  memcp.pod \
-	  memdump.pod \
-	  memerror.pod \
-	  memflush.pod \
-	  memrm.pod \
-	  memslap.pod \
-	  memstat.pod
+# This file generates all of man/html pages that we use for documentation.
+#
+# When hacking this file you need to know that we take .pod files and turn
+# them into .pop files. .pop files are 1=1 for man pages, but one .pod
+# file may generate many .pop files.
+#
+#    -Brian
+#
+#
+CLEANFILES= *.1 *.3 *.html *.pop *.tmp
+
+BUILT_SOURCES=
+
+EXTRA_DIST= make_index.pl
+
+AUTO_PAGES= \
+	    memcached_increment.pop \
+	    memcached_increment_with_initial.pop \
+	    memcached_decrement.pop \
+	    memcached_decrement_with_initial.pop
+BUILT_SOURCES += ${AUTO_PAGES}
+
+BEHAVIOR_PAGES= \
+		memcached_behavior_get.pop \
+		memcached_behavior_set.pop
+BUILT_SOURCES += ${BEHAVIOR_PAGES}
+
+CALLBACK_PAGES= \
+		memcached_callback_get.pop \
+		memcached_callback_set.pop
+BUILT_SOURCES += ${CALLBACK_PAGES}
+
+CREATE_PAGES= \
+	      memcached_clone.pop \
+	      memcached_create.pop \
+	      memcached_free.pop \
+	      memcached_servers_reset.pop
+BUILT_SOURCES += ${CREATE_PAGES}
+
+DELETE_PAGES= \
+	      memcached_delete.pop \
+	      memcached_delete_by_key.pop
+BUILT_SOURCES += ${DELETE_PAGES}
+
+GENERIC_PAGES= \
+	       libmemcached.pop \
+	       libmemcached_examples.pop \
+	       libmemcachedutil.pop \
+	       memcached_analyze.pop \
+	       memcached_dump.pop \
+	       memcached_flush.pop \
+	       memcached_flush_buffers.pop \
+	       memcached_generate_hash_value.pop \
+	       memcached_quit.pop \
+	       memcached_strerror.pop \
+	       memcached_verbosity.pop \
+	       memcapable.pop \
+	       memcat.pop \
+	       memcp.pop \
+	       memdump.pop \
+	       memerror.pop \
+	       memflush.pop \
+	       memrm.pop \
+	       memslap.pop \
+	       memstat.pop
+BUILT_SOURCES += ${GENERIC_PAGES}
+
+GET_PAGES= \
+	   memcached_get.pop \
+	   memcached_get_by_key.pop \
+	   memcached_fetch_result.pop \
+	   memcached_fetch_execute.pop \
+	   memcached_mget.pop \
+	   memcached_mget_by_key.pop \
+	   memcached_mget_execute.pop \
+	   memcached_mget_execute_by_key.pop \
+	   memcached_fetch.pop
+BUILT_SOURCES += ${GET_PAGES}
+
+MEMORY_ALLOCATORS_PAGES= \
+			 memcached_get_memory_allocators.pop \
+			 memcached_set_memory_allocators.pop
+BUILT_SOURCES += ${MEMORY_ALLOCATORS_PAGES}
+
+POOL_PAGES= \
+	    memcached_pool_behavior_get.pop \
+	    memcached_pool_behavior_set.pop \
+	    memcached_pool_create.pop \
+	    memcached_pool_destroy.pop \
+	    memcached_pool_pop.pop \
+	    memcached_pool_push.pop 
+BUILT_SOURCES += ${POOL_PAGES}
+
+RESULT_PAGES= \
+	      memcached_result_cas.pop \
+	      memcached_result_create.pop \
+	      memcached_result_flags.pop \
+	      memcached_result_free.pop \
+	      memcached_result_key_length.pop \
+	      memcached_result_key_value.pop \
+	      memcached_result_length.pop \
+	      memcached_result_st.pop \
+	      memcached_result_value.pop
+BUILT_SOURCES += ${RESULT_PAGES}
+
+
+SERVER_PAGES= \
+	      memcached_server_count.pop \
+	      memcached_server_cursor.pop \
+	      memcached_server_list.pop \
+	      memcached_server_add.pop \
+	      memcached_server_add_unix_socket.pop \
+	      memcached_server_push.pop 
+BUILT_SOURCES += ${SERVER_PAGES}
+
+SERVER_ST_PAGES= \
+		 memcached_server_list_free.pop \
+		 memcached_server_list_count.pop \
+		 memcached_server_list_append.pop \
+		 memcached_servers_parse.pop 
+BUILT_SOURCES += ${SERVER_ST_PAGES}
+
+SET_PAGES= \
+	   memcached_set.pop \
+	   memcached_set_by_key.pop \
+	   memcached_cas.pop \
+	   memcached_cas_by_key.pop \
+	   memcached_replace.pop \
+	   memcached_replace_by_key.pop \
+	   memcached_add.pop \
+	   memcached_add_by_key.pop \
+	   memcached_prepend.pop \
+	   memcached_prepend_by_key.pop \
+	   memcached_append.pop \
+	   memcached_append_by_key.pop
+BUILT_SOURCES += ${SET_PAGES}
+
+STATS_PAGES= \
+	     memcached_stat.pop \
+	     memcached_stat_get_keys.pop .pop\
+	     memcached_stat_get_value.pop \
+	     memcached_stat_servername.pop
+BUILT_SOURCES += ${STATS_PAGES}
+
+USER_DATA_PAGES= \
+		 memcached_get_user_data.pop \
+		 memcached_set_user_data.pop
+BUILT_SOURCES += ${USER_DATA_PAGES}
+
+VERSION_PAGES= \
+	       memcached_version.pop \
+	       memcached_lib_version.pop
+BUILT_SOURCES += ${VERSION_PAGES}
+
+
+#
+# These are for libhashkit
+#
+HASHKIT_CREATE_PAGES= \
+		      hashkit_is_allocated.pop \
+		      hashkit_create.pop \
+		      hashkit_clone.pop \
+		      hashkit_free.pop
+BUILT_SOURCES += ${HASHKIT_CREATE_PAGES}
+
+HASHKIT_FUNCTIONS_PAGES= \
+			 hashkit_crc32.pop \
+			 hashkit_fnv1_32.pop \
+			 hashkit_fnv1_64.pop \
+			 hashkit_fnv1a_32.pop \
+			 hashkit_fnv1a_64.pop \
+			 hashkit_functions.pop \
+			 hashkit_hsieh.pop \
+			 hashkit_jenkins.pop \
+			 hashkit_md5.pop \
+			 hashkit_murmur.pop
+BUILT_SOURCES += ${HASHKIT_FUNCTIONS_PAGES}
+
+HASHKIT_ST_PAGES= \
+		  hashkit_value.pop
+BUILT_SOURCES += ${HASHKIT_ST_PAGES}
+
+
+HTML_FILES= \
+	    hashkit_clone.html \
+	    hashkit_crc32.html \
+	    hashkit_create.html \
+	    hashkit_fnv1_32.html \
+	    hashkit_fnv1_64.html \
+	    hashkit_fnv1a_32.html \
+	    hashkit_fnv1a_64.html \
+	    hashkit_free.html \
+	    hashkit_functions.html \
+	    hashkit_hsieh.html \
+	    hashkit_is_allocated.html \
+	    hashkit_jenkins.html \
+	    hashkit_md5.html \
+	    hashkit_murmur.html \
+	    hashkit_value.html \
+	    libmemcached_examples.html \
+	    libmemcached.html \
+	    libmemcachedutil.html \
+	    memcached_add_by_key.html \
+	    memcached_add.html \
+	    memcached_analyze.html \
+	    memcached_append_by_key.html \
+	    memcached_append.html \
+	    memcached_behavior_get.html \
+	    memcached_behavior_set.html \
+	    memcached_callback_get.html \
+	    memcached_callback_set.html \
+	    memcached_cas_by_key.html \
+	    memcached_cas.html \
+	    memcached_clone.html \
+	    memcached_create.html \
+	    memcached_decrement.html \
+	    memcached_decrement_with_initial.html \
+	    memcached_delete_by_key.html \
+	    memcached_delete.html \
+	    memcached_dump.html \
+	    memcached_fetch_execute.html \
+	    memcached_fetch.html \
+	    memcached_fetch_result.html \
+	    memcached_flush_buffers.html \
+	    memcached_flush.html \
+	    memcached_free.html \
+	    memcached_generate_hash_value.html \
+	    memcached_get_by_key.html \
+	    memcached_get_memory_allocators.html \
+	    memcached_get.html \
+	    memcached_get_user_data.html \
+	    memcached_increment.html \
+	    memcached_increment_with_initial.html \
+	    memcached_lib_version.html \
+	    memcached_mget_by_key.html \
+	    memcached_mget_execute_by_key.html \
+	    memcached_mget_execute.html \
+	    memcached_mget.html \
+	    memcached_pool_behavior_get.html \
+	    memcached_pool_behavior_set.html \
+	    memcached_pool_create.html \
+	    memcached_pool_destroy.html \
+	    memcached_pool_pop.html \
+	    memcached_pool_push.html \
+	    memcached_prepend_by_key.html \
+	    memcached_prepend.html \
+	    memcached_quit.html \
+	    memcached_replace_by_key.html \
+	    memcached_replace.html \
+	    memcached_result_cas.html \
+	    memcached_result_create.html \
+	    memcached_result_flags.html \
+	    memcached_result_free.html \
+	    memcached_result_key_length.html \
+	    memcached_result_key_value.html \
+	    memcached_result_length.html \
+	    memcached_result_st.html \
+	    memcached_result_value.html \
+	    memcached_server_add.html \
+	    memcached_server_add_unix_socket.html \
+	    memcached_server_count.html \
+	    memcached_server_cursor.html \
+	    memcached_server_list_append.html \
+	    memcached_server_list_count.html \
+	    memcached_server_list_free.html \
+	    memcached_server_list.html \
+	    memcached_server_push.html \
+	    memcached_servers_parse.html \
+	    memcached_set_by_key.html \
+	    memcached_set_memory_allocators.html \
+	    memcached_set.html \
+	    memcached_set_user_data.html \
+	    memcached_stat_get_keys.html \
+	    memcached_stat_get_value.html \
+	    memcached_stat.html \
+	    memcached_stat_servername.html \
+	    memcached_strerror.html \
+	    memcached_verbosity.html \
+	    memcached_version.html \
+	    memcapable.html \
+	    memcat.html \
+	    memcp.html \
+	    memdump.html \
+	    memerror.html \
+	    memflush.html \
+	    memrm.html \
+	    memslap.html \
+	    memstat.html
+
+POD_FILES= \
+	     hashkit_create.pod \
+	     hashkit_functions.pod \
+	     hashkit_value.pod \
+	     libmemcached.pod \
+	     libmemcached_examples.pod \
+	     libmemcachedutil.pod \
+	     memcached_analyze.pod \
+	     memcached_auto.pod \
+	     memcached_behavior.pod \
+	     memcached_callback.pod \
+	     memcached_create.pod \
+	     memcached_delete.pod \
+	     memcached_dump.pod \
+	     memcached_flush.pod \
+	     memcached_flush_buffers.pod \
+	     memcached_generate_hash_value.pod \
+	     memcached_get.pod \
+	     memcached_memory_allocators.pod \
+	     memcached_pool.pod \
+	     memcached_quit.pod \
+	     memcached_server_st.pod \
+	     memcached_servers.pod \
+	     memcached_set.pod \
+	     memcached_stats.pod \
+	     memcached_strerror.pod \
+	     memcached_user_data.pod \
+	     memcached_verbosity.pod \
+	     memcached_version.pod \
+	     memcapable.pod \
+	     memcat.pod \
+	     memcp.pod \
+	     memdump.pod \
+	     memerror.pod \
+	     memflush.pod \
+	     memrm.pod \
+	     memslap.pod \
+	     memstat.pod
+EXTRA_DIST+= $(POD_FILES)
 
 man_MANS = \
-	  libmemcached.3 \
-	  libmemcached_examples.3 \
-	  memcached_add.3 \
-	  memcached_add_by_key.3 \
-	  memcached_analyze.3 \
-	  memcached_append.3 \
-	  memcached_append_by_key.3 \
-	  memcached_behavior_get.3 \
-	  memcached_behavior_set.3 \
-	  memcached_callback_get.3 \
-	  memcached_callback_set.3 \
-	  memcached_cas.3 \
-	  memcached_cas_by_key.3 \
-	  memcached_clone.3 \
-	  memcached_create.3 \
-	  memcached_decrement.3 \
-	  memcached_decrement_with_initial.3 \
-	  memcached_delete.3 \
-	  memcached_delete_by_key.3 \
-	  memcached_dump.3 \
-	  memcached_fetch.3 \
-	  memcached_fetch_execute.3 \
-	  memcached_fetch_result.3 \
-	  memcached_flush_buffers.3 \
-	  memcached_free.3 \
-	  memcached_generate_hash_value.3 \
-	  memcached_get.3 \
-	  memcached_get_by_key.3 \
-	  memcached_get_memory_allocators.3 \
-	  memcached_get_user_data.3 \
-	  memcached_increment.3 \
-	  memcached_increment_with_initial.3 \
-	  memcached_lib_version.3 \
-	  memcached_mget.3 \
-	  memcached_mget_by_key.3 \
-	  memcached_mget_execute.3  \
-	  memcached_mget_execute_by_key.3  \
-	  memcached_prepend.3 \
-	  memcached_prepend_by_key.3 \
-	  memcached_quit.3 \
-	  memcached_replace.3 \
-	  memcached_replace_by_key.3 \
-	  memcached_server_add.3 \
-	  memcached_server_count.3 \
-	  memcached_server_list.3 \
-	  memcached_server_list_append.3 \
-	  memcached_server_list_count.3 \
-	  memcached_server_list_free.3 \
-	  memcached_server_push.3 \
-	  memcached_servers_parse.3 \
-	  memcached_set.3 \
-	  memcached_set_by_key.3 \
-	  memcached_set_memory_allocators.3 \
-	  memcached_set_user_data.3 \
-	  memcached_stat.3 \
-	  memcached_stat_get_keys.3 \
-	  memcached_stat_get_value.3 \
-	  memcached_stat_servername.3 \
-	  memcached_strerror.3 \
-	  memcached_verbosity.3 \
-	  memcached_version.3 \
-	  memcapable.1 \
-	  memcat.1 \
-	  memcp.1 \
-	  memdump.1 \
-	  memerror.1 \
-	  memflush.1 \
-	  memrm.1 \
-	  memslap.1 \
-	  memstat.1
+	   hashkit_clone.3 \
+	   hashkit_crc32.3 \
+	   hashkit_create.3 \
+	   hashkit_fnv1_32.3 \
+	   hashkit_fnv1_64.3 \
+	   hashkit_fnv1a_32.3 \
+	   hashkit_fnv1a_64.3 \
+	   hashkit_free.3 \
+	   hashkit_functions.3 \
+	   hashkit_hsieh.3 \
+	   hashkit_is_allocated.3 \
+	   hashkit_jenkins.3 \
+	   hashkit_md5.3 \
+	   hashkit_murmur.3 \
+	   hashkit_value.3 \
+	   libmemcached.3 \
+	   libmemcached_examples.3 \
+	   memcached_add.3 \
+	   memcached_add_by_key.3 \
+	   memcached_analyze.3 \
+	   memcached_append.3 \
+	   memcached_append_by_key.3 \
+	   memcached_behavior_get.3 \
+	   memcached_behavior_set.3 \
+	   memcached_callback_get.3 \
+	   memcached_callback_set.3 \
+	   memcached_cas.3 \
+	   memcached_cas_by_key.3 \
+	   memcached_clone.3 \
+	   memcached_create.3 \
+	   memcached_decrement.3 \
+	   memcached_decrement_with_initial.3 \
+	   memcached_delete.3 \
+	   memcached_delete_by_key.3 \
+	   memcached_dump.3 \
+	   memcached_fetch.3 \
+	   memcached_fetch_execute.3 \
+	   memcached_fetch_result.3 \
+	   memcached_flush_buffers.3 \
+	   memcached_free.3 \
+	   memcached_generate_hash_value.3 \
+	   memcached_get.3 \
+	   memcached_get_by_key.3 \
+	   memcached_get_memory_allocators.3 \
+	   memcached_get_user_data.3 \
+	   memcached_increment.3 \
+	   memcached_increment_with_initial.3 \
+	   memcached_lib_version.3 \
+	   memcached_mget.3 \
+	   memcached_mget_by_key.3 \
+	   memcached_mget_execute.3  \
+	   memcached_mget_execute_by_key.3  \
+	   memcached_prepend.3 \
+	   memcached_prepend_by_key.3 \
+	   memcached_quit.3 \
+	   memcached_replace.3 \
+	   memcached_replace_by_key.3 \
+	   memcached_server_add.3 \
+	   memcached_server_count.3 \
+	   memcached_server_cursor.3 \
+	   memcached_server_list.3 \
+	   memcached_server_list_append.3 \
+	   memcached_server_list_count.3 \
+	   memcached_server_list_free.3 \
+	   memcached_server_push.3 \
+	   memcached_servers_parse.3 \
+	   memcached_set.3 \
+	   memcached_set_by_key.3 \
+	   memcached_set_memory_allocators.3 \
+	   memcached_set_user_data.3 \
+	   memcached_stat.3 \
+	   memcached_stat_get_keys.3 \
+	   memcached_stat_get_value.3 \
+	   memcached_stat_servername.3 \
+	   memcached_strerror.3 \
+	   memcached_verbosity.3 \
+	   memcached_version.3 \
+	   memcapable.1 \
+	   memcat.1 \
+	   memcp.1 \
+	   memdump.1 \
+	   memerror.1 \
+	   memflush.1 \
+	   memrm.1 \
+	   memslap.1 \
+	   memstat.1
 
 if BUILD_LIBMEMCACHEDUTIL
 man_MANS+= \
@@ -124,349 +427,103 @@
 endif
 
 
-libmemcached.3: libmemcached.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/libmemcached.pod > libmemcached.3
-
-libmemcachedutil.3: libmemcachedutil.pod
-	${POD2MAN} -c "libmemcachedutil" -r "" -s 3 ${top_srcdir}/docs/libmemcachedutil.pod > libmemcachedutil.3
-
-libmemcached_examples.3: libmemcached_examples.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/libmemcached_examples.pod > libmemcached_examples.3
-
-memcached_create.3: memcached_create.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_create.pod > memcached_create.3
-
-memcached_free.3: memcached_create.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_create.pod > memcached_free.3
-
-memcached_clone.3: memcached_create.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_create.pod > memcached_clone.3
-
-memcached_set.3: memcached_set.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_set.3
-
-memcached_set_by_key.3: memcached_set.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_set_by_key.3
-
-memcached_cas.3: memcached_set.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_cas.3
-
-memcached_cas_by_key.3: memcached_set.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_cas_by_key.3
-
-memcached_replace.3: memcached_set.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_replace.3
-
-memcached_replace_by_key.3: memcached_set.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_replace_by_key.3
-
-memcached_add.3: memcached_set.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_add.3
-
-memcached_add_by_key.3: memcached_set.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_add_by_key.3
-
-memcached_prepend.3: memcached_set.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_prepend.3
-
-memcached_prepend_by_key.3: memcached_set.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_prepend_by_key.3
-
-memcached_append.3: memcached_set.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_append.3
-
-memcached_append_by_key.3: memcached_set.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_set.pod > memcached_append_by_key.3
-
-memcached_delete.3: memcached_delete.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_delete.pod > memcached_delete.3
-
-memcached_delete_by_key.3: memcached_delete.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_delete.pod > memcached_delete_by_key.3
-
-memcached_increment.3:
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_auto.pod > memcached_increment.3
-
-memcached_increment_with_initial.3:
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_auto.pod > memcached_increment_with_initial.3
-
-memcached_decrement.3:
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_auto.pod > memcached_decrement.3
-
-memcached_decrement_with_initial.3:
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_auto.pod > memcached_decrement_with_initial.3
-
-memcached_dump.3: memcached_dump.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_dump.pod > memcached_dump.3
-
-memcached_flush.3: memcached_flush.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_flush.pod > memcached_flush.3
-
-memcached_get.3: memcached_get.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_get.3
-
-memcached_get_by_key.3: memcached_get.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_get_by_key.3
-
-memcached_fetch_result.3: memcached_get.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_fetch_result.3
-
-memcached_fetch_execute.3: memcached_get.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_fetch_execute.3
-
-memcached_mget.3: memcached_get.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_mget.3
-
-memcached_mget_by_key.3: memcached_get.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_mget_by_key.3
-
-memcached_mget_execute.3: memcached_get.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_mget_execute.3
-
-memcached_mget_execute_by_key.3: memcached_get.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_mget_execute_by_key.3
-
-memcached_fetch.3: memcached_get.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_get.pod > memcached_fetch.3
-
-memcached_quit.3: memcached_quit.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_quit.pod > memcached_quit.3
-
-memcached_strerror.3: memcached_strerror.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_strerror.pod > memcached_strerror.3
-
-memcached_server_count.3: memcached_servers.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_servers.pod > memcached_server_count.3
-
-memcached_server_list.3: memcached_servers.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_servers.pod > memcached_server_list.3
-
-memcached_server_add.3: memcached_servers.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_servers.pod > memcached_server_add.3
-
-memcached_server_add_unix_socket.3: memcached_servers.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_servers.pod > memcached_server_add_unix_socket.3
-
-memcached_server_push.3: memcached_servers.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_servers.pod > memcached_server_push.3
-
-memcached_server_list_free.3: memcached_server_st.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_server_st.pod > memcached_server_list_free.3
-
-memcached_server_list_count.3: memcached_server_st.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_server_st.pod > memcached_server_list_count.3
-
-memcached_server_list_append.3: memcached_server_st.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_server_st.pod > memcached_server_list_append.3
-
-memcached_servers_parse.3: memcached_server_st.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_server_st.pod > memcached_servers_parse.3
-
-memcached_verbosity.3: memcached_verbosity.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_verbosity.pod > memcached_verbosity.3
-
-memcached_behavior_get.3: memcached_behavior.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_behavior.pod > memcached_behavior_get.3
-
-memcached_behavior_set.3: memcached_behavior.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_behavior.pod > memcached_behavior_set.3
-
-memcached_callback_get.3: memcached_callback.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_callback.pod > memcached_callback_get.3
-
-memcached_callback_set.3: memcached_callback.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_callback.pod > memcached_callback_set.3
-
-memcached_stat.3: memcached_stats.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_stats.pod > memcached_stat.3
-
-memcached_stat_servername.3: memcached_stats.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_stats.pod > memcached_stat_servername.3
-
-memcached_stat_get_value.3: memcached_stats.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_stats.pod > memcached_stat_get_value.3
-
-memcached_stat_get_keys.3: memcached_stats.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_stats.pod > memcached_stat_get_keys.3
-
-memcached_result_st.3: memcached_result_st.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_st.3
-
-memcached_result_create.3: memcached_result_st.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_create.3
-
-memcached_result_free.3: memcached_result_st.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_free.3
-
-memcached_result_key_value.3: memcached_result_st.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_key_value.3
-
-memcached_result_key_length.3: memcached_result_st.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_key_length.3
-
-memcached_result_value.3: memcached_result_st.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_value.3
-
-memcached_result_length.3: memcached_result_st.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_length.3
-
-memcached_result_flags.3: memcached_result_st.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_flags.3
-
-memcached_result_cas.3: memcached_result_st.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_result_st.pod > memcached_result_cas.3
-
-memcached_version.3: memcached_version.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_version.pod > memcached_version.3
-
-memcached_lib_version.3: memcached_version.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_version.pod  > memcached_lib_version.3
-
-memcached_flush_buffers.3: memcached_flush_buffers.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_flush_buffers.pod  > memcached_flush_buffers.3
-
-memcached_analyze.3: memcached_analyze.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_analyze.pod > memcached_analyze.3
-
-memcached_generate_hash_value.3: memcached_generate_hash_value.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_generate_hash_value.pod > memcached_generate_hash_value.3
-
-memcached_get_memory_allocators.3: memcached_memory_allocators.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_memory_allocators.pod > memcached_get_memory_allocators.3
-
-memcached_set_memory_allocators.3: memcached_memory_allocators.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_memory_allocators.pod > memcached_set_memory_allocators.3
-
-memcached_get_user_data.3: memcached_user_data.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_user_data.pod > memcached_get_user_data.3
-
-memcached_set_user_data.3: memcached_user_data.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 3 ${top_srcdir}/docs/memcached_user_data.pod > memcached_set_user_data.3
-
-memcached_pool_behavior_get.3: memcached_pool.pod
-	${POD2MAN} -c "libmemcachedutil" -r "" -s 3 ${top_srcdir}/docs/memcached_pool.pod > memcached_pool_behavior_get.3
-
-memcached_pool_behavior_set.3: memcached_pool.pod
-	${POD2MAN} -c "libmemcachedutil" -r "" -s 3 ${top_srcdir}/docs/memcached_pool.pod > memcached_pool_behavior_set.3
-
-memcached_pool_create.3: memcached_pool.pod
-	${POD2MAN} -c "libmemcachedutil" -r "" -s 3 ${top_srcdir}/docs/memcached_pool.pod > memcached_pool_create.3
-
-memcached_pool_destroy.3: memcached_pool.pod
-	${POD2MAN} -c "libmemcachedutil" -r "" -s 3 ${top_srcdir}/docs/memcached_pool.pod > memcached_pool_destroy.3
-
-memcached_pool_pop.3: memcached_pool.pod
-	${POD2MAN} -c "libmemcachedutil" -r "" -s 3 ${top_srcdir}/docs/memcached_pool.pod > memcached_pool_pop.3
-
-memcached_pool_push.3: memcached_pool.pod
-	${POD2MAN} -c "libmemcachedutil" -r "" -s 3 ${top_srcdir}/docs/memcached_pool.pod > memcached_pool_push.3
-
-memcp.1: memcp.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memcp.pod > memcp.1
-
-memslap.1: memslap.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memslap.pod > memslap.1
-
-memcapable.1: memcapable.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memcapable.pod > memcapable.1
-
-memcat.1: memcat.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memcat.pod > memcat.1
-
-memstat.1: memstat.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memstat.pod > memstat.1
-
-memrm.1: memrm.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memrm.pod > memrm.1
-
-memerror.1: memerror.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memerror.pod > memerror.1
-
-memdump.1: memdump.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memdump.pod > memdump.1
-
-memflush.1: memflush.pod
-	${POD2MAN} -c "libmemcached" -r "" -s 1 ${top_srcdir}/docs/memflush.pod > memflush.1
-
-hashkit_create.3: hashkit_create.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_create.pod > hashkit_create.3
-
-hashkit_clone.3: hashkit_create.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_create.pod > hashkit_clone.3
-
-hashkit_free.3: hashkit_create.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_create.pod > hashkit_free.3
-
-hashkit_is_allocated.3: hashkit_create.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_create.pod > hashkit_is_allocated.3
-
-hashkit_functions.3: hashkit_functions.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_functions.pod > hashkit_functions.3
-
-hashkit_fnv1_64.3: hashkit_functions.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_functions.pod > hashkit_fnv1_64.3
-
-hashkit_fnv1a_64.3: hashkit_functions.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_functions.pod > hashkit_fnv1a_64.3
-
-hashkit_fnv1_32.3: hashkit_functions.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_functions.pod > hashkit_fnv1_32.3
-
-hashkit_fnv1a_32.3: hashkit_functions.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_functions.pod > hashkit_fnv1a_32.3
-
-hashkit_crc32.3: hashkit_functions.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_functions.pod > hashkit_crc32.3
-
-hashkit_hsieh.3: hashkit_functions.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_functions.pod > hashkit_hsieh.3
-
-hashkit_murmur.3: hashkit_functions.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_functions.pod > hashkit_murmur.3
-
-hashkit_jenkins.3: hashkit_functions.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_functions.pod > hashkit_jenkins.3
-
-hashkit_md5.3: hashkit_functions.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_functions.pod > hashkit_md5.3
-
-hashkit_value.3: hashkit_value.pod
-	${POD2MAN} -c "libhashkit" -r "" -s 3 ${top_srcdir}/docs/hashkit_value.pod > hashkit_value.3
-
-test-docs:
-	${PODCHECKER} $(top_srcdir)/docs/hashkit_create.pod
-	${PODCHECKER} $(top_srcdir)/docs/hashkit_functions.pod
-	${PODCHECKER} $(top_srcdir)/docs/hashkit_value.pod
-	${PODCHECKER} $(top_srcdir)/docs/libmemcached.pod
-	${PODCHECKER} $(top_srcdir)/docs/libmemcached_examples.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_auto.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_behavior.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_callback.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_create.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_delete.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_flush.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_flush_buffers.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_get.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_memory_allocators.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_pool.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_quit.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_server_st.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_servers.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_set.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_stats.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_strerror.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_user_data.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_verbosity.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcached_version.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcapable.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcat.pod
-	${PODCHECKER} $(top_srcdir)/docs/memcp.pod
-	${PODCHECKER} $(top_srcdir)/docs/memerror.pod
-	${PODCHECKER} $(top_srcdir)/docs/memflush.pod
-	${PODCHECKER} $(top_srcdir)/docs/memrm.pod
-	${PODCHECKER} $(top_srcdir)/docs/memslap.pod
-	${PODCHECKER} $(top_srcdir)/docs/memstat.pod
-
-html-local:
-	pod2htmltree "/libmemcached" .
-
+${CREATE_PAGES}: 
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_create.pod ${top_builddir}/docs/$@
+
+${SET_PAGES}: 
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_set.pod ${top_builddir}/docs/$@
+
+${DELETE_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_delete.pod ${top_builddir}/docs/$@
+
+${AUTO_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_auto.pod ${top_builddir}/docs/$@
+
+${GET_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_get.pod ${top_builddir}/docs/$@
+
+${SERVER_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_servers.pod ${top_builddir}/docs/$@
+
+${SERVER_ST_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_server_st.pod ${top_builddir}/docs/$@
+
+${GENERIC_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/$*.pod ${top_builddir}/docs/$@
+
+${BEHAVIOR_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_behavior.pod ${top_builddir}/docs/$@
+
+${CALLBACK_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_callback.pod ${top_builddir}/docs/$@
+
+${STATS_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_stats.pod ${top_builddir}/docs/$@
+
+${RESULT_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_result_st.pod ${top_builddir}/docs/$@
+
+${VERSION_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_version.pod ${top_builddir}/docs/$@
+
+${MEMORY_ALLOCATORS_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_memory_allocators.pod ${top_builddir}/docs/$@
+
+${USER_DATA_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_user_data.pod ${top_builddir}/docs/$@
+
+
+${POOL_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/memcached_pool.pod ${top_builddir}/docs/$@
+
+${HASHKIT_CREATE_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/hashkit_create.pod ${top_builddir}/docs/$@
+
+
+${HASHKIT_FUNCTIONS_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/hashkit_functions.pod ${top_builddir}/docs/$@
+
+${HASHKIT_ST_PAGES}:
+	@rm -f $@
+	ln -s ${top_srcdir}/docs/hashkit_value.pod ${top_builddir}/docs/$@
+
+test-docs: $(POD_FILES)
+	${PODCHECKER} $(top_srcdir)/docs/$?
+
+html-local: html-pages html-index
+
+html-pages: $(HTML_FILES) 
+
+html-index: html-pages
+	perl make_index.pl *.html > index.html
+
+SUFFIXES= .pop .pod .html .1 .3
+
+.pop: ${_set}
+
+.pop.html:
+	pod2html --infile=$< >  $@
+
+.pop.1:
+	${POD2MAN} -c "$*" -r "" -s 1 $< >  $@
+
+.pop.3:
+	${POD2MAN} -c "$*" -r "" -s 3 $< >  $@

=== modified file 'docs/libmemcached.pod'
--- docs/libmemcached.pod	2009-12-16 18:53:44 +0000
+++ docs/libmemcached.pod	2010-01-12 00:36:12 +0000
@@ -113,7 +113,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/libmemcached_examples.pod'
--- docs/libmemcached_examples.pod	2009-12-16 18:53:44 +0000
+++ docs/libmemcached_examples.pod	2010-01-12 00:36:12 +0000
@@ -101,7 +101,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/libmemcachedutil.pod'
--- docs/libmemcachedutil.pod	2009-05-12 00:51:25 +0000
+++ docs/libmemcachedutil.pod	2010-01-12 00:36:12 +0000
@@ -27,11 +27,11 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 
-Trond Norbye, E<lt>[e-mail]<gt>
+Trond Norbye, E<lt>[e-mail]<gt>
 
 =head1 SEE ALSO
 

=== added file 'docs/make_index.pl'
--- docs/make_index.pl	1970-01-01 00:00:00 +0000
+++ docs/make_index.pl	2010-01-12 00:36:12 +0000
@@ -0,0 +1,30 @@
+#!/usr/bin/perl -w
+
+use strict;
+use CGI;
+
+sub main {
+  my $cgi = new CGI;
+
+  print $cgi->start_html('Libmemcached Documentation') . "\n";
+  print $cgi->h1('Libmemcached Documentation') . "\n";
+
+  print $cgi->a({ href => "libmemcached.html" }, "Introduction to Libmemcached") . $cgi->br() . "\n";
+  print $cgi->a({ href => "libmemcached_examples.html" }, "Libmemcached Examples") . $cgi->br() . "\n";
+  print $cgi->br() . "\n";
+  print $cgi->br() . "\n";
+
+  foreach (@ARGV)
+  {
+    my $url=  $_;
+    my $name= $_;
+    $name  =~ s/\.html//g;
+    next if $name eq 'index'; 
+    next if $name eq 'libmemcached'; 
+    next if $name eq 'libmemcached_examples'; 
+    print "<li\>" . $cgi->a({ href => $url }, $name) . $cgi->br() . "\n";
+  }
+  print $cgi->end_html; 
+}
+
+main();

=== modified file 'docs/memcached_analyze.pod'
--- docs/memcached_analyze.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_analyze.pod	2010-01-12 00:36:12 +0000
@@ -40,7 +40,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_auto.pod'
--- docs/memcached_auto.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_auto.pod	2010-01-12 00:36:12 +0000
@@ -124,7 +124,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_behavior.pod'
--- docs/memcached_behavior.pod	2010-01-02 04:50:19 +0000
+++ docs/memcached_behavior.pod	2010-01-12 00:36:12 +0000
@@ -234,7 +234,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_callback.pod'
--- docs/memcached_callback.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_callback.pod	2010-01-12 00:36:12 +0000
@@ -109,7 +109,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_create.pod'
--- docs/memcached_create.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_create.pod	2010-01-12 00:36:12 +0000
@@ -1,6 +1,6 @@
 =head1 NAME
 
-memcached_create, memcached_free - Create a memcached_st structure
+memcached_create, memcached_free, memcached_clone, memcached_servers_reset- Create a memcached_st structure
 
 =head1 LIBRARY
 
@@ -16,6 +16,8 @@
 
   memcached_st *memcached_clone (memcached_st *destination, memcached_st *source);
 
+  void memcached_servers_reset(memcached_st);
+
 =head1 DESCRIPTION
 
 memcached_create() is used to create a C<memcached_st> structure that will then
@@ -28,6 +30,9 @@
 the argument for the source to clone, it is the same as a call to memcached_create().
 If the destination argument is NULL a C<memcached_st> will be allocated for you.
 
+memcached_servers_reset() allows you to zero out the list of servers that
+the memcached_st has.
+
 To clean up memory associated with a C<memcached_st> structure you should pass
 it to memcached_free() when you are finished using it. memcached_free() is
 the only way to make sure all memory is deallocated when you finish using
@@ -48,7 +53,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_delete.pod'
--- docs/memcached_delete.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_delete.pod	2010-01-12 00:36:12 +0000
@@ -44,7 +44,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_dump.pod'
--- docs/memcached_dump.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_dump.pod	2010-01-12 00:36:12 +0000
@@ -39,7 +39,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_flush.pod'
--- docs/memcached_flush.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_flush.pod	2010-01-12 00:36:12 +0000
@@ -32,7 +32,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_flush_buffers.pod'
--- docs/memcached_flush_buffers.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_flush_buffers.pod	2010-01-12 00:36:12 +0000
@@ -28,11 +28,11 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 
-Trond Norbye, E<lt>[e-mail]<gt>
+Trond Norbye, E<lt>[e-mail]<gt>
 
 =head1 SEE ALSO
 

=== modified file 'docs/memcached_generate_hash_value.pod'
--- docs/memcached_generate_hash_value.pod	2010-01-02 04:50:19 +0000
+++ docs/memcached_generate_hash_value.pod	2010-01-12 00:36:12 +0000
@@ -46,7 +46,7 @@
 =head1 HOME
 
 To find out more information please check: 
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_get.pod'
--- docs/memcached_get.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_get.pod	2010-01-12 00:36:12 +0000
@@ -157,7 +157,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_memory_allocators.pod'
--- docs/memcached_memory_allocators.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_memory_allocators.pod	2010-01-12 00:36:12 +0000
@@ -67,11 +67,11 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 
-Trond Norbye, E<lt>[e-mail]<gt>
+Trond Norbye, E<lt>[e-mail]<gt>
 
 =head1 SEE ALSO
 

=== modified file 'docs/memcached_pool.pod'
--- docs/memcached_pool.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_pool.pod	2010-01-12 00:36:12 +0000
@@ -86,11 +86,11 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 
-Trond Norbye, E<lt>[e-mail]<gt>
+Trond Norbye, E<lt>[e-mail]<gt>
 
 =head1 SEE ALSO
 

=== modified file 'docs/memcached_quit.pod'
--- docs/memcached_quit.pod	2009-05-12 15:56:43 +0000
+++ docs/memcached_quit.pod	2010-01-12 00:36:12 +0000
@@ -33,7 +33,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_result_st.pod'
--- docs/memcached_result_st.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_result_st.pod	2010-01-12 00:36:12 +0000
@@ -101,7 +101,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_server_st.pod'
--- docs/memcached_server_st.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_server_st.pod	2010-01-12 00:36:12 +0000
@@ -61,7 +61,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_servers.pod'
--- docs/memcached_servers.pod	2009-12-19 01:28:01 +0000
+++ docs/memcached_servers.pod	2010-01-12 00:36:12 +0000
@@ -1,6 +1,6 @@
 =head1 NAME
 
-memcached_server_count, memcached_server_list, memcached_server_add, memcached_server_push, memcached_server_get_last_disconnect - Manage server list
+memcached_server_count, memcached_server_list, memcached_server_add, memcached_server_push, memcached_server_get_last_disconnect, memcached_server_cursor - Manage server list
 
 =head1 LIBRARY
 
@@ -10,7 +10,7 @@
 
   #include <memcached.h>
 
-  unsigned int memcached_server_count (memcached_st *ptr);
+  uint32_t memcached_server_count (memcached_st *ptr);
 
   memcached_server_st *
     memcached_server_list (memcached_st *ptr);
@@ -41,6 +41,12 @@
   memcached_server_st *
     memcached_server_get_last_disconnect (memcached_st *ptr)
 
+  memcached_return_t
+    memcached_server_cursor(memcached_st *ptr,
+                           memcached_server_fn *callback,
+                           void *context,
+                           uint32_t number_of_callbacks);
+
 
 =head1 DESCRIPTION
 
@@ -90,6 +96,13 @@
 server is currently dead but if the library is reporting a server is,
 the returned server is a very good candidate.
 
+memcached_server_cursor() takes a memcached_st and loops through the 
+list of hosts currently in the cursor calling the list of callback 
+functions provided. You can optionally pass in a value via 
+context which will be provided to each callback function. An error
+return from any callback will terminate the loop. memcached_server_cursor()
+is passed the original caller memcached_st in its current state. 
+
 =head1 RETURN
 
 Varies, see particular functions.
@@ -97,7 +110,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_set.pod'
--- docs/memcached_set.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_set.pod	2010-01-12 00:36:12 +0000
@@ -173,7 +173,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_stats.pod'
--- docs/memcached_stats.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_stats.pod	2010-01-12 00:36:12 +0000
@@ -70,7 +70,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_strerror.pod'
--- docs/memcached_strerror.pod	2009-12-19 01:28:01 +0000
+++ docs/memcached_strerror.pod	2010-01-12 00:36:12 +0000
@@ -33,7 +33,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_user_data.pod'
--- docs/memcached_user_data.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_user_data.pod	2010-01-12 00:36:12 +0000
@@ -36,11 +36,11 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 
-Trond Norbye, E<lt>[e-mail]<gt>
+Trond Norbye, E<lt>[e-mail]<gt>
 
 =head1 SEE ALSO
 

=== modified file 'docs/memcached_verbosity.pod'
--- docs/memcached_verbosity.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_verbosity.pod	2010-01-12 00:36:12 +0000
@@ -28,7 +28,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcached_version.pod'
--- docs/memcached_version.pod	2009-12-16 18:53:44 +0000
+++ docs/memcached_version.pod	2010-01-12 00:36:12 +0000
@@ -42,7 +42,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcapable.pod'
--- docs/memcapable.pod	2010-01-02 04:50:19 +0000
+++ docs/memcapable.pod	2010-01-12 00:36:12 +0000
@@ -47,11 +47,11 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 
-Trond Norbye, E<lt>[e-mail]<gt>
+Trond Norbye, E<lt>[e-mail]<gt>
 
 =head1 SEE ALSO
 

=== modified file 'docs/memcat.pod'
--- docs/memcat.pod	2009-05-11 12:07:17 +0000
+++ docs/memcat.pod	2010-01-12 00:36:12 +0000
@@ -21,7 +21,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memcp.pod'
--- docs/memcp.pod	2009-05-11 12:07:17 +0000
+++ docs/memcp.pod	2010-01-12 00:36:12 +0000
@@ -24,7 +24,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memdump.pod'
--- docs/memdump.pod	2009-05-19 20:32:02 +0000
+++ docs/memdump.pod	2010-01-12 00:36:12 +0000
@@ -17,7 +17,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memerror.pod'
--- docs/memerror.pod	2009-05-11 12:07:17 +0000
+++ docs/memerror.pod	2010-01-12 00:36:12 +0000
@@ -16,7 +16,7 @@
 =head1 HOME
 
 To find out more infoerroration please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memflush.pod'
--- docs/memflush.pod	2009-05-11 12:07:17 +0000
+++ docs/memflush.pod	2010-01-12 00:36:12 +0000
@@ -19,7 +19,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memrm.pod'
--- docs/memrm.pod	2009-05-11 12:07:17 +0000
+++ docs/memrm.pod	2010-01-12 00:36:12 +0000
@@ -18,7 +18,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<https://launchpad.net/libmemcached>
 
 =head1 AUTHOR
 

=== modified file 'docs/memslap.pod'
--- docs/memslap.pod	2010-01-05 22:55:54 +0000
+++ docs/memslap.pod	2010-01-12 00:36:12 +0000
@@ -88,14 +88,14 @@
 
 =head2 Effective implementation of generating key and value
 
-In order to improve time efficiency and space efficiency, asynchronous
+In order to improve time efficiency and space efficiency, 
 memslap creates a random characters table with 10M characters. All the
 suffixes of keys and values are generated from this random characters table.
 
 Memslap uses the offset in the character table and the length
 of the string to identify a string. It can save much memory.
 Each key contains two parts, a prefix and a suffix. The prefix is an
-uint64_t, 8 bytes. In order to verify the data set before, asynchronous
+uint64_t, 8 bytes. In order to verify the data set before, 
 memslap need to ensure each key is unique, so it uses the prefix to identify
 a key. The prefix cannot include illegal characters, such as ‘\r’, ‘\n’,
 ‘\0’ and ‘ ‘. And memslap has an algorithm to ensure that. 
@@ -188,7 +188,7 @@
 
 =back
 
-The user must specify one server at least to run asynchronous memslap. The
+The user must specify one server at least to run memslap. The
 rest of the parameters have default values, as shown below:
 
 Thread number = 1                    Concurrency = 16
@@ -221,7 +221,7 @@
 
 All the distributions are read from the configuration file specified by user
 with “—cfg_cmd” option. If the user does not specify a configuration file,
-asynchronous memslap will run with the default distribution (key size = 64,
+memslap will run with the default distribution (key size = 64,
 value size = 1024, get/set = 9:1). For information on how to edit the
 configuration file, refer to the “Configuration File” section.
 
@@ -232,22 +232,22 @@
 The minimum value size is 1 bytes; the maximum value size is 1M bytes. The
 precision of proportion is 0.001. The proportion of distribution will be
 rounded to 3 decimal places.
-Currently, asynchronous memslap only supports set and get commands. And it
+Currently, memslap only supports set and get commands. And it
 supports 100% set and 100% get. For 100% get, it will preset some objects to
 the server.
 
 =head2 Multi-thread and concurrency
 
-The high performance of asynchronous memslap benefits from the special
+The high performance of memslap benefits from the special
 schedule of thread and concurrency. It’s important to specify the proper
 number of them. The default number of threads is 1; the default number of
 concurrency is 16. The user can use “—threads” and “--concurrency” to
 specify these variables.
 
 If the system supports setting CPU affinity and the number of threads
-specified by the user is greater than 1, asynchronous memslap will try to
+specified by the user is greater than 1, memslap will try to
 bind each thread to a different CPU core. So if you want to get the best
-performance asynchronous memslap, it is better to specify the number of
+performance memslap, it is better to specify the number of
 thread equal to the number of CPU cores. The number of threads specified by
 the user can also be less or greater than the number of CPU cores. Because
 of the limitation of implementation, the number of concurrencies could be
@@ -277,15 +277,15 @@
 
 --threads=24 --concurrency=288
 
-The asynchronous memslap performs very well, when
+The memslap performs very well, when
 used to test the performance of memcached servers.
 Most of the time, the bottleneck is the network or
 the server. If for some reason the user wants to
-limit the performance of asynchronous memslap, there
+limit the performance of memslap, there
 are two ways to do this:
 
 Decrease the number of threads and concurrencies.
-Use the option “--tps” that Asynchronous memslap
+Use the option “--tps” that memslap
 provides to limit the throughput. This option allows
 the user to get the expected throughput. For
 example, assume that the maximum throughput is 50
@@ -298,7 +298,7 @@
 Most of the time, the user does not need to specify the window size. The
 default window size is 10k. For Schooner Memcached, the user can specify
 different window sizes to get different cache miss rates based on the test
-case. Asynchronous memslap supports cache miss rate between 0% and 100%.
+case. Memslap supports cache miss rate between 0% and 100%.
 If you use this utility to test the performance of Schooner Memcached, you
 can specify a proper window size to get the expected cache miss rate. The
 formula for calculating window size is as follows:
@@ -341,7 +341,7 @@
 
 =head2 Verification
 
-Asynchronous memslap supports both data verification and expire-time
+Memslap supports both data verification and expire-time
 verification. The user can use "--verify=" or "-v" to specify the proportion
 of data verification. In theory, it supports 100% data verification. The
 user can use "--exp_verify=" or "-e" to specify the proportion of
@@ -351,14 +351,14 @@
 
 For example: --exp_verify=0.01 –verify=0.1 , it means that 1% of the objects 
 set with expire-time, 10% of the objects gotten will be verified. If the
-objects are gotten, asynchronous memslap will verify the expire-time and
+objects are gotten, memslap will verify the expire-time and
 value. 
 
 =head2 multi-servers and multi-clients
 
-Asynchronous memslap supports multi-servers based on self-governed thread.
+Memslap supports multi-servers based on self-governed thread.
 There is a limitation that the number of servers cannot be greater than the
-number of threads. Asynchronous memslap assigns one thread to handle one
+number of threads. Memslap assigns one thread to handle one
 server at least. The user can use the "--servers=" or "-s" option to specify
 multi-servers. 
 
@@ -371,18 +371,18 @@
 and 4 handle server 1 (10.1.1.2); and thread 2 and 5 handle server 2
 (10.1.1.3).  
 
-All the threads and concurrencies in asynchronous memslap are self-governed.
+All the threads and concurrencies in memslap are self-governed.
 
-So is asynchronous memslap. The user can start up several asynchronous
-memslap instances. The user can run asynchronous memslap on different client
+So is memslap. The user can start up several 
+memslap instances. The user can run memslap on different client
 machines to communicate with the same memcached server at the same. It is
-recommended that the user start different asynchronous memslap on different
+recommended that the user start different memslap on different
 machines using the same configuration. 
 
 =head2 Run with execute number mode or time mode
 
-The default asynchronous memslap runs with time mode. The default run time
-is 10 minutes. If it times out, asynchronous memslap will exit. Do not
+The default memslap runs with time mode. The default run time
+is 10 minutes. If it times out, memslap will exit. Do not
 specify both execute number mode and time mode at the same time; just
 specify one instead. 
 
@@ -400,7 +400,7 @@
 
 --stat_freq=20s
 
-asynchronous memslap will dump the statistics of the commands (get and set) at the frequency of every 20
+Memslap will dump the statistics of the commands (get and set) at the frequency of every 20
 seconds. 
 
 For more information on the format of dumping statistic information, refer to “Format of Output” section.
@@ -408,23 +408,22 @@
 =head2 Multi-get
 
 The user can use "--division=" or "-d" to specify multi-get keys count.
-Asynchronous memslap by default does single get with TCP. Asynchronous
-memslap also supports data verification and expire-time verification for
-multi-get. 
+Memslap by default does single get with TCP. Memslap also supports data 
+verification and expire-time verification for multi-get. 
 
-Asynchronous memslap supports multi-get with both TCP and UDP. Because of
+Memslap supports multi-get with both TCP and UDP. Because of
 the different implementation of the ASCII protocol and binary protocol,
 there are some differences between the two. For the ASCII protocol,
-asynchronous memslap sends one “multi-get” to the server once. For the
-binary protocol, asynchronous memslap sends several single get commands
+memslap sends one “multi-get” to the server once. For the
+binary protocol, memslap sends several single get commands
 together as “multi-get” to the server.
 
 =head2 UDP and TCP
 
-Asynchronous memslap supports both UDP and TCP. For TCP, asynchronous
+Memslap supports both UDP and TCP. For TCP,
 memslap does not reconnect the memcached server if socket connections are
 lost. If all the socket connections are lost or memcached server crashes,
-asynchronous memslap will exit. If the user specifies the “--reconnect”
+memslap will exit. If the user specifies the “--reconnect”
 option when socket connections are lost, it will reconnect them. 
 
 User can use “--udp” to enable the UDP feature, but UDP comes with some
@@ -449,10 +448,10 @@
 
 For example: --facebook --division=50 --conn_sock=200
 
-The above command means that asynchronous memslap will do facebook test,
+The above command means that memslap will do facebook test,
 each concurrency has 200 socket TCP connections and one UDP socket.
 
-Asynchronous memslap sets objects with the TCP socket, and multi-gets 50
+Memslap sets objects with the TCP socket, and multi-gets 50
 objects once with the UDP socket.
 
 If you specify "--division=50", the key size must be less that 25 bytes
@@ -468,16 +467,16 @@
 --servers=10.1.1.1:11211,10.1.1.2:11212 –rep_write=2
 
 The above command means that there are 2 replication memcached servers,
-asynchronous memslap will set objects to both server 0 and server 1, get
+memslap will set objects to both server 0 and server 1, get
 objects which are set to server 0 before from server 1, and also get objects
 which are set to server 1 before from server 0. If server 0 crashes,
-asynchronous memslap will only get objects from server 1. If server 0 comes
-back to life again, asynchronous memslap will reconnect server 0. If both
-server 0 and server 1 crash, asynchronous memslap will exit.
+memslap will only get objects from server 1. If server 0 comes
+back to life again, memslap will reconnect server 0. If both
+server 0 and server 1 crash, memslap will exit.
 
 =head2  Supports thousands of TCP connections
 
-Start asynchronous memslap with "--conn_sock=" or "-n" to enable this
+Start memslap with "--conn_sock=" or "-n" to enable this
 feature. Make sure that your system can support opening thousands of files
 and creating thousands of sockets. However, this feature does not support
 reconnection if sockets disconnect. 
@@ -486,14 +485,14 @@
 
 --threads=8 --concurrency=128 --conn_sock=128
 
-The above command means that asynchronous memslap starts up 8 threads, each
+The above command means that memslap starts up 8 threads, each
 thread has 16 concurrencies, each concurrency has 128 TCP socket
 connections, and the total number of TCP socket connections is 128 * 128 =
 16384.
 
 =head2 Supports binary protocol
 
-Start asynchronous memslap with "--binary" or "-B" options to enable this
+Start memslap with "--binary" or "-B" options to enable this
 feature. It supports all the above features except UDP, because the latest
 memcached 1.3.3 does not implement binary UDP protocol.
 
@@ -501,7 +500,7 @@
 
 --binary
 
-Since memcached 1.3.3 doesn't implement binary UDP protocol, asynchronous
+Since memcached 1.3.3 doesn't implement binary UDP protocol,
 memslap does not support UDP. In addition, memcached 1.3.3 does not support
 multi-get. If you specify "--division=50" option, it just sends 50 get
 commands together as “mulit-get” to the server.
@@ -520,7 +519,7 @@
  #start_len must be equal to or greater than 16
  #end_len must be equal to or less than 250
  #start_len must be equal to or greater than end_len
- #asynchronous memslap will generate keys according to the key range
+ #memslap will generate keys according to the key range
  #proportion: indicates keys generated from one range accounts for the total
  generated keys  
  #
@@ -545,7 +544,7 @@
  #start_len must be equal to or greater than 1
  #end_len must be equal to or less than 1M
  #start_len must be equal to or greater than end_len
- #asynchronous memslap will generate values according to the value range
+ #memslap will generate values according to the value range
  #proportion: indicates values generated from one range accounts for the
  total generated values  
  #
@@ -566,7 +565,7 @@
  #cmd
  #cmd_type cmd_proportion
  #
- #currently asynchronous memslap only supports get and set command.
+ #currently memslap only supports get and set command.
  #
  #cmd_type
  #set     0
@@ -587,7 +586,7 @@
 
 =head1 Format of output
 
-At the beginning, asynchronous memslap displays some configuration information as follows:
+At the beginning, memslap displays some configuration information as follows:
 
 =over 4
 
@@ -605,21 +604,21 @@
 
 =back
 
-=head4 Where
+=head2 Where
 
 =over 4
 
 =item threads count
 
-The number of threads asynchronous memslap runs with.
+The number of threads memslap runs with.
 
 =item concurrency
 
-The number of concurrencies asynchronous memslap runs with.
+The number of concurrencies memslap runs with.
 
 =item run time
 
-How long to run asynchronous memslap.
+How long to run memslap.
 
 =item windows size
 
@@ -665,7 +664,7 @@
  117.93     195.60
  ---------------------------------------------------------------------------------------------------------------------------------
 
-=head4 Where
+=head2 Where
 
 =over 4
 
@@ -727,7 +726,7 @@
 
 =back
 
-At the end, asynchronous memslap will output something like this:
+At the end, memslap will output something like this:
 
   ---------------------------------------------------------------------------------------------------------------------------------
   Get Statistics (1257956 events)
@@ -780,7 +779,7 @@
   Run time: 20.0s Ops: 1397754 TPS: 69817 Net_rate: 59.4M/s
   ---------------------------------------------------------------------------------------------------------------------------------
 
-=head4 Where
+=head2 Where
 
 =over 4
 
@@ -984,8 +983,6 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
-
 L<http://launchpad.org/libmemcached>
 
 =head1 AUTHORS

=== modified file 'docs/memstat.pod'
--- docs/memstat.pod	2009-05-11 12:07:17 +0000
+++ docs/memstat.pod	2010-01-12 00:36:12 +0000
@@ -19,7 +19,7 @@
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<http://launchpad.org/libmemcached>
 
 =head1 AUTHOR
 

=== removed file 'libhashkit/Makefile.am'
--- libhashkit/Makefile.am	2009-12-17 17:28:30 +0000
+++ libhashkit/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-# HashKit
-# Copyright (C) 2009 Brian Aker
-# All rights reserved.
-#
-# Use and distribution licensed under the BSD license.  See
-# the COPYING file in the parent directory for full text.
-
-lib_LTLIBRARIES= libhashkit.la
-
-libhashkitincludedir= ${includedir}/libhashkit
-
-dist_libhashkitinclude_HEADERS= \
-	algorithm.h \
-	behavior.h \
-        hashkit.h \
-	strerror.h \
-        types.h \
-        visibility.h
-
-noinst_HEADERS= \
-		common.h
-
-libhashkit_la_SOURCES= \
-        crc32.c \
-        behavior.c \
-        default.c \
-        fnv.c \
-        hashkit.c \
-        jenkins.c \
-        ketama.c \
-        md5.c \
-        murmur.c \
-	strerror.c
-
-if INCLUDE_HSIEH_SRC
-libhashkit_la_SOURCES+= hsieh.c
-endif
-
-libhashkit_la_CFLAGS= \
-        ${AM_CFLAGS} \
-        -DBUILDING_HASHKIT
-
-libhashkit_la_LDFLAGS= \
-	$(LIBM) \
-        -version-info $(HASHKIT_LIBRARY_VERSION)

=== modified file 'libhashkit/hsieh.c'
--- libhashkit/hsieh.c	2009-12-17 17:28:30 +0000
+++ libhashkit/hsieh.c	2010-01-12 00:36:12 +0000
@@ -1,11 +1,11 @@
 /* By Paul Hsieh (C) 2004, 2005.  Covered under the Paul Hsieh
- * derivative license. 
+ * derivative license.
  * See: http://www.azillionmonkeys.com/qed/weblicense.html for license
  * details.
  * http://www.azillionmonkeys.com/qed/hash.html
 */
 
-#include "hash_common.h"
+#include "common.h"
 
 #undef get16bits
 #if (defined(__GNUC__) && defined(__i386__))

=== added file 'libhashkit/include.am'
--- libhashkit/include.am	1970-01-01 00:00:00 +0000
+++ libhashkit/include.am	2010-01-12 00:36:12 +0000
@@ -0,0 +1,47 @@
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+#
+# HashKit
+# Copyright (C) 2009 Brian Aker
+# All rights reserved.
+#
+# Use and distribution licensed under the BSD license.  See
+# the COPYING file in the parent directory for full text.
+
+lib_LTLIBRARIES+= libhashkit/libhashkit.la
+
+nobase_include_HEADERS+= \
+			    libhashkit/algorithm.h \
+			    libhashkit/behavior.h \
+			    libhashkit/hashkit.h \
+			    libhashkit/strerror.h \
+			    libhashkit/types.h \
+			    libhashkit/visibility.h
+
+noinst_HEADERS+= \
+		 libhashkit/common.h
+
+libhashkit_libhashkit_la_SOURCES= \
+				  libhashkit/crc32.c \
+				  libhashkit/behavior.c \
+				  libhashkit/default.c \
+				  libhashkit/fnv.c \
+				  libhashkit/hashkit.c \
+				  libhashkit/jenkins.c \
+				  libhashkit/ketama.c \
+				  libhashkit/md5.c \
+				  libhashkit/murmur.c \
+				  libhashkit/strerror.c
+
+if INCLUDE_HSIEH_SRC
+libhashkit_libhashkit_la_SOURCES+= libhashkit/hsieh.c
+endif
+
+libhashkit_libhashkit_la_CFLAGS= \
+		      ${AM_CFLAGS} \
+		      -DBUILDING_HASHKIT
+
+libhashkit_libhashkit_la_LDFLAGS= \
+				  $(LIBM) \
+				  -version-info $(HASHKIT_LIBRARY_VERSION)

=== modified file 'libmemcached/analyze.c'
--- libmemcached/analyze.c	2010-01-03 01:24:11 +0000
+++ libmemcached/analyze.c	2010-01-12 00:36:12 +0000
@@ -70,7 +70,7 @@
 
   *error= MEMCACHED_SUCCESS;
   server_count= memcached_server_count(memc);
-  result= (memcached_analysis_st*)calloc(memc->number_of_hosts,
+  result= (memcached_analysis_st*)calloc(memcached_server_count(memc),
                                          sizeof(memcached_analysis_st));
 
   if (!result)

=== modified file 'libmemcached/auto.c'
--- libmemcached/auto.c	2009-12-16 23:01:10 +0000
+++ libmemcached/auto.c	2010-01-12 00:36:12 +0000
@@ -24,7 +24,7 @@
   unsigned int server_key;
   bool no_reply= ptr->flags.no_reply;
 
-  unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+  unlikely (ptr->hosts == NULL || memcached_server_count(ptr) == 0)
     return MEMCACHED_NO_SERVERS;
 
   if (ptr->flags.verify_key && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
@@ -82,7 +82,7 @@
   unsigned int server_key;
   bool no_reply= ptr->flags.no_reply;
 
-  unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+  unlikely (ptr->hosts == NULL || memcached_server_count(ptr) == 0)
     return MEMCACHED_NO_SERVERS;
 
   server_key= memcached_generate_hash(ptr, master_key, master_key_length);

=== modified file 'libmemcached/behavior.c'
--- libmemcached/behavior.c	2009-12-17 07:31:42 +0000
+++ libmemcached/behavior.c	2010-01-12 00:36:12 +0000
@@ -90,7 +90,7 @@
     memcached_quit(ptr);
     break;
   case MEMCACHED_BEHAVIOR_USE_UDP:
-    if (ptr->number_of_hosts)
+    if (memcached_server_count(ptr))
     {
       return MEMCACHED_FAILURE;
     }

=== renamed file 'libmemcached/memcached_configure.h.in' => 'libmemcached/configure.h.in'
--- libmemcached/memcached_configure.h.in	2009-12-02 22:04:02 +0000
+++ libmemcached/configure.h.in	2010-01-12 00:36:12 +0000
@@ -1,9 +1,12 @@
-/*
- * Summary: Preprocessor symbols set from configure we need install-time
- *
- * Copy: See Copyright for the status of this software.
- *
- * Author: Trond Norbye
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker, Trond Norbye
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary: Change the behavior of the memcached connection.
+ *
  */
 
 #ifndef MEMCACHED_CONFIGURE_H

=== modified file 'libmemcached/delete.c'
--- libmemcached/delete.c	2009-12-18 12:07:20 +0000
+++ libmemcached/delete.c	2010-01-12 00:36:12 +0000
@@ -32,7 +32,7 @@
   unlikely (rc != MEMCACHED_SUCCESS)
     return rc;
 
-  unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+  unlikely (ptr->hosts == NULL || memcached_server_count(ptr) == 0)
     return MEMCACHED_NO_SERVERS;
 
   server_key= memcached_generate_hash(ptr, master_key, master_key_length);
@@ -176,7 +176,7 @@
     for (uint32_t x= 0; x < ptr->number_of_replicas; ++x)
     {
       ++server_key;
-      if (server_key == ptr->number_of_hosts)
+      if (server_key == memcached_server_count(ptr))
         server_key= 0;
 
       memcached_server_st* server= &ptr->hosts[server_key];

=== modified file 'libmemcached/dump.c'
--- libmemcached/dump.c	2009-12-17 23:46:32 +0000
+++ libmemcached/dump.c	2010-01-12 00:36:12 +0000
@@ -15,10 +15,10 @@
   uint32_t server_key;
   uint32_t x;
 
-  unlikely (ptr->number_of_hosts == 0)
+  unlikely (memcached_server_count(ptr) == 0)
     return MEMCACHED_NO_SERVERS;
 
-  for (server_key= 0; server_key < ptr->number_of_hosts; server_key++)
+  for (server_key= 0; server_key < memcached_server_count(ptr); server_key++)
   {
     /* 256 I BELIEVE is the upper limit of slabs */
     for (x= 0; x < 256; x++)

=== modified file 'libmemcached/flush.c'
--- libmemcached/flush.c	2009-12-16 23:01:10 +0000
+++ libmemcached/flush.c	2010-01-12 00:36:12 +0000
@@ -26,10 +26,10 @@
   memcached_return_t rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
 
-  unlikely (ptr->number_of_hosts == 0)
+  unlikely (memcached_server_count(ptr) == 0)
     return MEMCACHED_NO_SERVERS;
 
-  for (x= 0; x < ptr->number_of_hosts; x++)
+  for (x= 0; x < memcached_server_count(ptr); x++)
   {
     bool no_reply= ptr->flags.no_reply;
 
@@ -56,7 +56,7 @@
   unsigned int x;
   protocol_binary_request_flush request= {.bytes= {0}};
 
-  unlikely (ptr->number_of_hosts == 0)
+  unlikely (memcached_server_count(ptr) == 0)
     return MEMCACHED_NO_SERVERS;
 
   request.message.header.request.magic= (uint8_t)PROTOCOL_BINARY_REQ;
@@ -66,7 +66,7 @@
   request.message.header.request.bodylen= htonl(request.message.header.request.extlen);
   request.message.body.expiration= htonl((uint32_t) expiration);
 
-  for (x= 0; x < ptr->number_of_hosts; x++)
+  for (x= 0; x < memcached_server_count(ptr); x++)
   {
     if (ptr->flags.no_reply)
       request.message.header.request.opcode= PROTOCOL_BINARY_CMD_FLUSHQ;
@@ -80,7 +80,7 @@
     } 
   }
 
-  for (x= 0; x < ptr->number_of_hosts; x++)
+  for (x= 0; x < memcached_server_count(ptr); x++)
   {
     if (memcached_server_response_count(&ptr->hosts[x]) > 0)
       (void)memcached_response(&ptr->hosts[x], NULL, 0, NULL);

=== modified file 'libmemcached/flush_buffers.c'
--- libmemcached/flush_buffers.c	2009-12-16 23:01:10 +0000
+++ libmemcached/flush_buffers.c	2010-01-12 00:36:12 +0000
@@ -1,19 +1,19 @@
 #include "common.h"
 
-memcached_return_t memcached_flush_buffers(memcached_st *mem)
+memcached_return_t memcached_flush_buffers(memcached_st *memc)
 {
   memcached_return_t ret= MEMCACHED_SUCCESS;
 
-  for (uint32_t x= 0; x < mem->number_of_hosts; ++x)
-    if (mem->hosts[x].write_buffer_offset != 0) 
+  for (uint32_t x= 0; x < memcached_server_count(memc); ++x)
+    if (memc->hosts[x].write_buffer_offset != 0) 
     {
-      if (mem->hosts[x].fd == -1 &&
-          (ret= memcached_connect(&mem->hosts[x])) != MEMCACHED_SUCCESS)
+      if (memc->hosts[x].fd == -1 &&
+          (ret= memcached_connect(&memc->hosts[x])) != MEMCACHED_SUCCESS)
       {
         WATCHPOINT_ERROR(ret);
         return ret;
       }
-      if (memcached_io_write(&mem->hosts[x], NULL, 0, 1) == -1)
+      if (memcached_io_write(&memc->hosts[x], NULL, 0, 1) == -1)
         ret= MEMCACHED_SOME_ERRORS;
     }
 

=== modified file 'libmemcached/get.c'
--- libmemcached/get.c	2009-12-17 08:03:27 +0000
+++ libmemcached/get.c	2010-01-12 00:36:12 +0000
@@ -155,12 +155,11 @@
     return MEMCACHED_NOT_SUPPORTED;
 
   LIBMEMCACHED_MEMCACHED_MGET_START();
-  ptr->cursor_server= 0;
 
   if (number_of_keys == 0)
     return MEMCACHED_NOTFOUND;
 
-  if (ptr->number_of_hosts == 0)
+  if (memcached_server_count(ptr) == 0)
     return MEMCACHED_NO_SERVERS;
 
   if (ptr->flags.verify_key && (memcached_key_test(keys, key_length, number_of_keys) == MEMCACHED_BAD_KEY_PROVIDED))
@@ -180,7 +179,7 @@
 
     It might be optimum to bounce the connection if count > some number.
   */
-  for (x= 0; x < ptr->number_of_hosts; x++)
+  for (x= 0; x < memcached_server_count(ptr); x++)
   {
     if (memcached_server_response_count(&ptr->hosts[x]))
     {
@@ -263,7 +262,7 @@
   /*
     Should we muddle on if some servers are dead?
   */
-  for (x= 0; x < ptr->number_of_hosts; x++)
+  for (x= 0; x < memcached_server_count(ptr); x++)
   {
     if (memcached_server_response_count(&ptr->hosts[x]))
     {
@@ -412,7 +411,7 @@
     request.message.header.request.opcode= PROTOCOL_BINARY_CMD_NOOP;
     request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
 
-    for (x= 0; x < ptr->number_of_hosts; x++)
+    for (x= 0; x < memcached_server_count(ptr); x++)
       if (memcached_server_response_count(&ptr->hosts[x]))
       {
         if (memcached_io_write(&ptr->hosts[x], NULL, 0, 1) == -1)
@@ -457,7 +456,7 @@
 
     for (x= 0; x < number_of_keys; ++x)
     {
-      if (hash[x] == ptr->number_of_hosts)
+      if (hash[x] == memcached_server_count(ptr))
         continue; /* Already successfully sent */
 
       uint32_t server= hash[x] + replica;
@@ -466,8 +465,8 @@
       if (randomize_read && ((server + start) <= (hash[x] + ptr->number_of_replicas)))
         server += start;
 
-      while (server >= ptr->number_of_hosts)
-        server -= ptr->number_of_hosts;
+      while (server >= memcached_server_count(ptr))
+        server -= memcached_server_count(ptr);
 
       if (dead_servers[server])
         continue;
@@ -516,7 +515,7 @@
       }
 
       memcached_server_response_increment(&ptr->hosts[server]);
-      hash[x]= ptr->number_of_hosts;
+      hash[x]= memcached_server_count(ptr);
     }
 
     if (success)
@@ -547,7 +546,7 @@
     bool* dead_servers;
 
     hash= ptr->call_malloc(ptr, sizeof(uint32_t) * number_of_keys);
-    dead_servers= ptr->call_calloc(ptr, ptr->number_of_hosts, sizeof(bool));
+    dead_servers= ptr->call_calloc(ptr, memcached_server_count(ptr), sizeof(bool));
 
     if (hash == NULL || dead_servers == NULL)
     {

=== modified file 'libmemcached/hash.c'
--- libmemcached/hash.c	2009-12-17 07:20:58 +0000
+++ libmemcached/hash.c	2010-01-12 00:36:12 +0000
@@ -111,9 +111,9 @@
   uint32_t hash= 1; /* Just here to remove compile warning */
 
 
-  WATCHPOINT_ASSERT(ptr->number_of_hosts);
+  WATCHPOINT_ASSERT(memcached_server_count(ptr));
 
-  if (ptr->number_of_hosts == 1)
+  if (memcached_server_count(ptr) == 1)
     return 0;
 
   hash= memcached_generate_hash_value(key, key_length, ptr->hash);
@@ -150,13 +150,13 @@
       return right->index;
     }
   case MEMCACHED_DISTRIBUTION_MODULA:
-    return hash % ptr->number_of_hosts;
+    return hash % memcached_server_count(ptr);
   case MEMCACHED_DISTRIBUTION_RANDOM:
-    return (uint32_t) random() % ptr->number_of_hosts;
+    return (uint32_t) random() % memcached_server_count(ptr);
   case MEMCACHED_DISTRIBUTION_CONSISTENT_MAX:
   default:
     WATCHPOINT_ASSERT(0); /* We have added a distribution without extending the logic */
-    return hash % ptr->number_of_hosts;
+    return hash % memcached_server_count(ptr);
   }
   /* NOTREACHED */
 }
@@ -169,9 +169,9 @@
 {
   uint32_t hash= 1; /* Just here to remove compile warning */
 
-  WATCHPOINT_ASSERT(ptr->number_of_hosts);
+  WATCHPOINT_ASSERT(memcached_server_count(ptr));
 
-  if (ptr->number_of_hosts == 1)
+  if (memcached_server_count(ptr) == 1)
     return 0;
 
   if (ptr->flags.hash_with_prefix_key)

=== modified file 'libmemcached/hosts.c'
--- libmemcached/hosts.c	2010-01-03 01:07:52 +0000
+++ libmemcached/hosts.c	2010-01-12 00:36:12 +0000
@@ -26,10 +26,10 @@
 
 static void sort_hosts(memcached_st *ptr)
 {
-  if (ptr->number_of_hosts)
+  if (memcached_server_count(ptr))
   {
-    qsort(ptr->hosts, ptr->number_of_hosts, sizeof(memcached_server_st), compare_servers);
-    ptr->hosts[0].count= (uint16_t) ptr->number_of_hosts;
+    qsort(ptr->hosts, memcached_server_count(ptr), sizeof(memcached_server_st), compare_servers);
+    ptr->hosts[0].number_of_hosts= memcached_server_count(ptr);
   }
 }
 
@@ -60,26 +60,6 @@
   return MEMCACHED_SUCCESS;
 }
 
-void server_list_free(memcached_st *ptr, memcached_server_st *servers)
-{
-  unsigned int x;
-
-  if (servers == NULL)
-    return;
-
-  for (x= 0; x < servers->count; x++)
-    if (servers[x].address_info)
-    {
-      freeaddrinfo(servers[x].address_info);
-      servers[x].address_info= NULL;
-    }
-
-  if (ptr)
-    ptr->call_free(ptr, servers);
-  else
-    free(servers);
-}
-
 static uint32_t ketama_server_hash(const char *key, unsigned int key_length, int alignment)
 {
   unsigned char results[16];
@@ -137,7 +117,7 @@
   {
     live_servers= 0;
     ptr->next_distribution_rebuild= 0;
-    for (host_index= 0; host_index < ptr->number_of_hosts; ++host_index)
+    for (host_index= 0; host_index < memcached_server_count(ptr); ++host_index)
     {
       if (list[host_index].next_retry <= now.tv_sec)
         live_servers++;
@@ -149,7 +129,9 @@
     }
   }
   else
-    live_servers= ptr->number_of_hosts;
+  {
+    live_servers= memcached_server_count(ptr);
+  }
 
   is_ketama_weighted= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED);
   points_per_server= (uint32_t) (is_ketama_weighted ? MEMCACHED_POINTS_PER_SERVER_KETAMA : MEMCACHED_POINTS_PER_SERVER);
@@ -173,7 +155,7 @@
 
   if (is_ketama_weighted)
   {
-    for (host_index = 0; host_index < ptr->number_of_hosts; ++host_index)
+    for (host_index = 0; host_index < memcached_server_count(ptr); ++host_index)
     {
       if (list[host_index].weight == 0)
       {
@@ -184,7 +166,7 @@
     }
   }
 
-  for (host_index = 0; host_index < ptr->number_of_hosts; ++host_index)
+  for (host_index = 0; host_index < memcached_server_count(ptr); ++host_index)
   {
     if (is_auto_ejecting && list[host_index].next_retry > now.tv_sec)
       continue;
@@ -295,12 +277,12 @@
 
   WATCHPOINT_ASSERT(ptr);
   WATCHPOINT_ASSERT(ptr->continuum);
-  WATCHPOINT_ASSERT(ptr->number_of_hosts * MEMCACHED_POINTS_PER_SERVER <= MEMCACHED_CONTINUUM_SIZE);
+  WATCHPOINT_ASSERT(memcached_server_count(ptr) * MEMCACHED_POINTS_PER_SERVER <= MEMCACHED_CONTINUUM_SIZE);
   ptr->continuum_points_counter= pointer_counter;
   qsort(ptr->continuum, ptr->continuum_points_counter, sizeof(memcached_continuum_item_st), continuum_item_cmp);
 
 #ifdef DEBUG
-  for (pointer_index= 0; ptr->number_of_hosts && pointer_index < ((live_servers * MEMCACHED_POINTS_PER_SERVER) - 1); pointer_index++)
+  for (pointer_index= 0; memcached_server_count(ptr) && pointer_index < ((live_servers * MEMCACHED_POINTS_PER_SERVER) - 1); pointer_index++)
   {
     WATCHPOINT_ASSERT(ptr->continuum[pointer_index].value <= ptr->continuum[pointer_index + 1].value);
   }
@@ -319,9 +301,9 @@
   if (!list)
     return MEMCACHED_SUCCESS;
 
-  count= list[0].count;
+  count= memcached_servers_count(list);
   new_host_list= ptr->call_realloc(ptr, ptr->hosts,
-                                   sizeof(memcached_server_st) * (count + ptr->number_of_hosts));
+                                   sizeof(memcached_server_st) * (count + memcached_server_count(ptr)));
 
   if (! new_host_list)
     return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
@@ -336,13 +318,13 @@
       return MEMCACHED_INVALID_HOST_PROTOCOL;
 
     WATCHPOINT_ASSERT(list[x].hostname[0] != 0);
-    memcached_server_create(ptr, &ptr->hosts[ptr->number_of_hosts]);
+    memcached_server_create(ptr, &ptr->hosts[memcached_server_count(ptr)]);
     /* TODO check return type */
-    (void)memcached_server_create_with(ptr, &ptr->hosts[ptr->number_of_hosts], list[x].hostname,
+    (void)memcached_server_create_with(ptr, &ptr->hosts[memcached_server_count(ptr)], list[x].hostname,
                                        list[x].port, list[x].weight, list[x].type);
     ptr->number_of_hosts++;
   }
-  ptr->hosts[0].count= (uint16_t) ptr->number_of_hosts;
+  ptr->hosts[0].number_of_hosts= memcached_server_count(ptr);
 
   return run_distribution(ptr);
 }
@@ -417,7 +399,7 @@
     return MEMCACHED_INVALID_HOST_PROTOCOL;
 
   new_host_list= ptr->call_realloc(ptr, ptr->hosts,
-                                   sizeof(memcached_server_st) * (ptr->number_of_hosts+1));
+                                   sizeof(memcached_server_st) * (ptr->number_of_hosts + 1));
 
   if (new_host_list == NULL)
     return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
@@ -425,9 +407,10 @@
   ptr->hosts= new_host_list;
 
   /* TODO: Check return type */
-  (void)memcached_server_create_with(ptr, &ptr->hosts[ptr->number_of_hosts], hostname, port, weight, type);
+  (void)memcached_server_create_with(ptr, &ptr->hosts[memcached_server_count(ptr)], hostname, port, weight, type);
   ptr->number_of_hosts++;
-  ptr->hosts[0].count= (uint16_t) ptr->number_of_hosts;
+
+  memcached_servers_set_count(&ptr->hosts[0], memcached_server_count(ptr));
 
   return run_distribution(ptr);
 }
@@ -438,7 +421,7 @@
   memcached_st *ptr= st_ptr->root;
   memcached_server_st *list= ptr->hosts;
 
-  for (x= 0, host_index= 0; x < ptr->number_of_hosts; x++)
+  for (x= 0, host_index= 0; x < memcached_server_count(ptr); x++)
   {
     if (strncmp(list[x].hostname, st_ptr->hostname, MEMCACHED_MAX_HOST_LENGTH) != 0 || list[x].port != st_ptr->port)
     {
@@ -484,7 +467,7 @@
   count= 1;
   if (ptr != NULL)
   {
-    count+= ptr[0].count;
+    count+= memcached_servers_count(ptr);
   }
 
   new_host_list= (memcached_server_st *)realloc(ptr, sizeof(memcached_server_st) * count);
@@ -498,21 +481,8 @@
   memcached_server_create_with(NULL, &new_host_list[count-1], hostname, port, weight, MEMCACHED_CONNECTION_TCP);
 
   /* Backwards compatibility hack */
-  new_host_list[0].count= (uint16_t) count;
+  memcached_servers_set_count(new_host_list, count);
 
   *error= MEMCACHED_SUCCESS;
   return new_host_list;
 }
-
-unsigned int memcached_server_list_count(memcached_server_st *ptr)
-{
-  if (ptr == NULL)
-    return 0;
-
-  return ptr[0].count;
-}
-
-void memcached_server_list_free(memcached_server_st *ptr)
-{
-  server_list_free(NULL, ptr);
-}

=== modified file 'libmemcached/include.am'
--- libmemcached/include.am	2009-12-30 03:18:20 +0000
+++ libmemcached/include.am	2010-01-12 00:36:12 +0000
@@ -3,10 +3,9 @@
 # All paths should be given relative to the root
 
 EXTRA_DIST+= \
+	     libmemcached/configure.h.in \
 	     libmemcached/libmemcached_probes.d \
-	     libmemcached/memcached/README.txt \
-	     libmemcached/memcached_configure.h.in
-
+	     libmemcached/memcached/README.txt
 
 noinst_HEADERS+= \
 		 libmemcached/byteorder.h \
@@ -14,36 +13,34 @@
 		 libmemcached/io.h \
 		 libmemcached/internal.h \
 		 libmemcached/common.h \
-		 libmemcached/memcached/protocol_binary.h \
 		 libmemcached/protocol/common.h \
 		 libmemcached/protocol/ascii_handler.h \
 		 libmemcached/protocol/binary_handler.h
 
-nobase_pkginclude_HEADERS+= \
-			    libmemcached/analyze.h \
-			    libmemcached/auto.h \
-			    libmemcached/behavior.h \
-			    libmemcached/callback.h \
-			    libmemcached/constants.h \
-			    libmemcached/dump.h \
-			    libmemcached/exception.hpp \
-			    libmemcached/get.h \
-			    libmemcached/memcached.h \
-			    libmemcached/memcached.hpp \
-			    libmemcached/memcached_configure.h \
-			    libmemcached/protocol/cache.h \
-			    libmemcached/protocol/callback.h \
-			    libmemcached/protocol_handler.h \
-			    libmemcached/result.h \
-			    libmemcached/server.h \
-			    libmemcached/stats.h \
-			    libmemcached/storage.h \
-			    libmemcached/string.h \
-			    libmemcached/types.h \
-			    libmemcached/visibility.h \
-			    libmemcached/watchpoint.h
-
-
+nobase_include_HEADERS+= \
+			 libmemcached/analyze.h \
+			 libmemcached/auto.h \
+			 libmemcached/behavior.h \
+			 libmemcached/callback.h \
+			 libmemcached/configure.h \
+			 libmemcached/constants.h \
+			 libmemcached/dump.h \
+			 libmemcached/exception.hpp \
+			 libmemcached/get.h \
+			 libmemcached/memcached.h \
+			 libmemcached/memcached.hpp \
+			 libmemcached/memcached/protocol_binary.h \
+			 libmemcached/protocol/cache.h \
+			 libmemcached/protocol/callback.h \
+			 libmemcached/protocol_handler.h \
+			 libmemcached/result.h \
+			 libmemcached/server.h \
+			 libmemcached/stats.h \
+			 libmemcached/storage.h \
+			 libmemcached/string.h \
+			 libmemcached/types.h \
+			 libmemcached/visibility.h \
+			 libmemcached/watchpoint.h
 
 lib_LTLIBRARIES+= libmemcached/libmemcachedprotocol.la
 libmemcached_libmemcachedprotocol_la_SOURCES =  \
@@ -111,10 +108,12 @@
 
 libmemcached_libmemcached_la_DEPENDENCIES= libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la
 libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la
-libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info 3:0:0
+libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info ${MEMCACHED_LIBRARY_VERSION}
 
 if BUILD_LIBMEMCACHEDUTIL
-pkginclude_HEADERS+= libmemcached/memcached_util.h libmemcached/util/pool.h
+nobase_include_HEADERS+= \
+			 libmemcached/memcached_util.h \
+			 libmemcached/util/pool.h
 lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
 endif
 

=== modified file 'libmemcached/io.c'
--- libmemcached/io.c	2009-12-18 11:18:05 +0000
+++ libmemcached/io.c	2010-01-12 00:36:12 +0000
@@ -156,7 +156,7 @@
 
   return;
 
-  for (x= 0; x < ptr->number_of_hosts; x++)
+  for (x= 0; x < memcached_server_count(ptr); x++)
   {
     if (memcached_server_response_count(ptr, x) &&
         ptr->hosts[x].read_data_length < MEMCACHED_MAX_BUFFER )
@@ -361,7 +361,7 @@
   unsigned int host_index= 0;
 
   for (unsigned int x= 0;
-       x< memc->number_of_hosts && host_index < MAX_SERVERS_TO_POLL;
+       x< memcached_server_count(memc) && host_index < MAX_SERVERS_TO_POLL;
        ++x)
   {
     if (memc->hosts[x].read_buffer_length > 0) /* I have data in the buffer */
@@ -379,7 +379,7 @@
   if (host_index < 2)
   {
     /* We have 0 or 1 server with pending events.. */
-    for (unsigned int x= 0; x< memc->number_of_hosts; ++x)
+    for (unsigned int x= 0; x< memcached_server_count(memc); ++x)
       if (memcached_server_response_count(&memc->hosts[x]) > 0)
         return &memc->hosts[x];
 
@@ -394,11 +394,17 @@
   case 0:
     break;
   default:
-    for (unsigned int x= 0; x < host_index; ++x)
+    for (size_t x= 0; x < host_index; ++x)
+    {
       if (fds[x].revents & POLLIN)
-        for (unsigned int y= 0; y < memc->number_of_hosts; ++y)
+      {
+        for (unsigned int y= 0; y < memcached_server_count(memc); ++y)
+        {
           if (memc->hosts[y].fd == fds[x].fd)
             return &memc->hosts[y];
+        }
+      }
+    }
   }
 
   return NULL;

=== modified file 'libmemcached/memcached.c'
--- libmemcached/memcached.c	2009-12-18 02:37:31 +0000
+++ libmemcached/memcached.c	2010-01-12 00:36:12 +0000
@@ -44,6 +44,38 @@
   return ptr;
 }
 
+void server_list_free(memcached_st *ptr, memcached_server_st *servers)
+{
+  uint32_t x;
+
+  if (servers == NULL)
+    return;
+
+  for (x= 0; x < memcached_servers_count(servers); x++)
+    if (servers[x].address_info)
+    {
+      freeaddrinfo(servers[x].address_info);
+      servers[x].address_info= NULL;
+    }
+
+  if (ptr)
+  {
+    ptr->call_free(ptr, servers);
+  }
+  else
+    free(servers);
+}
+
+void memcached_servers_reset(memcached_st *ptr)
+{
+  server_list_free(ptr, ptr->hosts);
+
+  ptr->hosts= NULL;
+  ptr->number_of_hosts= 0;
+  ptr->last_disconnected_server= NULL;
+  ptr->server_failure_limit= 0;
+}
+
 void memcached_free(memcached_st *ptr)
 {
   /* If we have anything open, lets close it now */

=== modified file 'libmemcached/memcached.h'
--- libmemcached/memcached.h	2009-12-22 06:58:44 +0000
+++ libmemcached/memcached.h	2010-01-12 00:36:12 +0000
@@ -24,7 +24,7 @@
 #include <netinet/in.h>
 
 #include <libmemcached/visibility.h>
-#include <libmemcached/memcached_configure.h>
+#include <libmemcached/configure.h>
 #include <libmemcached/constants.h>
 #include <libmemcached/types.h>
 #include <libmemcached/string.h>
@@ -52,7 +52,7 @@
   } options;
   memcached_server_distribution_t distribution;
   memcached_hash_t hash;
-  uint32_t continuum_points_counter;
+  uint32_t continuum_points_counter; // Ketama
   memcached_server_st *hosts;
   memcached_server_st *last_disconnected_server;
   int32_t snd_timeout;
@@ -62,7 +62,6 @@
   uint32_t io_bytes_watermark;
   uint32_t io_key_prefetch;
   uint32_t number_of_hosts;
-  uint32_t cursor_server;
   int cached_errno;
   struct {
     bool auto_eject_hosts:1;
@@ -84,16 +83,16 @@
   int32_t poll_timeout;
   int32_t connect_timeout;
   int32_t retry_timeout;
-  uint32_t continuum_count;
+  uint32_t continuum_count; // Ketama
   int send_size;
   int recv_size;
   void *user_data;
-  time_t next_distribution_rebuild;
+  time_t next_distribution_rebuild; // Ketama
   size_t prefix_key_length;
   uint32_t number_of_replicas;
   memcached_hash_t distribution_hash;
   memcached_result_st result;
-  memcached_continuum_item_st *continuum;
+  memcached_continuum_item_st *continuum; // Ketama
   memcached_clone_fn on_clone;
   memcached_cleanup_fn on_cleanup;
   memcached_free_fn call_free;
@@ -109,6 +108,9 @@
 LIBMEMCACHED_API
 memcached_return_t memcached_version(memcached_st *ptr);
 
+LIBMEMCACHED_API
+void memcached_servers_reset(memcached_st *ptr);
+
 /* Public API */
 
 LIBMEMCACHED_API

=== modified file 'libmemcached/memcached/protocol_binary.h'
--- libmemcached/memcached/protocol_binary.h	2009-10-05 21:00:48 +0000
+++ libmemcached/memcached/protocol_binary.h	2010-01-12 00:36:12 +0000
@@ -29,7 +29,7 @@
  *
  * Copy: See Copyright for the status of this software.
  *
- * Author: Trond Norbye <[e-mail]>
+ * Author: Trond Norbye <[e-mail]>
  */
 
 #ifndef PROTOCOL_BINARY_H

=== modified file 'libmemcached/quit.c'
--- libmemcached/quit.c	2009-12-18 11:17:36 +0000
+++ libmemcached/quit.c	2010-01-12 00:36:12 +0000
@@ -72,12 +72,12 @@
   unsigned int x;
 
   if (ptr->hosts == NULL ||
-      ptr->number_of_hosts == 0)
+      memcached_server_count(ptr) == 0)
     return;
 
-  if (ptr->hosts && ptr->number_of_hosts)
+  if (ptr->hosts && memcached_server_count(ptr))
   {
-    for (x= 0; x < ptr->number_of_hosts; x++)
+    for (x= 0; x < memcached_server_count(ptr); x++)
       memcached_quit_server(&ptr->hosts[x], 0);
   }
 }

=== modified file 'libmemcached/server.c'
--- libmemcached/server.c	2010-01-03 01:07:52 +0000
+++ libmemcached/server.c	2010-01-12 00:36:12 +0000
@@ -113,11 +113,11 @@
                                            void *context,
                                            uint32_t number_of_callbacks)
 {
-  unsigned int y;
+  uint32_t y;
 
-  for (y= 0; y < ptr->number_of_hosts; y++)
+  for (y= 0; y < memcached_server_count(ptr); y++)
   {
-    unsigned int x;
+    uint32_t x;
 
     for (x= 0; x < number_of_callbacks; x++)
     {
@@ -142,7 +142,7 @@
   unlikely (*error != MEMCACHED_SUCCESS)
     return NULL;
 
-  unlikely (ptr->number_of_hosts == 0)
+  unlikely (memcached_server_count(ptr) == 0)
   {
     *error= MEMCACHED_NO_SERVERS;
     return NULL;
@@ -162,10 +162,9 @@
 
 const char *memcached_server_error(memcached_server_st *ptr)
 {
-  if (ptr)
-    return ptr->cached_server_error;
-  else
-    return NULL;
+  return ptr 
+    ?  ptr->cached_server_error
+    : NULL;
 }
 
 void memcached_server_error_reset(memcached_server_st *ptr)
@@ -177,3 +176,15 @@
 {
   return ptr->last_disconnected_server;
 }
+
+uint32_t memcached_server_list_count(memcached_server_st *ptr)
+{
+  return (ptr == NULL)
+    ? 0
+    : memcached_servers_count(ptr);
+}
+
+void memcached_server_list_free(memcached_server_st *ptr)
+{
+  server_list_free(NULL, ptr);
+}

=== modified file 'libmemcached/server.h'
--- libmemcached/server.h	2010-01-03 01:07:52 +0000
+++ libmemcached/server.h	2010-01-12 00:36:12 +0000
@@ -21,7 +21,7 @@
     bool is_allocated:1;
     bool sockaddr_inited:1;
   } options;
-  uint16_t count;
+  uint32_t number_of_hosts;
   uint32_t cursor_active;
   in_port_t port;
   int cached_errno;
@@ -47,6 +47,16 @@
   char hostname[MEMCACHED_MAX_HOST_LENGTH];
 };
 
+static inline uint32_t memcached_servers_count(memcached_server_st *servers)
+{
+  return servers->number_of_hosts;
+}
+
+static inline uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
+{
+  return servers->number_of_hosts= count;
+}
+
 #define memcached_server_count(A) (A)->number_of_hosts
 #define memcached_server_name(A,B) (B).hostname
 #define memcached_server_port(A,B) (B).port

=== modified file 'libmemcached/stats.c'
--- libmemcached/stats.c	2010-01-03 01:58:40 +0000
+++ libmemcached/stats.c	2010-01-12 00:36:12 +0000
@@ -369,7 +369,7 @@
     return NULL;
   }
 
-  stats= ptr->call_calloc(ptr, ptr->number_of_hosts, sizeof(memcached_stat_st));
+  stats= ptr->call_calloc(ptr, memcached_server_count(ptr), sizeof(memcached_stat_st));
 
   stats->root= ptr;
 
@@ -380,7 +380,7 @@
   }
 
   rc= MEMCACHED_SUCCESS;
-  for (x= 0; x < ptr->number_of_hosts; x++)
+  for (x= 0; x < memcached_server_count(ptr); x++)
   {
     memcached_return_t temp_return;
 

=== modified file 'libmemcached/storage.c'
--- libmemcached/storage.c	2009-12-18 18:46:19 +0000
+++ libmemcached/storage.c	2010-01-12 00:36:12 +0000
@@ -77,7 +77,7 @@
   unlikely (rc != MEMCACHED_SUCCESS)
     return rc;
 
-  unlikely (ptr->number_of_hosts == 0)
+  unlikely (memcached_server_count(ptr) == 0)
     return MEMCACHED_NO_SERVERS;
 
   if (ptr->flags.verify_key && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
@@ -493,7 +493,7 @@
     for (uint32_t x= 0; x < ptr->number_of_replicas; x++)
     {
       ++server_key;
-      if (server_key == ptr->number_of_hosts)
+      if (server_key == memcached_server_count(ptr))
         server_key= 0;
 
       memcached_server_st *srv= &ptr->hosts[server_key];

=== modified file 'libmemcached/verbosity.c'
--- libmemcached/verbosity.c	2009-12-16 23:01:10 +0000
+++ libmemcached/verbosity.c	2010-01-12 00:36:12 +0000
@@ -13,7 +13,7 @@
     return MEMCACHED_WRITE_FAILURE;
 
   rc= MEMCACHED_SUCCESS;
-  for (x= 0; x < ptr->number_of_hosts; x++)
+  for (x= 0; x < memcached_server_count(ptr); x++)
   {
     memcached_return_t rrc;
 

=== modified file 'libmemcached/version.c'
--- libmemcached/version.c	2009-12-16 23:01:10 +0000
+++ libmemcached/version.c	2010-01-12 00:36:12 +0000
@@ -31,7 +31,7 @@
   send_length= strlen(command);
 
   rc= MEMCACHED_SUCCESS;
-  for (x= 0; x < ptr->number_of_hosts; x++)
+  for (x= 0; x < memcached_server_count(ptr); x++)
   {
     memcached_return_t rrc;
 
@@ -75,7 +75,7 @@
   request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
 
   rc= MEMCACHED_SUCCESS;
-  for (x= 0; x < ptr->number_of_hosts; x++) 
+  for (x= 0; x < memcached_server_count(ptr); x++) 
   {
     memcached_return_t rrc;
 
@@ -88,7 +88,8 @@
     }
   }
 
-  for (x= 0; x < ptr->number_of_hosts; x++) 
+  for (x= 0; x < memcached_server_count(ptr); x++) 
+  {
     if (memcached_server_response_count(&ptr->hosts[x]) > 0) 
     {
       memcached_return_t rrc;
@@ -107,6 +108,7 @@
       ptr->hosts[x].minor_version= (uint8_t)strtol(p + 1, &p, 10);
       ptr->hosts[x].micro_version= (uint8_t)strtol(p + 1, NULL, 10);
     }
+  }
 
   return rc;
 }

=== modified file 'm4/pandora_canonical.m4'
--- m4/pandora_canonical.m4	2010-01-02 05:10:47 +0000
+++ m4/pandora_canonical.m4	2010-01-12 00:36:12 +0000
@@ -4,7 +4,7 @@
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Which version of the canonical setup we're using
-AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.92])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.94])
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   AC_ARG_ENABLE([fat-binaries],

=== modified file 'm4/pandora_have_libmemcached.m4'
--- m4/pandora_have_libmemcached.m4	2009-12-02 02:57:53 +0000
+++ m4/pandora_have_libmemcached.m4	2010-01-12 00:36:12 +0000
@@ -24,10 +24,28 @@
       memcached_dump_func *df;
       memcached_lib_version();
     ])
+    AC_LIB_HAVE_LINKFLAGS(memcachedprotocol,,[
+      #include <libmemcached/protocol_handler.h>
+    ],[
+      struct memcached_protocol_st *protocol_handle;
+      protocol_handle= memcached_protocol_create_instance();
+    ])
   ],[
     ac_cv_libmemcached="no"
   ])
   
+  AC_CACHE_CHECK([if libmemcached has memcached_server_fn],
+    [pandora_cv_libmemcached_server_fn],
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <libmemcached/memcached.h>
+memcached_server_fn callbacks[1];
+    ]])],
+    [pandora_cv_libmemcached_server_fn=yes],
+    [pandora_cv_libmemcached_server_fn=no])])
+  AS_IF([test "x$pandora_cv_libmemcached_server_fn" = "xyes"],[
+    AC_DEFINE([HAVE_MEMCACHED_SERVER_FN],[1],[If we have the new memcached_server_fn typedef])
+  ])
+
   AM_CONDITIONAL(HAVE_LIBMEMCACHED, [test "x${ac_cv_libmemcached}" = "xyes"])
   
 ])
@@ -41,3 +59,4 @@
   AS_IF([test x$ac_cv_libmemcached = xno],
       AC_MSG_ERROR([libmemcached is required for ${PACKAGE}]))
 ])
+

=== modified file 'support/libmemcached.spec.in'
--- support/libmemcached.spec.in	2009-12-17 17:28:30 +0000
+++ support/libmemcached.spec.in	2010-01-12 00:36:12 +0000
@@ -4,7 +4,7 @@
 Release:   1
 License:   BSD
 Group:     System Environment/Libraries
-URL:       http://tangent.org/552/libmemcached.html
+URL:       http://launchpad.net/libmemcached
 Source0:   http://download.tangent.org/libmemcached-%{version}.tar.gz
 
 # For test suite
@@ -78,32 +78,65 @@
 %defattr (-,root,root,-) 
 %doc AUTHORS COPYING NEWS README THANKS TODO
 %{_bindir}/mem*
-%exclude %{_libdir}/libmemcached.a
 %exclude %{_libdir}/libmemcached.la
-%exclude %{_libdir}/libmemcachedutil.a
-%exclude %{_libdir}/libmemcachedprotocol.a
+%exclude %{_libdir}/libhashkit.la
 %exclude %{_libdir}/libmemcachedutil.la
 %exclude %{_libdir}/libmemcachedprotocol.la
+%{_libdir}/libhashkit.so.*
 %{_libdir}/libmemcached.so.*
 %{_libdir}/libmemcachedutil.so.*
 %{_libdir}/libmemcachedprotocol.so.*
 %{_mandir}/man1/mem*
-%exclude libhashkit/*
 
 
 %files devel
 %defattr (-,root,root,-) 
 %doc examples
-%{_includedir}/libmemcached
+%{_includedir}/libhashkit/algorithm.h
+%{_includedir}/libhashkit/behavior.h
+%{_includedir}/libhashkit/hashkit.h
+%{_includedir}/libhashkit/strerror.h
+%{_includedir}/libhashkit/types.h
+%{_includedir}/libhashkit/visibility.h
+%{_includedir}/libmemcached/analyze.h
+%{_includedir}/libmemcached/auto.h
+%{_includedir}/libmemcached/behavior.h
+%{_includedir}/libmemcached/callback.h
+%{_includedir}/libmemcached/configure.h
+%{_includedir}/libmemcached/constants.h
+%{_includedir}/libmemcached/dump.h
+%{_includedir}/libmemcached/exception.hpp
+%{_includedir}/libmemcached/get.h
+%{_includedir}/libmemcached/memcached.h
+%{_includedir}/libmemcached/memcached.hpp
+%{_includedir}/libmemcached/memcached_util.h
+%{_includedir}/libmemcached/protocol
+%{_includedir}/libmemcached/protocol/cache.h
+%{_includedir}/libmemcached/protocol/callback.h
+%{_includedir}/libmemcached/protocol_handler.h
+%{_includedir}/libmemcached/result.h
+%{_includedir}/libmemcached/server.h
+%{_includedir}/libmemcached/stats.h
+%{_includedir}/libmemcached/storage.h
+%{_includedir}/libmemcached/string.h
+%{_includedir}/libmemcached/types.h
+%{_includedir}/libmemcached/util/pool.h
+%{_includedir}/libmemcached/visibility.h
+%{_includedir}/libmemcached/watchpoint.h
+%{_libdir}/libhashkit.so
 %{_libdir}/libmemcached.so
+%{_libdir}/libmemcachedprotocol.so
 %{_libdir}/libmemcachedutil.so
-%{_libdir}/libmemcachedprotocol.so
 %{_libdir}/pkgconfig/libmemcached.pc
+%{_mandir}/man3/hashkit*.3.gz
 %{_mandir}/man3/libmemcached*.3.gz
 %{_mandir}/man3/memcached_*.3.gz
 
 
 %changelog
+* Fri Jan  8 2010 Brian Aker <[e-mail]> - 0.37-1
+- Modified to be explicit in install include files. 
+
 * Sat Apr 25 2009 Remi Collet <[e-mail]> - 0.28-1
 - Initial RPM from Brian Aker spec
 - create -devel subpackage

=== modified file 'tests/function.c'
--- tests/function.c	2009-12-18 22:23:40 +0000
+++ tests/function.c	2010-01-12 00:36:12 +0000
@@ -108,8 +108,8 @@
   {
     test_ports[x]= (uint32_t)random() % 64000;
     rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0);
-    test_truth(local_memc->number_of_hosts == x + 1);
-    test_truth(local_memc->hosts[0].count == x+1);
+    test_truth(memcached_server_count(local_memc) == x + 1);
+    test_truth(memcached_servers_count(local_memc->hosts) == x+1);
     test_truth(rc == MEMCACHED_SUCCESS);
   }
 
@@ -179,8 +179,8 @@
   {
     test_ports[x]= (uint32_t)(random() % 64000);
     rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0);
-    test_truth(local_memc->number_of_hosts == x+1);
-    test_truth(local_memc->hosts[0].count == x+1);
+    test_truth(memcached_server_count(local_memc) == x+1);
+    test_truth(memcached_servers_count(local_memc->hosts) == x+1);
     test_truth(rc == MEMCACHED_SUCCESS);
   }
 
@@ -2030,11 +2030,7 @@
   size_t return_value_length;
 
   /* Here we free everything before running a bunch of mget tests */
-  {
-    memcached_server_list_free(memc->hosts);
-    memc->hosts= NULL;
-    memc->number_of_hosts= 0;
-  }
+  memcached_servers_reset(memc);
 
 
   /* We need to empty the server before continueing test */
@@ -2715,7 +2711,7 @@
   memcached_server_push(memc, server_pool);
 
   /* verify that the server list was parsed okay. */
-  test_truth(memc->number_of_hosts == 8);
+  test_truth(memcached_server_count(memc) == 8);
   test_truth(strcmp(server_pool[0].hostname, "10.0.1.1") == 0);
   test_truth(server_pool[0].port == 11211);
   test_truth(server_pool[0].weight == 600);
@@ -2866,7 +2862,7 @@
   memcached_server_push(memc, server_pool);
 
   /* verify that the server list was parsed okay. */
-  test_truth(memc->number_of_hosts == 8);
+  test_truth(memcached_server_count(memc) == 8);
   test_truth(strcmp(server_pool[0].hostname, "10.0.1.1") == 0);
   test_truth(server_pool[0].port == 11211);
   test_truth(server_pool[0].weight == 600);
@@ -3536,9 +3532,9 @@
    */
   memcached_return_t rc;
   rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS,
-                             memc->number_of_hosts - 1);
+                             memcached_server_count(memc) - 1);
   test_truth(rc == MEMCACHED_SUCCESS);
-  test_truth(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS) == memc->number_of_hosts - 1);
+  test_truth(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS) == memcached_server_count(memc) - 1);
 
   return rc == MEMCACHED_SUCCESS ? TEST_SUCCESS : TEST_SKIPPED;
 }
@@ -3843,9 +3839,7 @@
   memcached_return_t rc;
   struct stat buf;
 
-  memcached_server_list_free(memc->hosts);
-  memc->hosts= NULL;
-  memc->number_of_hosts= 0;
+  memcached_servers_reset(memc);
 
   if (stat("/tmp/memcached.socket", &buf))
     return TEST_SKIPPED;
@@ -3935,7 +3929,7 @@
     ** way it is supposed to do!!!!
     */
     int no_msg=0;
-    for (uint32_t x=0; x < memc->number_of_hosts; ++x)
+    for (uint32_t x=0; x < memcached_server_count(memc); ++x)
       no_msg+=(int)(memc->hosts[x].cursor_active);
 
     test_truth(no_msg == 0);
@@ -4212,7 +4206,7 @@
    * within the library, and this is not a supported interface.
    * This is to verify correct behavior in the library
    */
-  for (uint32_t host= 0; host < memc->number_of_hosts; ++host)
+  for (uint32_t host= 0; host < memcached_server_count(memc); ++host)
   {
     memcached_st *memc_clone= memcached_clone(NULL, memc);
     memc_clone->hosts[host].port= 0;
@@ -4410,11 +4404,11 @@
 
 static uint16_t *get_udp_request_ids(memcached_st *memc)
 {
-  uint16_t *ids= malloc(sizeof(uint16_t) * memc->number_of_hosts);
+  uint16_t *ids= malloc(sizeof(uint16_t) * memcached_server_count(memc));
   assert(ids != NULL);
   unsigned int x;
 
-  for (x= 0; x < memc->number_of_hosts; x++)
+  for (x= 0; x < memcached_server_count(memc); x++)
     ids[x]= get_udp_datagram_request_id((struct udp_datagram_header_st *) memc->hosts[x].write_buffer);
 
   return ids;
@@ -4426,7 +4420,7 @@
   memcached_server_st *cur_server = memc->hosts;
   uint16_t *cur_req_ids = get_udp_request_ids(memc);
 
-  for (x= 0; x < memc->number_of_hosts; x++)
+  for (x= 0; x < memcached_server_count(memc); x++)
   {
     test_truth(cur_server[x].cursor_active == 0);
     test_truth(cur_req_ids[x] == expected_req_ids[x]);
@@ -4449,7 +4443,7 @@
           || memc->hosts[0].micro_version < 6)
     return TEST_SKIPPED;
 
-  uint32_t num_hosts= memc->number_of_hosts;
+  uint32_t num_hosts= memcached_server_count(memc);
   unsigned int x= 0;
   memcached_server_st servers[num_hosts];
   memcpy(servers, memc->hosts, sizeof(memcached_server_st) * num_hosts);
@@ -4512,7 +4506,7 @@
   test_truth(memc->flags.use_udp);
   test_truth(memc->flags.no_reply);
 
-  test_truth(memc->number_of_hosts == 0);
+  test_truth(memcached_server_count(memc) == 0);
 
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP,0);
   test_truth(! (memc->flags.use_udp));
@@ -4619,7 +4613,7 @@
   memcached_return_t rc;
   uint16_t *expected_ids= get_udp_request_ids(memc);
   unsigned int x;
-  for (x= 0; x < memc->number_of_hosts;x++)
+  for (x= 0; x < memcached_server_count(memc); x++)
     increment_request_id(&expected_ids[x]);
 
   rc= memcached_verbosity(memc,3);
@@ -4639,7 +4633,7 @@
   memcached_return_t rc;
   uint16_t *expected_ids= get_udp_request_ids(memc);
   unsigned int x;
-  for (x= 0; x < memc->number_of_hosts;x++)
+  for (x= 0; x < memcached_server_count(memc);x++)
     increment_request_id(&expected_ids[x]);
 
   rc= memcached_flush(memc,0);
@@ -4964,7 +4958,7 @@
   memcached_server_push(memc, server_pool);
 
   /* verify that the server list was parsed okay. */
-  test_truth(memc->number_of_hosts == 8);
+  test_truth(memcached_server_count(memc) == 8);
   test_strcmp(server_pool[0].hostname, "10.0.1.1");
   test_truth(server_pool[0].port == 11211);
   test_truth(server_pool[0].weight == 600);
@@ -5021,7 +5015,7 @@
   memcached_server_push(memc, server_pool);
 
   /* verify that the server list was parsed okay. */
-  test_truth(memc->number_of_hosts == 8);
+  test_truth(memcached_server_count(memc) == 8);
   test_strcmp(server_pool[0].hostname, "10.0.1.1");
   test_truth(server_pool[0].port == 11211);
   test_truth(server_pool[0].weight == 600);
@@ -5094,7 +5088,7 @@
    * 1024 (that should satisfy most users don't you think?). Future versions
    * will include a mget_execute function call if you need a higher number.
    */
-  uint32_t number_of_hosts= memc->number_of_hosts;
+  uint32_t number_of_hosts= memcached_server_count(memc);
   memc->number_of_hosts= 1;
   const size_t max_keys= 1024;
   char **keys= calloc(max_keys, sizeof(char*));
@@ -5143,6 +5137,7 @@
   free(key_length);
 
   memc->number_of_hosts= number_of_hosts;
+
   return TEST_SUCCESS;
 }
 
@@ -5204,7 +5199,7 @@
   test_truth(rc == MEMCACHED_SUCCESS);
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 1);
 
-  uint32_t number_of_hosts= memc->number_of_hosts;
+  uint32_t number_of_hosts= memcached_server_count(memc);
   memc->number_of_hosts= 1;
 
   char k[250];
@@ -5233,7 +5228,7 @@
 
 static test_return_t regression_bug_447342(memcached_st *memc)
 {
-  if (memc->number_of_hosts < 3 || pre_replication(memc) != MEMCACHED_SUCCESS)
+  if (memcached_server_count(memc) < 3 || pre_replication(memc) != MEMCACHED_SUCCESS)
     return TEST_SKIPPED;
 
   memcached_return_t rc;
@@ -5469,7 +5464,7 @@
    * in a non-portable way and you shouldn't be doing this. I'm only
    * doing this in order to verify that the library works the way it should
    */
-  uint32_t number_of_hosts= memc->number_of_hosts;
+  uint32_t number_of_hosts= memcached_server_count(memc);
   memc->number_of_hosts= 1;
 
   /* Ensure that we are connected to the server by setting a value */