Merge lp:~tangent-org/libmemcached/trunk into lp:~jonathon-goldsmith/libmemcached/fix_sasl_configure

[Jonathon Goldsmith]

Previously, configure.ac was calling the AX_SASL_CHECK macro, which was failing to enable sasl support. I've switched it to call AX_SASL_OPTION, which solves the issue on Centos 5.7 and Ubuntu 12.04 (although the latter fails on a linking step with pthread).

[lp:~tangent-org/libmemcached/trunk]

1015. By Tangent.Org Continuous Integration on 2012-05-31

Merging lp:~brianaker/libmemcached/rpm-mkdir-fix to Build branch

1016. By Brian Aker on 2012-06-03

Adding in ci specifics.

1017. By Brian Aker on 2012-06-05

Fix for close on exec for socket.

1018. By Brian Aker on 2012-06-07

Merge in libtest.

1019. By Brian Aker on 2012-06-08

Fixes condition where we were not correctly setting weighted vs not.

1020. By Brian Aker on 2012-06-08

Add in version information for YATL

1021. By Brian Aker on 2012-06-11

Update with current fixes.

1022. By Brian Aker on 2012-06-12

Abstract out read method.

1023. By Brian Aker on 2012-06-12

Fixup for style

1024. By Brian Aker on 2012-06-12

Fixed bug where we might not see the right return type for the distribution type.

1025. By Brian Aker on 2012-06-12

Simple "print the state of poll" function.

1026. By Brian Aker on 2012-06-12

Fix such that a close on the socket short's faster.

1027. By Brian Aker on 2012-06-13

Diligently check poll() a bit more. Also determine number of servers based on cores available.

1028. By Brian Aker on 2012-06-14

Fix error messages/unlimited CPU utilization.

1029. By Brian Aker on 2012-06-15

Fix for test case failure.

1030. By Brian Aker on 2012-06-17

Additional cleanup

1031. By Brian Aker on 2012-06-18

Add a request id for each request that hits the wire.

1032. By Brian Aker on 2012-06-18

Remove how use instance (keep API intact)

1033. By Brian Aker on 2012-06-18

Merge in trunk

1034. By Brian Aker on 2012-06-19

Update for fix for testing if memcached is running.

1035. By Brian Aker on 2012-06-19

Fix packaging issues.

1036. By Brian Aker on 2012-06-20

Update RPM

1037. By Brian Aker on 2012-06-21

Fix exists.

1038. By Brian Aker on 2012-06-29

Merge of build.

1039. By Brian Aker on 2012-06-29

Remove extra white space in get command.

1040. By Brian Aker on 2012-06-30

Set SASL errors correctly.

1041. By Brian Aker on 2012-06-30

Fix cppcheck warnings.

1042. By Brian Aker on 2012-06-30

Update util and fix a few cppcheck warnings.

1043. By Brian Aker on 2012-06-30

First pass in merging libtest

1044. By Brian Aker on 2012-06-30

Adding patch rule to bzrignore

1045. By Brian Aker on 2012-06-30

Update unittest

1046. By Brian Aker on 2012-06-30

Update libtest

1047. By Brian Aker on 2012-06-30

Update for DNS updates from libtest

1048. By Brian Aker on 2012-07-02

Import/Merge of libtest latest.

1049. By Brian Aker on 2012-07-05

Final bits for 1.0.9

1050. By Brian Aker on 2012-07-11

Merge in build trunk work.

1051. By Brian Aker on 2012-07-11

Merge doc update.

1052. By Brian Aker on 2012-07-14

Merge from built to trunk

1053. By Brian Aker on 2012-07-15

Merge of cppcheck, assert fix.

1054. By Brian Aker on 2012-07-27

Fixes for OSX Lion

1055. By Brian Aker on 2012-07-27

Bump version.

1056. By Brian Aker on 2012-07-31

Merge for release

1057. By Brian Aker on 2012-07-31

Update docs from release.

1058. By Brian Aker on 2012-08-13

Merge from build tree.

[Brian Aker (brianaker)]

This was merged.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-05-05 22:11:48 +0000
+++ .bzrignore	2012-08-14 00:00:29 +0000
@@ -21,6 +21,7 @@
 */Makefile
 */Makefile.in
 *TAGS
+*patch
 .deps
 .hg/
 .hgignore
@@ -73,6 +74,7 @@
 docs/linkcheck/
 docs/text
 example/memcached_light
+example/t/memcached_light
 libhashkit-1.0/configure.h
 libmemcached-1.0/configure.h
 libmemcached-1.0/t/c_sasl_test
@@ -87,6 +89,7 @@
 libmemcached/memcached_configure.h
 libtest/.hg/
 libtest/.hgignore
+libtest/abort
 libtest/skiptest
 libtest/unittest
 libtest/version.h
@@ -98,6 +101,10 @@
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
+memcached/.git
+memcached/.gitignore
+memcached/memcached
+memcached/memcached.spec
 out
 patch
 patch2
@@ -119,6 +126,7 @@
 tests/libmemcached-1.0/internals
 tests/libmemcached-1.0/sasl
 tests/libmemcached-1.0/testapp
+tests/libmemcached-1.0/testsocket
 tests/memcapable
 tests/memcat
 tests/memcp
@@ -132,6 +140,7 @@
 tests/memstat
 tests/memtouch
 tests/output.cmp
+tests/parser
 tests/sasl
 tests/startservers
 tests/testapp
@@ -141,11 +150,3 @@
 tests/var/
 tmp_chroot
 unittests/unittests
-tests/libmemcached-1.0/testsocket
-example/t/memcached_light
-libtest/abort
-memcached/.git
-memcached/.gitignore
-memcached/memcached
-memcached/memcached.spec
-tests/parser

=== modified file 'ChangeLog'
--- ChangeLog	2012-05-22 19:57:15 +0000
+++ ChangeLog	2012-08-14 00:00:29 +0000
@@ -1,3 +1,13 @@
+1.0.10 Sun Jul 29 21:50:15 PDT 2012
+* --disable-assert has been removed from configure, and --enable-assert has been added in its place.
+* Compiling fixes for Clang on OSX Mountain Lion.
+
+1.0.9 Wed Jul  4 22:46:19 EDT 2012
+* Faster close on socket.
+* Instance allocation is now seperated from server interface. This should allow for a better preservation of ABI compliance from now on.
+* Fix close on exec bug.
+* Numerous other bug fixes.
+
 1.0.8 Tue May 22 15:06:04 EDT 2012
 * Added support for setting options via ENV variable LIBMEMCACHED
 * Fix corner case on last used result.

=== modified file 'Makefile.am'
--- Makefile.am	2012-05-05 22:11:48 +0000
+++ Makefile.am	2012-08-14 00:00:29 +0000
@@ -1,6 +1,6 @@
 # vim:ft=automake
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
 
 # includes append to these:
 SUFFIXES =
@@ -31,8 +31,6 @@
 
 include libtest/include.am
 
-libtest_libtest_la_DEPENDENCIES+= memcached/memcached
-
 include libhashkit-1.0/include.am
 include libmemcached-1.0/include.am
 include libmemcachedprotocol-0.0/include.am
@@ -48,11 +46,18 @@
 include libmemcachedinternal/include.am
 include libmemcachedinternal/util/include.am
 include poll/include.am
+include rpm.am
 include support/include.am
 include tests/include.am
 include util/include.am
 include win32/include.am
+
+include m4/include.am
+
+if HAVE_LIBEVENT
 include memcached/include.am
+libtest_libtest_la_DEPENDENCIES+= memcached/memcached
+endif
 
 docs: html man
 
@@ -60,41 +65,14 @@
 
 EXTRA_DIST+= ${man_MANS}
 
-fedora:
-	@rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
-	@rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
-	@cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
-	@rpmbuild -ba support/libmemcached.spec
-	@cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-	@cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
-
-generic: support/libmemcached.spec
-	@rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
-	@rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
-	@cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
-	@rpmbuild -ba support/libmemcached.spec
-	@cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-	@cp ~/rpmbuild/RPMS/x86_64/libmemcached-devel-$(VERSION)*.rpm .
-	@cp ~/rpmbuild/RPMS/x86_64/libmemcached-debuginfo-$(VERSION)*.rpm .
-	@cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
-
-rpm: man distcheck generic
-
-release: rpm
-	@rpm --addsign libmemcached-$(VERSION)*.rpm .
-	@rpm --checksig libmemcached-$(VERSION)*.rpm .
-	@rpm --addsign libmemcached-devel-$(VERSION)*.rpm .
-	@rpm --checksig libmemcached-devel-$(VERSION)*.rpm .
-	@rpm --addsign libmemcached-debuginfo-$(VERSION)*.rpm .
-	@rpm --checksig libmemcached-debuginfo-$(VERSION)*.rpm .
-
 merge-clean:
 	@find ./ | $(GREP) \.gcda | xargs rm -f
 	@find ./ | $(GREP) \.gcno | xargs rm -f
 	@find ./ | $(GREP) \.gz | xargs rm -f
-	@find ./ | $(GREP) \.orig | xargs rm -f
+	@find ./ | $(GREP) \.moved | xargs rm -r -f
+	@find ./ | $(GREP) \\.orig | xargs rm -f
 	@find ./ | $(GREP) \.rej | xargs rm -f
-	@find ./ | $(GREP) \.rpm | xargs rm -f
+	@rm -f *\.rpm
 	@find ./ | $(GREP) \.THIS | xargs rm -f
 	@find ./ | $(GREP) \.OTHER | xargs rm -f
 	@find ./ | $(GREP) \.BASE | xargs rm -f

=== modified file 'bootstrap.sh'
--- bootstrap.sh	2012-05-05 22:11:48 +0000
+++ bootstrap.sh	2012-08-14 00:00:29 +0000
@@ -2,7 +2,12 @@
 
 if test -f configure; then make clean; make merge-clean; make distclean; fi;
 
-rm -r -f autom4te.cache
+rm -r -f autom4te.cache/ config.h config.log config.status 
 ./config/autorun.sh
-./configure
+if [ $(uname) = "Darwin" ];
+then
+  ./configure CC=clang CXX=clang++ --enable-assert
+else
+  ./configure --enable-assert
+fi
 make

=== modified file 'clients/memaslap.c'
--- clients/memaslap.c	2011-04-05 02:06:15 +0000
+++ clients/memaslap.c	2012-08-14 00:00:29 +0000
@@ -594,7 +594,7 @@
       break;
 
     case OPT_BINARY_PROTOCOL:       /* --binary or -B */
-      ms_setting.binary_prot= true;
+      ms_setting.binary_prot_= true;
       break;
 
     case OPT_TPS:       /* --tps or -P */
@@ -800,7 +800,6 @@
 /* the loop of the main thread, wait the work threads to complete */
 static void ms_monitor_slap_mode()
 {
-  int second= 0;
   struct timeval start_time, end_time;
 
   /* Wait all the threads complete initialization. */
@@ -828,6 +827,7 @@
   /* running in "run time" mode, user specify run time */
   if (ms_setting.run_time > 0)
   {
+    int second= 0;
     gettimeofday(&start_time, NULL);
     while (1)
     {

=== modified file 'clients/memcp.cc'
--- clients/memcp.cc	2012-02-23 01:16:50 +0000
+++ clients/memcp.cc	2012-08-14 00:00:29 +0000
@@ -207,6 +207,7 @@
     if ((file_buffer_ptr= (char *)malloc(sizeof(char) * (size_t)sbuf.st_size)) == NULL)
     {
       std::cerr << "Error allocating file buffer(" << strerror(errno) << ")" << std::endl;
+      close(fd);
       exit(EXIT_FAILURE);
     }
 
@@ -214,12 +215,14 @@
     if ((read_length= ::read(fd, file_buffer_ptr, (size_t)sbuf.st_size)) == -1)
     {
       std::cerr << "Error while reading file " << file_buffer_ptr << " (" << strerror(errno) << ")" << std::endl;
+      close(fd);
       exit(EXIT_FAILURE);
     }
 
     if (read_length != sbuf.st_size)
     {
       std::cerr << "Failure while reading file. Read length was not equal to stat() length" << std::endl;
+      close(fd);
       exit(EXIT_FAILURE);
     }
 

=== modified file 'clients/memstat.cc'
--- clients/memstat.cc	2012-01-30 07:32:18 +0000
+++ clients/memstat.cc	2012-08-14 00:00:29 +0000
@@ -84,13 +84,13 @@
 }
 
 static memcached_return_t server_print_callback(const memcached_st *,
-                                                const memcached_server_st *instance,
+                                                memcached_server_instance_st instance,
                                                 void *)
 {
   std::cerr << memcached_server_name(instance) << ":" << memcached_server_port(instance) <<
-    " " << int(instance->major_version) << 
-    "." << int(instance->minor_version) << 
-    "." << int(instance->micro_version) << std::endl;
+    " " << int(memcached_server_major_version(instance)) << 
+    "." << int(memcached_server_minor_version(instance)) << 
+    "." << int(memcached_server_micro_version(instance)) << std::endl;
 
   return MEMCACHED_SUCCESS;
 }

=== modified file 'clients/ms_conn.c'
--- clients/ms_conn.c	2011-10-18 00:48:40 +0000
+++ clients/ms_conn.c	2012-08-14 00:00:29 +0000
@@ -358,7 +358,7 @@
   c->mlget_task.mlget_num= 0;
   c->mlget_task.value_index= -1;         /* default invalid value */
 
-  if (ms_setting.binary_prot)
+  if (ms_setting.binary_prot_)
   {
     c->protocol= binary_prot;
   }

=== modified file 'clients/ms_setting.c'
--- clients/ms_setting.c	2011-03-17 21:45:08 +0000
+++ clients/ms_setting.c	2012-08-14 00:00:29 +0000
@@ -683,7 +683,7 @@
         exit(1);
       }
 
-      if (! ms_setting.binary_prot
+      if (! ms_setting.binary_prot_
           && ((start_len > MAX_KEY_SIZE) || (end_len > MAX_KEY_SIZE)))
       {
         fprintf(stderr, "key length must be less than 250 bytes.\n");
@@ -880,7 +880,7 @@
   ms_setting.reconnect= false;
   ms_setting.verbose= false;
   ms_setting.facebook_test= false;
-  ms_setting.binary_prot= false;
+  ms_setting.binary_prot_= false;
   ms_setting.stat_freq= 0;
   ms_setting.srv_str= NULL;
   ms_setting.cfg_file= NULL;

=== modified file 'clients/ms_setting.h'
--- clients/ms_setting.h	2011-04-28 00:28:00 +0000
+++ clients/ms_setting.h	2012-08-14 00:00:29 +0000
@@ -153,7 +153,7 @@
   bool verbose;                         /* whether it outputs detailed information when verification */
   bool facebook_test;                   /* facebook test, TCP set and multi-get with UDP */
   uint32_t sock_per_conn;                    /* number of socks per connection structure */
-  bool binary_prot;                     /* whether it use binary protocol */
+  bool binary_prot_;                     /* whether it use binary protocol */
   int expected_tps;                     /* expected throughput */
   uint32_t rep_write_srv;                    /* which servers are used to do replication writing */
 } ms_setting_st;

=== modified file 'clients/ms_stats.c'
--- clients/ms_stats.c	2009-12-03 20:16:27 +0000
+++ clients/ms_stats.c	2012-08-14 00:00:29 +0000
@@ -219,10 +219,6 @@
   double global_std= 0;
   double global_log= 0;
 
-  uint64_t diff_time= 0;
-  uint64_t diff_events= 0;
-  double diff_squares= 0;
-  double diff_log_product= 0;
   double period_average= 0;
   uint64_t period_tps= 0;
   double period_rate= 0;
@@ -241,17 +237,17 @@
                     * global_average) / (double)(events - 1));
   global_log= exp(stat->log_product / (double)events);
 
-  diff_time= stat->total_time - stat->pre_total_time;
-  diff_events= events - stat->pre_events;
+  uint64_t diff_time= stat->total_time - stat->pre_total_time;
+  uint64_t diff_events= events - stat->pre_events;
   if (diff_events >= 1)
   {
     period_average= (double)(diff_time / diff_events);
     period_tps= diff_events / (uint64_t)freq;
     period_rate= (double)diff_events * obj_size / 1024 / 1024 / freq;
-    diff_squares= (double)stat->squares - (double)stat->pre_squares;
+    double diff_squares= (double)stat->squares - (double)stat->pre_squares;
     period_std= sqrt((diff_squares - (double)diff_events * period_average
                       * period_average) / (double)(diff_events - 1));
-    diff_log_product= stat->log_product - stat->pre_log_product;
+    double diff_log_product= stat->log_product - stat->pre_log_product;
     period_log= exp(diff_log_product / (double)diff_events);
   }
 

=== modified file 'config/autorun.sh'
--- config/autorun.sh	2012-03-03 23:14:47 +0000
+++ config/autorun.sh	2012-08-14 00:00:29 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#  Copyright (C) 2011 Brian Aker
+#  Copyright (C) 2011 Brian Aker, [e-mail]
 #  All rights reserved.
 # 
 #  Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
 }
 
 
-AUTORECONF_FLAGS=" --install --force --verbose -Wall"
+AUTORECONF_FLAGS=" --install --verbose -Wall"
 
 if test -f config/pre_hook.sh
 then

=== modified file 'configure.ac'
--- configure.ac	2012-05-30 15:33:05 +0000
+++ configure.ac	2012-08-14 00:00:29 +0000
@@ -7,7 +7,7 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-AC_INIT([libmemcached],[1.0.8],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.10],[http://libmemcached.org/])
 
 AC_CONFIG_AUX_DIR(config)
 
@@ -33,7 +33,7 @@
 #shared library versioning
 MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0
 MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
-MEMCACHED_LIBRARY_VERSION=10:0:0
+MEMCACHED_LIBRARY_VERSION=11:0:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
@@ -63,11 +63,12 @@
     AC_MSG_ERROR([Your system lacks a new enough C++ compiler])
   fi
 
-m4_include([m4/memcached.m4])
+# Adding support for libtest
+m4_include([libtest/yatl.m4])
+
 m4_include([m4/memcached_sasl.m4])
 m4_include([m4/gearmand.m4])
 m4_include([m4/libgearman.m4])
-m4_include([memcached/version.m4])
 
 AM_CONDITIONAL(BUILDING_LIBMEMCACHED, true)
 AM_CONDITIONAL(HAVE_LIBMEMCACHED, false)
@@ -79,17 +80,7 @@
 AC_SEARCH_LIBS(getopt_long, gnugetopt)
 AC_SEARCH_LIBS(gethostbyname, nsl)
 
-case "$target_os" in
-  *linux*)
-       AS_IF([test "x$GCC" = "xyes"],
-             [
-              LDFLAGS="$LDFLAGS -z relro -z now"
-              ])
-   ;;
-   esac
-
 dnl Specialty checks
-AX_PTHREAD
 AX_CXX_CINTTYPES
 CONFIG_EXTRA
 DETECT_BYTEORDER
@@ -102,6 +93,7 @@
 ENABLE_DEPRECATED
 
 AC_CHECK_FUNCS([alarm])
+AC_CHECK_FUNCS([clock_gettime])
 AC_CHECK_FUNCS([dup2])
 AC_CHECK_FUNCS([getline])
 AC_CHECK_FUNCS([gettimeofday])
@@ -291,7 +283,11 @@
 fi
 ])
 
-AC_C_ENDIAN
+AX_CHECK_SOCK_CLOEXEC([AC_DEFINE([HAVE_SOCK_CLOEXEC], [1], [Check for SOCK_CLOEXEC.])],
+                       [AC_DEFINE([HAVE_SOCK_CLOEXEC], [0], [Check for SOCK_CLOEXEC.])])
+
+AX_HARDEN_COMPILER_FLAGS
+AX_PTHREAD
 
 AC_CONFIG_FILES([
   Makefile
@@ -303,7 +299,6 @@
   support/libmemcached.pc
   support/libmemcached.spec
   support/libmemcached-fc.spec
-  libtest/version.h
   ])
 AC_OUTPUT
 

=== modified file 'docs/conf.py.in'
--- docs/conf.py.in	2012-04-09 06:28:51 +0000
+++ docs/conf.py.in	2012-08-14 00:00:29 +0000
@@ -27,11 +27,11 @@
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = []
 
-extensions = ['sphinxcontrib.googleanalytics']
+#extensions = ['sphinxcontrib.googleanalytics']
 
 # Google 
-googleanalytics_id = 'UA-15307604-2'
-googleanalytics_enabled = 'True'
+#googleanalytics_id = 'UA-15307604-2'
+#googleanalytics_enabled = 'True'
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -47,7 +47,7 @@
 
 # General information about the project.
 project = u'libmemcached'
-copyright = u'2011, Brian Aker DataDifferential, http://datadifferential.com/'
+copyright = u'2011-2012, Brian Aker DataDifferential, http://datadifferential.com/'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

=== modified file 'docs/include.am'
--- docs/include.am	2011-10-18 21:08:56 +0000
+++ docs/include.am	2012-08-14 00:00:29 +0000
@@ -16,120 +16,123 @@
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
 
-man_MANS+= \
-	   docs/man/hashkit_clone.3 \
-	   docs/man/hashkit_crc32.3 \
-	   docs/man/hashkit_create.3 \
-	   docs/man/hashkit_fnv1_32.3 \
-	   docs/man/hashkit_fnv1_64.3 \
-	   docs/man/hashkit_fnv1a_32.3 \
-	   docs/man/hashkit_fnv1a_64.3 \
-	   docs/man/hashkit_free.3 \
-	   docs/man/hashkit_functions.3 \
-	   docs/man/hashkit_hsieh.3 \
-	   docs/man/hashkit_is_allocated.3 \
-	   docs/man/hashkit_jenkins.3 \
-	   docs/man/hashkit_md5.3 \
-	   docs/man/hashkit_murmur.3 \
-	   docs/man/hashkit_value.3 \
-	   docs/man/libhashkit.3 \
-	   docs/man/libmemcached.3 \
-	   docs/man/libmemcached_examples.3 \
-	   docs/man/libmemcachedutil.3 \
-	   docs/man/memaslap.1 \
-	   docs/man/memcached_add.3 \
-	   docs/man/memcached_add_by_key.3 \
-	   docs/man/memcached_analyze.3 \
-	   docs/man/memcached_append.3 \
-	   docs/man/memcached_append_by_key.3 \
-	   docs/man/memcached_behavior_get.3 \
-	   docs/man/memcached_behavior_set.3 \
-	   docs/man/memcached_callback_get.3 \
-	   docs/man/memcached_callback_set.3 \
-	   docs/man/memcached_cas.3 \
-	   docs/man/memcached_cas_by_key.3 \
-	   docs/man/memcached_clone.3 \
-	   docs/man/memcached_create.3 \
-	   docs/man/memcached_decrement.3 \
-	   docs/man/memcached_decrement_with_initial.3 \
-	   docs/man/memcached_delete.3 \
-	   docs/man/memcached_delete_by_key.3 \
-	   docs/man/libmemcached_check_configuration.3 \
-	   docs/man/libmemcached_configuration.3 \
-	   docs/man/memcached.3 \
-	   docs/man/memcached_destroy_sasl_auth_data.3 \
-	   docs/man/memcached_dump.3 \
-	   docs/man/memcached_exist.3 \
-	   docs/man/memcached_exist_by_key.3 \
-	   docs/man/memcached_fetch.3 \
-	   docs/man/memcached_fetch_execute.3 \
-	   docs/man/memcached_fetch_result.3 \
-	   docs/man/memcached_flush_buffers.3 \
-	   docs/man/memcached_free.3 \
-	   docs/man/memcached_generate_hash.3 \
-	   docs/man/memcached_generate_hash_value.3 \
-	   docs/man/memcached_get.3 \
-	   docs/man/memcached_get_by_key.3 \
-	   docs/man/memcached_get_memory_allocators.3 \
-	   docs/man/memcached_get_sasl_callbacks.3 \
-	   docs/man/memcached_get_user_data.3 \
-	   docs/man/memcached_increment.3 \
-	   docs/man/memcached_increment_with_initial.3 \
-	   docs/man/memcached_lib_version.3 \
-	   docs/man/memcached_mget.3 \
-	   docs/man/memcached_mget_by_key.3 \
-	   docs/man/memcached_mget_execute.3  \
-	   docs/man/memcached_mget_execute_by_key.3  \
-	   docs/man/memcached_pool.3 \
-	   docs/man/memcached_pool_behavior_get.3 \
-	   docs/man/memcached_pool_behavior_set.3 \
-	   docs/man/memcached_pool_create.3 \
-	   docs/man/memcached_pool_destroy.3 \
-	   docs/man/memcached_pool_fetch.3 \
-	   docs/man/memcached_pool_pop.3 \
-	   docs/man/memcached_pool_push.3 \
-	   docs/man/memcached_pool_release.3 \
-	   docs/man/memcached_pool_st.3 \
-	   docs/man/memcached_prepend.3 \
-	   docs/man/memcached_prepend_by_key.3 \
-	   docs/man/memcached_quit.3 \
-	   docs/man/memcached_replace.3 \
-	   docs/man/memcached_replace_by_key.3 \
-	   docs/man/memcached_last_error_message.3 \
-	   docs/man/memcached_sasl_set_auth_data.3 \
-	   docs/man/memcached_server_add.3 \
-	   docs/man/memcached_server_count.3 \
-	   docs/man/memcached_server_cursor.3 \
-	   docs/man/memcached_server_list.3 \
-	   docs/man/memcached_server_list_append.3 \
-	   docs/man/memcached_server_list_count.3 \
-	   docs/man/memcached_server_list_free.3 \
-	   docs/man/memcached_server_push.3 \
-	   docs/man/memcached_servers_parse.3 \
-	   docs/man/memcached_set.3 \
-	   docs/man/memcached_set_by_key.3 \
-	   docs/man/memcached_set_memory_allocators.3 \
-	   docs/man/memcached_set_sasl_callbacks.3 \
-	   docs/man/memcached_set_user_data.3 \
-	   docs/man/memcached_stat.3 \
-	   docs/man/memcached_stat_execute.3 \
-	   docs/man/memcached_stat_get_keys.3 \
-	   docs/man/memcached_stat_get_value.3 \
-	   docs/man/memcached_stat_servername.3 \
-	   docs/man/memcached_strerror.3 \
-	   docs/man/memcached_touch.3 \
-	   docs/man/memcached_touch_by_key.3 \
-	   docs/man/memcached_verbosity.3 \
-	   docs/man/memcached_version.3 \
-	   docs/man/memcapable.1 \
-	   docs/man/memcat.1 \
-	   docs/man/memcp.1 \
-	   docs/man/memdump.1 \
-	   docs/man/memerror.1 \
-	   docs/man/memflush.1 \
-	   docs/man/memrm.1 \
-	   docs/man/memslap.1 \
-	   docs/man/memstat.1
+man_MANS+= docs/man/hashkit_clone.3
+man_MANS+= docs/man/hashkit_crc32.3
+man_MANS+= docs/man/hashkit_create.3
+man_MANS+= docs/man/hashkit_fnv1_32.3
+man_MANS+= docs/man/hashkit_fnv1_64.3
+man_MANS+= docs/man/hashkit_fnv1a_32.3
+man_MANS+= docs/man/hashkit_fnv1a_64.3
+man_MANS+= docs/man/hashkit_free.3
+man_MANS+= docs/man/hashkit_functions.3
+man_MANS+= docs/man/hashkit_hsieh.3
+man_MANS+= docs/man/hashkit_is_allocated.3
+man_MANS+= docs/man/hashkit_jenkins.3
+man_MANS+= docs/man/hashkit_md5.3
+man_MANS+= docs/man/hashkit_murmur.3
+man_MANS+= docs/man/hashkit_value.3
+man_MANS+= docs/man/libhashkit.3
+man_MANS+= docs/man/libmemcached.3
+man_MANS+= docs/man/libmemcached_examples.3
+man_MANS+= docs/man/libmemcachedutil.3
+man_MANS+= docs/man/memaslap.1
+man_MANS+= docs/man/memcached_add.3
+man_MANS+= docs/man/memcached_add_by_key.3
+man_MANS+= docs/man/memcached_analyze.3
+man_MANS+= docs/man/memcached_append.3
+man_MANS+= docs/man/memcached_append_by_key.3
+man_MANS+= docs/man/memcached_behavior_get.3
+man_MANS+= docs/man/memcached_behavior_set.3
+man_MANS+= docs/man/memcached_callback_get.3
+man_MANS+= docs/man/memcached_callback_set.3
+man_MANS+= docs/man/memcached_cas.3
+man_MANS+= docs/man/memcached_cas_by_key.3
+man_MANS+= docs/man/memcached_clone.3
+man_MANS+= docs/man/memcached_create.3
+man_MANS+= docs/man/memcached_decrement.3
+man_MANS+= docs/man/memcached_decrement_with_initial.3
+man_MANS+= docs/man/memcached_delete.3
+man_MANS+= docs/man/memcached_delete_by_key.3
+man_MANS+= docs/man/libmemcached_check_configuration.3
+man_MANS+= docs/man/libmemcached_configuration.3
+man_MANS+= docs/man/memcached.3
+man_MANS+= docs/man/memcached_destroy_sasl_auth_data.3
+man_MANS+= docs/man/memcached_dump.3
+man_MANS+= docs/man/memcached_exist.3
+man_MANS+= docs/man/memcached_exist_by_key.3
+man_MANS+= docs/man/memcached_fetch.3
+man_MANS+= docs/man/memcached_fetch_execute.3
+man_MANS+= docs/man/memcached_fetch_result.3
+man_MANS+= docs/man/memcached_flush_buffers.3
+man_MANS+= docs/man/memcached_free.3
+man_MANS+= docs/man/memcached_generate_hash.3
+man_MANS+= docs/man/memcached_generate_hash_value.3
+man_MANS+= docs/man/memcached_get.3
+man_MANS+= docs/man/memcached_get_by_key.3
+man_MANS+= docs/man/memcached_get_memory_allocators.3
+man_MANS+= docs/man/memcached_get_sasl_callbacks.3
+man_MANS+= docs/man/memcached_get_user_data.3
+man_MANS+= docs/man/memcached_increment.3
+man_MANS+= docs/man/memcached_increment_with_initial.3
+man_MANS+= docs/man/memcached_lib_version.3
+man_MANS+= docs/man/memcached_mget.3
+man_MANS+= docs/man/memcached_mget_by_key.3
+man_MANS+= docs/man/memcached_mget_execute.3 
+man_MANS+= docs/man/memcached_mget_execute_by_key.3 
+man_MANS+= docs/man/memcached_pool.3
+man_MANS+= docs/man/memcached_pool_behavior_get.3
+man_MANS+= docs/man/memcached_pool_behavior_set.3
+man_MANS+= docs/man/memcached_pool_create.3
+man_MANS+= docs/man/memcached_pool_destroy.3
+man_MANS+= docs/man/memcached_pool_fetch.3
+man_MANS+= docs/man/memcached_pool_pop.3
+man_MANS+= docs/man/memcached_pool_push.3
+man_MANS+= docs/man/memcached_pool_release.3
+man_MANS+= docs/man/memcached_pool_st.3
+man_MANS+= docs/man/memcached_prepend.3
+man_MANS+= docs/man/memcached_prepend_by_key.3
+man_MANS+= docs/man/memcached_quit.3
+man_MANS+= docs/man/memcached_replace.3
+man_MANS+= docs/man/memcached_replace_by_key.3
+man_MANS+= docs/man/memcached_last_error_message.3
+man_MANS+= docs/man/memcached_sasl_set_auth_data.3
+man_MANS+= docs/man/memcached_server_add.3
+man_MANS+= docs/man/memcached_server_count.3
+man_MANS+= docs/man/memcached_server_cursor.3
+man_MANS+= docs/man/memcached_server_list.3
+man_MANS+= docs/man/memcached_server_list_append.3
+man_MANS+= docs/man/memcached_server_list_count.3
+man_MANS+= docs/man/memcached_server_list_free.3
+man_MANS+= docs/man/memcached_server_push.3
+man_MANS+= docs/man/memcached_servers_parse.3
+man_MANS+= docs/man/memcached_set.3
+man_MANS+= docs/man/memcached_set_by_key.3
+man_MANS+= docs/man/memcached_set_memory_allocators.3
+man_MANS+= docs/man/memcached_set_sasl_callbacks.3
+man_MANS+= docs/man/memcached_set_user_data.3
+man_MANS+= docs/man/memcached_stat.3
+man_MANS+= docs/man/memcached_stat_execute.3
+man_MANS+= docs/man/memcached_stat_get_keys.3
+man_MANS+= docs/man/memcached_stat_get_value.3
+man_MANS+= docs/man/memcached_stat_servername.3
+man_MANS+= docs/man/memcached_strerror.3
+man_MANS+= docs/man/memcached_touch.3
+man_MANS+= docs/man/memcached_touch_by_key.3
+man_MANS+= docs/man/memcached_verbosity.3
+man_MANS+= docs/man/memcached_version.3
+man_MANS+= docs/man/memcapable.1
+man_MANS+= docs/man/memexist.1
+man_MANS+= docs/man/memparse.1
+man_MANS+= docs/man/memping.1
+man_MANS+= docs/man/memcat.1
+man_MANS+= docs/man/memcp.1
+man_MANS+= docs/man/memdump.1
+man_MANS+= docs/man/memtouch.1
+man_MANS+= docs/man/memerror.1
+man_MANS+= docs/man/memflush.1
+man_MANS+= docs/man/memrm.1
+man_MANS+= docs/man/memslap.1
+man_MANS+= docs/man/memstat.1
 
 if HAVE_SPHINX
 sphinx-help:

=== modified file 'docs/libmemcached_configuration.rst'
--- docs/libmemcached_configuration.rst	2012-05-04 03:27:41 +0000
+++ docs/libmemcached_configuration.rst	2012-08-14 00:00:29 +0000
@@ -41,7 +41,7 @@
 
 .. describe:: --REMOVE_FAILED_SERVERS
 
-Enable the behavior MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS.
+Enable the behavior :c:type:`MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS`.
 
 .. describe:: --BINARY-PROTOCOL
 
@@ -49,7 +49,7 @@
 
 .. describe:: --BUFFER-REQUESTS
 
-Enable MEMCACHED_BEHAVIOR_BUFFER_REQUESTS.
+Please see :c:type:`MEMCACHED_BEHAVIOR_BUFFER_REQUESTS`.
 
 .. describe:: --CONFIGURE-FILE=
 
@@ -57,7 +57,7 @@
 
 .. describe:: --CONNECT-TIMEOUT=
 
-Enable MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT. 
+Please see :c:type:`MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT`. 
 
 .. describe:: --DISTRIBUTION=
 
@@ -91,11 +91,11 @@
 
 .. describe:: --SUPPORT-CAS
 
-See :manpage:`memcached_behavior_set(3)` for MEMCACHED_BEHAVIOR_SUPPORT_CAS
+See :manpage:`memcached_behavior_set(3)` for :c:type:`MEMCACHED_BEHAVIOR_SUPPORT_CAS`
 
 .. describe:: --USE-UDP
 
-See :manpage:`memcached_behavior_set(3)` for MEMCACHED_BEHAVIOR_USE_UDP
+See :manpage:`memcached_behavior_set(3)` for :c:type:`MEMCACHED_BEHAVIOR_USE_UDP`
 
 .. describe:: --NAMESPACE=
 

=== modified file 'docs/man/hashkit_clone.3'
--- docs/man/hashkit_clone.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_clone.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_CLONE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_CLONE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_clone \- libhashkit Documentation
 .

=== modified file 'docs/man/hashkit_crc32.3'
--- docs/man/hashkit_crc32.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_crc32.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_CRC32" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_CRC32" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_crc32 \- libhashkit Documentation
 .

=== modified file 'docs/man/hashkit_create.3'
--- docs/man/hashkit_create.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_create.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_CREATE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_CREATE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_create \- libhashkit Documentation
 .

=== modified file 'docs/man/hashkit_fnv1_32.3'
--- docs/man/hashkit_fnv1_32.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_fnv1_32.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_FNV1_32" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_FNV1_32" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_fnv1_32 \- libhashkit Documentation
 .

=== modified file 'docs/man/hashkit_fnv1_64.3'
--- docs/man/hashkit_fnv1_64.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_fnv1_64.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_FNV1_64" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_FNV1_64" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_fnv1_64 \- libhashkit Documentation
 .

=== modified file 'docs/man/hashkit_fnv1a_32.3'
--- docs/man/hashkit_fnv1a_32.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_fnv1a_32.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_FNV1A_32" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_FNV1A_32" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_fnv1a_32 \- libhashkit Documentation
 .

=== modified file 'docs/man/hashkit_fnv1a_64.3'
--- docs/man/hashkit_fnv1a_64.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_fnv1a_64.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_FNV1A_64" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_FNV1A_64" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_fnv1a_64 \- libhashkit Documentation
 .

=== modified file 'docs/man/hashkit_free.3'
--- docs/man/hashkit_free.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_free.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_FREE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_FREE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_free \- libhashkit Documentation
 .

=== modified file 'docs/man/hashkit_functions.3'
--- docs/man/hashkit_functions.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_functions.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_FUNCTIONS" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_FUNCTIONS" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_functions \- libhashkit Documentation
 .

=== modified file 'docs/man/hashkit_hsieh.3'
--- docs/man/hashkit_hsieh.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_hsieh.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_HSIEH" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_HSIEH" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_hsieh \- libhashkit Documentation
 .

=== modified file 'docs/man/hashkit_is_allocated.3'
--- docs/man/hashkit_is_allocated.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_is_allocated.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_IS_ALLOCATED" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_IS_ALLOCATED" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_is_allocated \- libhashkit Documentation
 .

=== modified file 'docs/man/hashkit_jenkins.3'
--- docs/man/hashkit_jenkins.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_jenkins.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_JENKINS" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_JENKINS" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_jenkins \- libhashkit Documentation
 .

=== modified file 'docs/man/hashkit_md5.3'
--- docs/man/hashkit_md5.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_md5.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_MD5" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_MD5" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_md5 \- libhashkit Documentation
 .

=== modified file 'docs/man/hashkit_murmur.3'
--- docs/man/hashkit_murmur.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_murmur.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_MURMUR" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_MURMUR" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_murmur \- libhashkit Documentation
 .

=== modified file 'docs/man/hashkit_value.3'
--- docs/man/hashkit_value.3	2012-05-22 19:57:15 +0000
+++ docs/man/hashkit_value.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "HASHKIT_VALUE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "HASHKIT_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 hashkit_value \- libhashkit Documentation
 .

=== modified file 'docs/man/libhashkit.3'
--- docs/man/libhashkit.3	2012-05-22 19:57:15 +0000
+++ docs/man/libhashkit.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "LIBHASHKIT" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "LIBHASHKIT" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 libhashkit \- libhashkit Documentation
 .

=== modified file 'docs/man/libmemcached.3'
--- docs/man/libmemcached.3	2012-05-22 19:57:15 +0000
+++ docs/man/libmemcached.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "LIBMEMCACHED" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "LIBMEMCACHED" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 libmemcached \- Introducing the C Client Library for memcached
 .

=== modified file 'docs/man/libmemcached_check_configuration.3'
--- docs/man/libmemcached_check_configuration.3	2012-05-22 19:57:15 +0000
+++ docs/man/libmemcached_check_configuration.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "LIBMEMCACHED_CHECK_CONFIGURATION" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "LIBMEMCACHED_CHECK_CONFIGURATION" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 libmemcached_check_configuration \- libmemcached Documentation
 .
@@ -75,7 +75,7 @@
 .B \-\-REMOVE_FAILED_SERVERS
 .UNINDENT
 .sp
-Enable the behavior MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS.
+Enable the behavior \fBMEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS\fP.
 .INDENT 0.0
 .TP
 .B \-\-BINARY\-PROTOCOL
@@ -87,7 +87,7 @@
 .B \-\-BUFFER\-REQUESTS
 .UNINDENT
 .sp
-Enable MEMCACHED_BEHAVIOR_BUFFER_REQUESTS.
+Please see \fBMEMCACHED_BEHAVIOR_BUFFER_REQUESTS\fP.
 .INDENT 0.0
 .TP
 .B \-\-CONFIGURE\-FILE=
@@ -99,7 +99,7 @@
 .B \-\-CONNECT\-TIMEOUT=
 .UNINDENT
 .sp
-Enable MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT.
+Please see \fBMEMCACHED_BEHAVIOR_CONNECT_TIMEOUT\fP.
 .INDENT 0.0
 .TP
 .B \-\-DISTRIBUTION=
@@ -149,13 +149,13 @@
 .B \-\-SUPPORT\-CAS
 .UNINDENT
 .sp
-See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SUPPORT_CAS
+See \fImemcached_behavior_set(3)\fP for \fBMEMCACHED_BEHAVIOR_SUPPORT_CAS\fP
 .INDENT 0.0
 .TP
 .B \-\-USE\-UDP
 .UNINDENT
 .sp
-See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP
+See \fImemcached_behavior_set(3)\fP for \fBMEMCACHED_BEHAVIOR_USE_UDP\fP
 .INDENT 0.0
 .TP
 .B \-\-NAMESPACE=

=== modified file 'docs/man/libmemcached_configuration.3'
--- docs/man/libmemcached_configuration.3	2012-05-22 19:57:15 +0000
+++ docs/man/libmemcached_configuration.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "LIBMEMCACHED_CONFIGURATION" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "LIBMEMCACHED_CONFIGURATION" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 libmemcached_configuration \- libmemcached Documentation
 .
@@ -75,7 +75,7 @@
 .B \-\-REMOVE_FAILED_SERVERS
 .UNINDENT
 .sp
-Enable the behavior MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS.
+Enable the behavior \fBMEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS\fP.
 .INDENT 0.0
 .TP
 .B \-\-BINARY\-PROTOCOL
@@ -87,7 +87,7 @@
 .B \-\-BUFFER\-REQUESTS
 .UNINDENT
 .sp
-Enable MEMCACHED_BEHAVIOR_BUFFER_REQUESTS.
+Please see \fBMEMCACHED_BEHAVIOR_BUFFER_REQUESTS\fP.
 .INDENT 0.0
 .TP
 .B \-\-CONFIGURE\-FILE=
@@ -99,7 +99,7 @@
 .B \-\-CONNECT\-TIMEOUT=
 .UNINDENT
 .sp
-Enable MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT.
+Please see \fBMEMCACHED_BEHAVIOR_CONNECT_TIMEOUT\fP.
 .INDENT 0.0
 .TP
 .B \-\-DISTRIBUTION=
@@ -149,13 +149,13 @@
 .B \-\-SUPPORT\-CAS
 .UNINDENT
 .sp
-See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SUPPORT_CAS
+See \fImemcached_behavior_set(3)\fP for \fBMEMCACHED_BEHAVIOR_SUPPORT_CAS\fP
 .INDENT 0.0
 .TP
 .B \-\-USE\-UDP
 .UNINDENT
 .sp
-See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP
+See \fImemcached_behavior_set(3)\fP for \fBMEMCACHED_BEHAVIOR_USE_UDP\fP
 .INDENT 0.0
 .TP
 .B \-\-NAMESPACE=

=== modified file 'docs/man/libmemcached_examples.3'
--- docs/man/libmemcached_examples.3	2012-05-22 19:57:15 +0000
+++ docs/man/libmemcached_examples.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "LIBMEMCACHED_EXAMPLES" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "LIBMEMCACHED_EXAMPLES" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 libmemcached_examples \- libmemcached Documentation
 .

=== modified file 'docs/man/libmemcachedutil.3'
--- docs/man/libmemcachedutil.3	2012-05-22 19:57:15 +0000
+++ docs/man/libmemcachedutil.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "LIBMEMCACHEDUTIL" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "LIBMEMCACHEDUTIL" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 libmemcachedutil \- libmemcached Documentation
 .

=== modified file 'docs/man/memaslap.1'
--- docs/man/memaslap.1	2012-05-22 19:57:15 +0000
+++ docs/man/memaslap.1	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMASLAP" "1" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMASLAP" "1" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memaslap \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached.3'
--- docs/man/memcached.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached \- libmemcached Documentation
 .
@@ -75,7 +75,7 @@
 .B \-\-REMOVE_FAILED_SERVERS
 .UNINDENT
 .sp
-Enable the behavior MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS.
+Enable the behavior \fBMEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS\fP.
 .INDENT 0.0
 .TP
 .B \-\-BINARY\-PROTOCOL
@@ -87,7 +87,7 @@
 .B \-\-BUFFER\-REQUESTS
 .UNINDENT
 .sp
-Enable MEMCACHED_BEHAVIOR_BUFFER_REQUESTS.
+Please see \fBMEMCACHED_BEHAVIOR_BUFFER_REQUESTS\fP.
 .INDENT 0.0
 .TP
 .B \-\-CONFIGURE\-FILE=
@@ -99,7 +99,7 @@
 .B \-\-CONNECT\-TIMEOUT=
 .UNINDENT
 .sp
-Enable MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT.
+Please see \fBMEMCACHED_BEHAVIOR_CONNECT_TIMEOUT\fP.
 .INDENT 0.0
 .TP
 .B \-\-DISTRIBUTION=
@@ -149,13 +149,13 @@
 .B \-\-SUPPORT\-CAS
 .UNINDENT
 .sp
-See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SUPPORT_CAS
+See \fImemcached_behavior_set(3)\fP for \fBMEMCACHED_BEHAVIOR_SUPPORT_CAS\fP
 .INDENT 0.0
 .TP
 .B \-\-USE\-UDP
 .UNINDENT
 .sp
-See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP
+See \fImemcached_behavior_set(3)\fP for \fBMEMCACHED_BEHAVIOR_USE_UDP\fP
 .INDENT 0.0
 .TP
 .B \-\-NAMESPACE=

=== modified file 'docs/man/memcached_add.3'
--- docs/man/memcached_add.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_add.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_ADD" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_ADD" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_add \- Storing and Replacing Data
 .

=== modified file 'docs/man/memcached_add_by_key.3'
--- docs/man/memcached_add_by_key.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_add_by_key.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_ADD_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_ADD_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_add_by_key \- Storing and Replacing Data
 .

=== modified file 'docs/man/memcached_analyze.3'
--- docs/man/memcached_analyze.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_analyze.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_ANALYZE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_ANALYZE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_analyze \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_append.3'
--- docs/man/memcached_append.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_append.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_APPEND" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_APPEND" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_append \- Appending to or Prepending to data on the server
 .

=== modified file 'docs/man/memcached_append_by_key.3'
--- docs/man/memcached_append_by_key.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_append_by_key.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_APPEND_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_APPEND_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_append_by_key \- Appending to or Prepending to data on the server
 .

=== modified file 'docs/man/memcached_auto.3'
--- docs/man/memcached_auto.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_auto.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_AUTO" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_AUTO" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_auto \- Incrementing and Decrementing Values
 .

=== modified file 'docs/man/memcached_behavior.3'
--- docs/man/memcached_behavior.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_behavior.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_BEHAVIOR" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_BEHAVIOR" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_behavior \- libmemcached Documentation
 .
@@ -211,7 +211,7 @@
 .B MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT
 .UNINDENT
 .sp
-In non\-blocking mode this changes the value of the timeout during socket connection.
+In non\-blocking mode this changes the value of the timeout during socket connection in milliseconds. Specifying \-1 means an infinite time‐out.
 .INDENT 0.0
 .TP
 .B MEMCACHED_BEHAVIOR_BINARY_PROTOCOL

=== modified file 'docs/man/memcached_behavior_get.3'
--- docs/man/memcached_behavior_get.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_behavior_get.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_BEHAVIOR_GET" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_BEHAVIOR_GET" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_behavior_get \- libmemcached Documentation
 .
@@ -211,7 +211,7 @@
 .B MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT
 .UNINDENT
 .sp
-In non\-blocking mode this changes the value of the timeout during socket connection.
+In non\-blocking mode this changes the value of the timeout during socket connection in milliseconds. Specifying \-1 means an infinite time‐out.
 .INDENT 0.0
 .TP
 .B MEMCACHED_BEHAVIOR_BINARY_PROTOCOL

=== modified file 'docs/man/memcached_behavior_set.3'
--- docs/man/memcached_behavior_set.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_behavior_set.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_BEHAVIOR_SET" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_BEHAVIOR_SET" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_behavior_set \- libmemcached Documentation
 .
@@ -211,7 +211,7 @@
 .B MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT
 .UNINDENT
 .sp
-In non\-blocking mode this changes the value of the timeout during socket connection.
+In non\-blocking mode this changes the value of the timeout during socket connection in milliseconds. Specifying \-1 means an infinite time‐out.
 .INDENT 0.0
 .TP
 .B MEMCACHED_BEHAVIOR_BINARY_PROTOCOL

=== modified file 'docs/man/memcached_callback.3'
--- docs/man/memcached_callback.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_callback.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_CALLBACK" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_CALLBACK" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_callback \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_callback_get.3'
--- docs/man/memcached_callback_get.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_callback_get.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_CALLBACK_GET" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_CALLBACK_GET" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_callback_get \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_callback_set.3'
--- docs/man/memcached_callback_set.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_callback_set.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_CALLBACK_SET" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_CALLBACK_SET" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_callback_set \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_cas.3'
--- docs/man/memcached_cas.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_cas.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_CAS" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_CAS" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_cas \- Working with data on the server in an atomic fashion
 .

=== modified file 'docs/man/memcached_cas_by_key.3'
--- docs/man/memcached_cas_by_key.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_cas_by_key.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_CAS_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_CAS_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_cas_by_key \- Storing and Replacing Data
 .

=== modified file 'docs/man/memcached_clone.3'
--- docs/man/memcached_clone.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_clone.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_CLONE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_CLONE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_clone \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_create.3'
--- docs/man/memcached_create.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_create.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_CREATE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_CREATE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_create \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_decrement.3'
--- docs/man/memcached_decrement.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_decrement.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_DECREMENT" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_DECREMENT" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_decrement \- Incrementing and Decrementing Values
 .

=== modified file 'docs/man/memcached_decrement_with_initial.3'
--- docs/man/memcached_decrement_with_initial.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_decrement_with_initial.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_DECREMENT_WITH_INITIAL" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_DECREMENT_WITH_INITIAL" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_decrement_with_initial \- Incrementing and Decrementing Values
 .

=== modified file 'docs/man/memcached_delete.3'
--- docs/man/memcached_delete.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_delete.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_DELETE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_DELETE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_delete \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_delete_by_key.3'
--- docs/man/memcached_delete_by_key.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_delete_by_key.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_DELETE_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_DELETE_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_delete_by_key \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_destroy_sasl_auth_data.3'
--- docs/man/memcached_destroy_sasl_auth_data.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_destroy_sasl_auth_data.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_DESTROY_SASL_AUTH_DATA" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_DESTROY_SASL_AUTH_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_destroy_sasl_auth_data \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_dump.3'
--- docs/man/memcached_dump.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_dump.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_DUMP" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_DUMP" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_dump \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_exist.3'
--- docs/man/memcached_exist.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_exist.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_EXIST" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_EXIST" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_exist \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_exist_by_key.3'
--- docs/man/memcached_exist_by_key.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_exist_by_key.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_EXIST_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_EXIST_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_exist_by_key \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_fetch.3'
--- docs/man/memcached_fetch.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_fetch.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_FETCH" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_FETCH" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_fetch \- Retrieving data from the server
 .

=== modified file 'docs/man/memcached_fetch_execute.3'
--- docs/man/memcached_fetch_execute.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_fetch_execute.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_FETCH_EXECUTE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_FETCH_EXECUTE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_fetch_execute \- Retrieving data from the server
 .

=== modified file 'docs/man/memcached_fetch_result.3'
--- docs/man/memcached_fetch_result.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_fetch_result.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_FETCH_RESULT" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_FETCH_RESULT" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_fetch_result \- Retrieving data from the server
 .

=== modified file 'docs/man/memcached_flush.3'
--- docs/man/memcached_flush.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_flush.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_FLUSH" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_FLUSH" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_flush \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_flush_buffers.3'
--- docs/man/memcached_flush_buffers.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_flush_buffers.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_FLUSH_BUFFERS" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_FLUSH_BUFFERS" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_flush_buffers \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_free.3'
--- docs/man/memcached_free.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_free.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_FREE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_FREE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_free \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_generate_hash.3'
--- docs/man/memcached_generate_hash.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_generate_hash.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_GENERATE_HASH" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_GENERATE_HASH" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_generate_hash \- Generating hash values directly
 .

=== modified file 'docs/man/memcached_generate_hash_value.3'
--- docs/man/memcached_generate_hash_value.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_generate_hash_value.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_GENERATE_HASH_VALUE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_GENERATE_HASH_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_generate_hash_value \- Generating hash values directly
 .

=== modified file 'docs/man/memcached_get.3'
--- docs/man/memcached_get.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_get.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_GET" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_get \- Retrieving data from the server
 .

=== modified file 'docs/man/memcached_get_by_key.3'
--- docs/man/memcached_get_by_key.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_get_by_key.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_GET_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_get_by_key \- Retrieving data from the server
 .

=== modified file 'docs/man/memcached_get_memory_allocators.3'
--- docs/man/memcached_get_memory_allocators.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_get_memory_allocators.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET_MEMORY_ALLOCATORS" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_GET_MEMORY_ALLOCATORS" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_get_memory_allocators \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_get_sasl_callbacks.3'
--- docs/man/memcached_get_sasl_callbacks.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_get_sasl_callbacks.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET_SASL_CALLBACKS" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_GET_SASL_CALLBACKS" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_get_sasl_callbacks \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_get_user_data.3'
--- docs/man/memcached_get_user_data.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_get_user_data.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET_USER_DATA" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_GET_USER_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_get_user_data \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_increment.3'
--- docs/man/memcached_increment.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_increment.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_INCREMENT" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_INCREMENT" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_increment \- Incrementing and Decrementing Values
 .

=== modified file 'docs/man/memcached_increment_with_initial.3'
--- docs/man/memcached_increment_with_initial.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_increment_with_initial.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_INCREMENT_WITH_INITIAL" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_INCREMENT_WITH_INITIAL" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_increment_with_initial \- Incrementing and Decrementing Values
 .

=== modified file 'docs/man/memcached_last_error_message.3'
--- docs/man/memcached_last_error_message.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_last_error_message.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_LAST_ERROR_MESSAGE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_LAST_ERROR_MESSAGE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_last_error_message \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_lib_version.3'
--- docs/man/memcached_lib_version.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_lib_version.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_LIB_VERSION" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_LIB_VERSION" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_lib_version \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_memory_allocators.3'
--- docs/man/memcached_memory_allocators.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_memory_allocators.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_MEMORY_ALLOCATORS" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_MEMORY_ALLOCATORS" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_memory_allocators \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_mget.3'
--- docs/man/memcached_mget.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_mget.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_MGET" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_MGET" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_mget \- Retrieving data from the server
 .

=== modified file 'docs/man/memcached_mget_by_key.3'
--- docs/man/memcached_mget_by_key.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_mget_by_key.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_MGET_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_MGET_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_mget_by_key \- Retrieving data from the server
 .

=== modified file 'docs/man/memcached_mget_execute.3'
--- docs/man/memcached_mget_execute.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_mget_execute.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_MGET_EXECUTE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_MGET_EXECUTE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_mget_execute \- Retrieving data from the server
 .

=== modified file 'docs/man/memcached_mget_execute_by_key.3'
--- docs/man/memcached_mget_execute_by_key.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_mget_execute_by_key.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_MGET_EXECUTE_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_MGET_EXECUTE_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_mget_execute_by_key \- Retrieving data from the server
 .

=== modified file 'docs/man/memcached_pool.3'
--- docs/man/memcached_pool.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_pool.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_POOL" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_pool \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_pool_behavior_get.3'
--- docs/man/memcached_pool_behavior_get.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_pool_behavior_get.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_BEHAVIOR_GET" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_POOL_BEHAVIOR_GET" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_pool_behavior_get \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_pool_behavior_set.3'
--- docs/man/memcached_pool_behavior_set.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_pool_behavior_set.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_BEHAVIOR_SET" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_POOL_BEHAVIOR_SET" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_pool_behavior_set \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_pool_create.3'
--- docs/man/memcached_pool_create.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_pool_create.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_CREATE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_POOL_CREATE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_pool_create \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_pool_destroy.3'
--- docs/man/memcached_pool_destroy.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_pool_destroy.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_DESTROY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_POOL_DESTROY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_pool_destroy \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_pool_fetch.3'
--- docs/man/memcached_pool_fetch.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_pool_fetch.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_FETCH" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_POOL_FETCH" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_pool_fetch \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_pool_pop.3'
--- docs/man/memcached_pool_pop.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_pool_pop.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_POP" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_POOL_POP" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_pool_pop \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_pool_push.3'
--- docs/man/memcached_pool_push.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_pool_push.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_PUSH" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_POOL_PUSH" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_pool_push \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_pool_release.3'
--- docs/man/memcached_pool_release.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_pool_release.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_RELEASE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_POOL_RELEASE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_pool_release \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_pool_st.3'
--- docs/man/memcached_pool_st.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_pool_st.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_ST" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_POOL_ST" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_pool_st \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_prepend.3'
--- docs/man/memcached_prepend.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_prepend.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_PREPEND" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_PREPEND" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_prepend \- Appending to or Prepending to data on the server
 .

=== modified file 'docs/man/memcached_prepend_by_key.3'
--- docs/man/memcached_prepend_by_key.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_prepend_by_key.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_PREPEND_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_PREPEND_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_prepend_by_key \- Appending to or Prepending to data on the server
 .

=== modified file 'docs/man/memcached_quit.3'
--- docs/man/memcached_quit.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_quit.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_QUIT" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_QUIT" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_quit \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_replace.3'
--- docs/man/memcached_replace.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_replace.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_REPLACE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_REPLACE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_replace \- Storing and Replacing Data
 .

=== modified file 'docs/man/memcached_replace_by_key.3'
--- docs/man/memcached_replace_by_key.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_replace_by_key.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_REPLACE_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_REPLACE_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_replace_by_key \- Storing and Replacing Data
 .

=== modified file 'docs/man/memcached_result_cas.3'
--- docs/man/memcached_result_cas.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_result_cas.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_RESULT_CAS" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_RESULT_CAS" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_result_cas \- Working with result sets
 .

=== modified file 'docs/man/memcached_result_create.3'
--- docs/man/memcached_result_create.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_result_create.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_RESULT_CREATE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_RESULT_CREATE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_result_create \- Working with result sets
 .

=== modified file 'docs/man/memcached_result_flags.3'
--- docs/man/memcached_result_flags.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_result_flags.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_RESULT_FLAGS" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_RESULT_FLAGS" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_result_flags \- Working with result sets
 .

=== modified file 'docs/man/memcached_result_free.3'
--- docs/man/memcached_result_free.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_result_free.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_RESULT_FREE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_RESULT_FREE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_result_free \- Working with result sets
 .

=== modified file 'docs/man/memcached_result_key_length.3'
--- docs/man/memcached_result_key_length.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_result_key_length.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_RESULT_KEY_LENGTH" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_RESULT_KEY_LENGTH" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_result_key_length \- Working with result sets
 .

=== modified file 'docs/man/memcached_result_key_value.3'
--- docs/man/memcached_result_key_value.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_result_key_value.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_RESULT_KEY_VALUE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_RESULT_KEY_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_result_key_value \- Working with result sets
 .

=== modified file 'docs/man/memcached_result_length.3'
--- docs/man/memcached_result_length.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_result_length.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_RESULT_LENGTH" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_RESULT_LENGTH" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_result_length \- Working with result sets
 .

=== modified file 'docs/man/memcached_result_st.3'
--- docs/man/memcached_result_st.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_result_st.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_RESULT_ST" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_RESULT_ST" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_result_st \- Working with result sets
 .

=== modified file 'docs/man/memcached_result_value.3'
--- docs/man/memcached_result_value.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_result_value.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_RESULT_VALUE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_RESULT_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_result_value \- Working with result sets
 .

=== modified file 'docs/man/memcached_return_t.3'
--- docs/man/memcached_return_t.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_return_t.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_RETURN_T" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_RETURN_T" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_return_t \- Return type values 
 .

=== modified file 'docs/man/memcached_sasl.3'
--- docs/man/memcached_sasl.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_sasl.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SASL" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SASL" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_sasl \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_sasl_set_auth_data.3'
--- docs/man/memcached_sasl_set_auth_data.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_sasl_set_auth_data.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SASL_SET_AUTH_DATA" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SASL_SET_AUTH_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_sasl_set_auth_data \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_server_add.3'
--- docs/man/memcached_server_add.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_server_add.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_ADD" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SERVER_ADD" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_server_add \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_server_add_unix_socket.3'
--- docs/man/memcached_server_add_unix_socket.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_server_add_unix_socket.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_ADD_UNIX_SOCKET" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SERVER_ADD_UNIX_SOCKET" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_server_add_unix_socket \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_server_count.3'
--- docs/man/memcached_server_count.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_server_count.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_COUNT" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SERVER_COUNT" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_server_count \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_server_cursor.3'
--- docs/man/memcached_server_cursor.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_server_cursor.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_CURSOR" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SERVER_CURSOR" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_server_cursor \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_server_list.3'
--- docs/man/memcached_server_list.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_server_list.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_LIST" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SERVER_LIST" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_server_list \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_server_list_append.3'
--- docs/man/memcached_server_list_append.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_server_list_append.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_LIST_APPEND" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SERVER_LIST_APPEND" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_server_list_append \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_server_list_count.3'
--- docs/man/memcached_server_list_count.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_server_list_count.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_LIST_COUNT" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SERVER_LIST_COUNT" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_server_list_count \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_server_list_free.3'
--- docs/man/memcached_server_list_free.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_server_list_free.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_LIST_FREE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SERVER_LIST_FREE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_server_list_free \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_server_push.3'
--- docs/man/memcached_server_push.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_server_push.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_PUSH" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SERVER_PUSH" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_server_push \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_server_st.3'
--- docs/man/memcached_server_st.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_server_st.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_ST" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SERVER_ST" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_server_st \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_servers.3'
--- docs/man/memcached_servers.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_servers.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVERS" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SERVERS" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_servers \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_servers_parse.3'
--- docs/man/memcached_servers_parse.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_servers_parse.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVERS_PARSE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SERVERS_PARSE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_servers_parse \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_servers_reset.3'
--- docs/man/memcached_servers_reset.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_servers_reset.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVERS_RESET" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SERVERS_RESET" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_servers_reset \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_set.3'
--- docs/man/memcached_set.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_set.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SET" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_set \- Storing and Replacing Data
 .

=== modified file 'docs/man/memcached_set_by_key.3'
--- docs/man/memcached_set_by_key.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_set_by_key.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SET_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_set_by_key \- Storing and Replacing Data
 .

=== modified file 'docs/man/memcached_set_encoding_key.3'
--- docs/man/memcached_set_encoding_key.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_set_encoding_key.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET_ENCODING_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SET_ENCODING_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_set_encoding_key \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_set_memory_allocators.3'
--- docs/man/memcached_set_memory_allocators.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_set_memory_allocators.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET_MEMORY_ALLOCATORS" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SET_MEMORY_ALLOCATORS" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_set_memory_allocators \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_set_memory_allocators_context.3'
--- docs/man/memcached_set_memory_allocators_context.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_set_memory_allocators_context.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET_MEMORY_ALLOCATORS_CONTEXT" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SET_MEMORY_ALLOCATORS_CONTEXT" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_set_memory_allocators_context \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_set_sasl_callbacks.3'
--- docs/man/memcached_set_sasl_callbacks.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_set_sasl_callbacks.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET_SASL_CALLBACKS" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SET_SASL_CALLBACKS" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_set_sasl_callbacks \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_set_user_data.3'
--- docs/man/memcached_set_user_data.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_set_user_data.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET_USER_DATA" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_SET_USER_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_set_user_data \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_stat.3'
--- docs/man/memcached_stat.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_stat.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_STAT" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_stat \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_stat_execute.3'
--- docs/man/memcached_stat_execute.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_stat_execute.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT_EXECUTE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_STAT_EXECUTE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_stat_execute \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_stat_get_keys.3'
--- docs/man/memcached_stat_get_keys.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_stat_get_keys.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT_GET_KEYS" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_STAT_GET_KEYS" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_stat_get_keys \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_stat_get_value.3'
--- docs/man/memcached_stat_get_value.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_stat_get_value.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT_GET_VALUE" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_STAT_GET_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_stat_get_value \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_stat_servername.3'
--- docs/man/memcached_stat_servername.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_stat_servername.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT_SERVERNAME" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_STAT_SERVERNAME" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_stat_servername \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_stats.3'
--- docs/man/memcached_stats.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_stats.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_STATS" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_STATS" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_stats \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_strerror.3'
--- docs/man/memcached_strerror.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_strerror.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_STRERROR" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_STRERROR" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_strerror \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_touch.3'
--- docs/man/memcached_touch.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_touch.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_TOUCH" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_TOUCH" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_touch \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_touch_by_key.3'
--- docs/man/memcached_touch_by_key.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_touch_by_key.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_TOUCH_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_TOUCH_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_touch_by_key \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_user_data.3'
--- docs/man/memcached_user_data.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_user_data.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_USER_DATA" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_USER_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_user_data \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_verbosity.3'
--- docs/man/memcached_verbosity.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_verbosity.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_VERBOSITY" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_VERBOSITY" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_verbosity \- libmemcached Documentation
 .

=== modified file 'docs/man/memcached_version.3'
--- docs/man/memcached_version.3	2012-05-22 19:57:15 +0000
+++ docs/man/memcached_version.3	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCACHED_VERSION" "3" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCACHED_VERSION" "3" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcached_version \- libmemcached Documentation
 .

=== modified file 'docs/man/memcapable.1'
--- docs/man/memcapable.1	2012-05-22 19:57:15 +0000
+++ docs/man/memcapable.1	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCAPABLE" "1" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCAPABLE" "1" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcapable \- libmemcached Documentation
 .

=== modified file 'docs/man/memcat.1'
--- docs/man/memcat.1	2012-05-22 19:57:15 +0000
+++ docs/man/memcat.1	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCAT" "1" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCAT" "1" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcat \- libmemcached Documentation
 .

=== modified file 'docs/man/memcp.1'
--- docs/man/memcp.1	2012-05-22 19:57:15 +0000
+++ docs/man/memcp.1	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMCP" "1" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMCP" "1" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memcp \- libmemcached Documentation
 .

=== modified file 'docs/man/memdump.1'
--- docs/man/memdump.1	2012-05-22 19:57:15 +0000
+++ docs/man/memdump.1	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMDUMP" "1" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMDUMP" "1" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memdump \- libmemcached Documentation
 .

=== modified file 'docs/man/memerror.1'
--- docs/man/memerror.1	2012-05-22 19:57:15 +0000
+++ docs/man/memerror.1	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMERROR" "1" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMERROR" "1" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memerror \- libmemcached Documentation
 .

=== modified file 'docs/man/memexist.1'
--- docs/man/memexist.1	2012-05-22 19:57:15 +0000
+++ docs/man/memexist.1	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMEXIST" "1" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMEXIST" "1" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memexist \- libmemcached Documentation
 .

=== modified file 'docs/man/memflush.1'
--- docs/man/memflush.1	2012-05-22 19:57:15 +0000
+++ docs/man/memflush.1	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMFLUSH" "1" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMFLUSH" "1" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memflush \- libmemcached Documentation
 .

=== modified file 'docs/man/memparse.1'
--- docs/man/memparse.1	2012-05-22 19:57:15 +0000
+++ docs/man/memparse.1	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMPARSE" "1" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMPARSE" "1" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memparse \- libmemcached Documentation
 .

=== modified file 'docs/man/memping.1'
--- docs/man/memping.1	2012-05-22 19:57:15 +0000
+++ docs/man/memping.1	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMPING" "1" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMPING" "1" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memping \- libmemcached Documentation
 .

=== modified file 'docs/man/memrm.1'
--- docs/man/memrm.1	2012-05-22 19:57:15 +0000
+++ docs/man/memrm.1	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMRM" "1" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMRM" "1" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memrm \- libmemcached Documentation
 .

=== modified file 'docs/man/memslap.1'
--- docs/man/memslap.1	2012-05-22 19:57:15 +0000
+++ docs/man/memslap.1	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMSLAP" "1" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMSLAP" "1" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memslap \- libmemcached Documentation
 .

=== modified file 'docs/man/memstat.1'
--- docs/man/memstat.1	2012-05-22 19:57:15 +0000
+++ docs/man/memstat.1	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMSTAT" "1" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMSTAT" "1" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memstat \- libmemcached Documentation
 .

=== modified file 'docs/man/memtouch.1'
--- docs/man/memtouch.1	2012-05-22 19:57:15 +0000
+++ docs/man/memtouch.1	2012-08-14 00:00:29 +0000
@@ -1,4 +1,4 @@
-.TH "MEMTOUCH" "1" "May 22, 2012" "1.0.8" "libmemcached"
+.TH "MEMTOUCH" "1" "August 02, 2012" "1.0.10" "libmemcached"
 .SH NAME
 memtouch \- libmemcached Documentation
 .

=== modified file 'docs/memcached_behavior.rst'
--- docs/memcached_behavior.rst	2012-04-27 02:09:29 +0000
+++ docs/memcached_behavior.rst	2012-08-14 00:00:29 +0000
@@ -164,11 +164,9 @@
 Enabling this will cause hosts that are added to be placed in the host list in sorted order. This will defeat consisten hashing.
 
 
-
 .. c:type:: MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT
 
-In non-blocking mode this changes the value of the timeout during socket connection.
-
+In non-blocking mode this changes the value of the timeout during socket connection in milliseconds. Specifying -1 means an infinite time‐out.
 
 
 .. c:type:: MEMCACHED_BEHAVIOR_BINARY_PROTOCOL

=== modified file 'example/include.am'
--- example/include.am	2012-03-02 07:05:55 +0000
+++ example/include.am	2012-08-14 00:00:29 +0000
@@ -3,25 +3,25 @@
 # All paths should be given relative to the root
 
 if HAVE_LIBEVENT
-noinst_PROGRAMS += example/memcached_light
+noinst_PROGRAMS+= example/memcached_light
 endif
 
-noinst_HEADERS+= \
-		 example/byteorder.h \
-		 example/memcached_light.h \
-		 example/storage.h
-
-example_memcached_light_SOURCES= \
-				 example/byteorder.cc \
-				 example/interface_v0.cc \
-				 example/interface_v1.cc \
-				 example/memcached_light.cc \
-				 util/daemon.cc \
-				 util/pidfile.cc
-
-example_memcached_light_LDADD= libmemcached/libmemcachedprotocol.la \
-                               $(LIBEVENT_LDFLAGS)
-
+noinst_HEADERS+= example/byteorder.h
+noinst_HEADERS+= example/memcached_light.h
+noinst_HEADERS+= example/storage.h
+
+example_memcached_light_SOURCES=
+example_memcached_light_LDADD= 
+
+example_memcached_light_SOURCES+= example/byteorder.cc
+example_memcached_light_SOURCES+= example/interface_v0.cc
+example_memcached_light_SOURCES+= example/interface_v1.cc
+example_memcached_light_SOURCES+= example/memcached_light.cc
 example_memcached_light_SOURCES+= example/storage.cc
+example_memcached_light_SOURCES+= util/daemon.cc
+example_memcached_light_SOURCES+= util/pidfile.cc
+
+example_memcached_light_LDADD+= libmemcached/libmemcachedprotocol.la
+example_memcached_light_LDADD+= $(LIBEVENT_LDFLAGS)
 
 include example/t/include.am

=== modified file 'example/memcached_light.cc'
--- example/memcached_light.cc	2012-03-08 07:13:01 +0000
+++ example/memcached_light.cc	2012-08-14 00:00:29 +0000
@@ -77,7 +77,8 @@
 
   options_st() :
     service("9999"),
-    is_verbose(false)
+    is_verbose(false),
+    opt_daemon(false)
   {
   }
 };

=== modified file 'example/t/include.am'
--- example/t/include.am	2012-04-24 16:13:12 +0000
+++ example/t/include.am	2012-08-14 00:00:29 +0000
@@ -13,15 +13,18 @@
                               libmemcached/libmemcachedutil.la \
                               libtest/libtest.la
 
+example_t_memcached_light_CXXFLAGS=
+example_t_memcached_light_DEPENDENCIES=
+example_t_memcached_light_LDADD=
 example_t_memcached_light_SOURCES=
-example_t_memcached_light_LDADD=
 
 example_t_memcached_light_SOURCES+= example/t/memcached_light.cc
 example_t_memcached_light_SOURCES+= tests/libmemcached-1.0/memcached_get.cc
 example_t_memcached_light_SOURCES+= tests/libmemcached-1.0/print.cc
 example_t_memcached_light_SOURCES+= tests/libmemcached-1.0/setup_and_teardowns.cc
-example_t_memcached_light_CXXFLAGS = $(AM_CXXFLAGS)
-example_t_memcached_light_DEPENDENCIES= $(MEMCACHED_LIGHT_TESTS_LDADDS) example/memcached_light
+example_t_memcached_light_CXXFLAGS+= $(AM_CXXFLAGS)
+example_t_memcached_light_DEPENDENCIES+= $(MEMCACHED_LIGHT_TESTS_LDADDS)
+example_t_memcached_light_DEPENDENCIES+= example/memcached_light
 example_t_memcached_light_LDADD+= $(MEMCACHED_LIGHT_TESTS_LDADDS)
 example_t_memcached_light_LDADD+= $(LIBUUID_LDFLAGS)
 check_PROGRAMS+= example/t/memcached_light

=== modified file 'example/t/memcached_light.cc'
--- example/t/memcached_light.cc	2012-05-13 02:05:10 +0000
+++ example/t/memcached_light.cc	2012-08-14 00:00:29 +0000
@@ -199,6 +199,12 @@
 
 static void *world_create(server_startup_st& servers, test_return_t& error)
 {
+  if (access(executable.c_str(), X_OK) != 0)
+  {
+    error= TEST_SKIPPED;
+    return NULL;
+  }
+
   if (HAVE_MEMCACHED_LIGHT_BINARY == 0)
   {
     error= TEST_SKIPPED;
@@ -208,6 +214,7 @@
   if (server_startup(servers, "memcached-light", libtest::default_port(), 0, NULL) == 0)
   {
     error= TEST_FAILURE;
+    return NULL;
   }
 
 
@@ -231,7 +238,7 @@
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
   world->create(world_create);
   world->destroy(world_destroy);

=== modified file 'libhashkit-1.0/include.am'
--- libhashkit-1.0/include.am	2012-04-09 06:35:25 +0000
+++ libhashkit-1.0/include.am	2012-08-14 00:00:29 +0000
@@ -3,8 +3,8 @@
 # All paths should be given relative to the root
 #
 
-EXTRA_DIST+= \
-	     libhashkit-1.0/configure.h.in
+EXTRA_DIST+= libhashkit-1.0/configure.h.in
+BUILT_SOURCES+= libhashkit-1.0/configure.h
 
 nobase_include_HEADERS+= \
 			 libhashkit-1.0/algorithm.h \

=== modified file 'libmemcached-1.0/error.h'
--- libmemcached-1.0/error.h	2011-10-02 18:02:19 +0000
+++ libmemcached-1.0/error.h	2012-08-14 00:00:29 +0000
@@ -42,22 +42,22 @@
 #endif
 
 LIBMEMCACHED_API
-  const char *memcached_last_error_message(memcached_st *);
+  const char *memcached_last_error_message(const memcached_st *);
 
 LIBMEMCACHED_API
   void memcached_error_print(const memcached_st *);
 
 LIBMEMCACHED_API
-  memcached_return_t memcached_last_error(memcached_st *);
-
-LIBMEMCACHED_API
-  int memcached_last_error_errno(memcached_st *);
-
-LIBMEMCACHED_API
-  const char *memcached_server_error(memcached_server_instance_st ptr);
-
-LIBMEMCACHED_API
-  memcached_return_t memcached_server_error_return(memcached_server_instance_st ptr);
+  memcached_return_t memcached_last_error(const memcached_st *);
+
+LIBMEMCACHED_API
+  int memcached_last_error_errno(const memcached_st *);
+
+LIBMEMCACHED_API
+  const char *memcached_server_error(const memcached_server_instance_st ptr);
+
+LIBMEMCACHED_API
+  memcached_return_t memcached_server_error_return(const memcached_server_instance_st ptr);
 
 #ifdef __cplusplus
 } // extern "C"

=== modified file 'libmemcached-1.0/exist.h'
--- libmemcached-1.0/exist.h	2012-04-26 20:25:18 +0000
+++ libmemcached-1.0/exist.h	2012-08-14 00:00:29 +0000
@@ -36,6 +36,10 @@
 
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 LIBMEMCACHED_API
 memcached_return_t memcached_exist(memcached_st *memc, const char *key, size_t key_length);
 
@@ -43,3 +47,6 @@
 memcached_return_t memcached_exist_by_key(memcached_st *memc,
                                           const char *group_key, size_t group_key_length,
                                           const char *key, size_t key_length);
+#ifdef __cplusplus
+}
+#endif

=== modified file 'libmemcached-1.0/include.am'
--- libmemcached-1.0/include.am	2012-04-09 06:28:51 +0000
+++ libmemcached-1.0/include.am	2012-08-14 00:00:29 +0000
@@ -2,8 +2,8 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
-EXTRA_DIST+= \
-	     libmemcached-1.0/configure.h.in
+EXTRA_DIST+= libmemcached-1.0/configure.h.in
+BUILT_SOURCES+= libmemcached-1.0/configure.h
 
 include libmemcached-1.0/struct/include.am
 include libmemcached-1.0/types/include.am

=== modified file 'libmemcached-1.0/memcached.hpp'
--- libmemcached-1.0/memcached.hpp	2012-05-19 17:31:36 +0000
+++ libmemcached-1.0/memcached.hpp	2012-08-14 00:00:29 +0000
@@ -75,39 +75,39 @@
 
   Memcache()
   {
-    memc= memcached("", 0);
+    memc_= memcached(NULL, 0);
   }
 
   Memcache(const std::string &config)
   {
-    memc= memcached(config.c_str(), config.size());
+    memc_= memcached(config.c_str(), config.size());
   }
 
   Memcache(const std::string &hostname, in_port_t port)
   {
-    memc= memcached("", 0);
-    if (memc)
+    memc_= memcached(NULL, 0);
+    if (memc_)
     {
-      memcached_server_add(memc, hostname.c_str(), port);
+      memcached_server_add(memc_, hostname.c_str(), port);
     }
   }
 
   Memcache(memcached_st *clone)
   {
-    memc= memcached_clone(NULL, clone);
+    memc_= memcached_clone(NULL, clone);
   }
 
   Memcache(const Memcache &rhs)
   {
-    memc= memcached_clone(NULL, rhs.getImpl());
+    memc_= memcached_clone(NULL, rhs.getImpl());
   }
 
   Memcache &operator=(const Memcache &rhs)
   {
     if (this != &rhs)
     {
-      memcached_free(memc);
-      memc= memcached_clone(NULL, rhs.getImpl());
+      memcached_free(memc_);
+      memc_= memcached_clone(NULL, rhs.getImpl());
     }
 
     return *this;
@@ -115,7 +115,7 @@
 
   ~Memcache()
   {
-    memcached_free(memc);
+    memcached_free(memc_);
   }
 
   /**
@@ -123,7 +123,7 @@
    */
   const memcached_st *getImpl() const
   {
-    return memc;
+    return memc_;
   }
 
   /**
@@ -140,9 +140,9 @@
 
   bool error(std::string& error_message) const
   {
-    if (memcached_failed(memcached_last_error(memc)))
+    if (memcached_failed(memcached_last_error(memc_)))
     {
-      error_message+= memcached_last_error_message(memc);
+      error_message+= memcached_last_error_message(memc_);
       return true;
     }
 
@@ -151,7 +151,7 @@
 
   bool error() const
   {
-    if (memcached_failed(memcached_last_error(memc)))
+    if (memcached_failed(memcached_last_error(memc_)))
     {
       return true;
     }
@@ -161,18 +161,18 @@
 
   bool error(memcached_return_t& arg) const
   {
-    arg= memcached_last_error(memc);
+    arg= memcached_last_error(memc_);
     return memcached_failed(arg);
   }
 
   bool setBehavior(memcached_behavior_t flag, uint64_t data)
   {
-    return (memcached_success(memcached_behavior_set(memc, flag, data)));
+    return (memcached_success(memcached_behavior_set(memc_, flag, data)));
   }
 
   uint64_t getBehavior(memcached_behavior_t flag)
   {
-    return memcached_behavior_get(memc, flag);
+    return memcached_behavior_get(memc_, flag);
   }
 
   /**
@@ -187,8 +187,8 @@
 
     if (new_memc)
     {
-      memcached_free(memc);
-      memc= new_memc;
+      memcached_free(memc_);
+      memc_= new_memc;
 
       return true;
     }
@@ -205,7 +205,7 @@
    */
   bool addServer(const std::string &server_name, in_port_t port)
   {
-    return memcached_success(memcached_server_add(memc, server_name.c_str(), port));
+    return memcached_success(memcached_server_add(memc_, server_name.c_str(), port));
   }
 
   /**
@@ -246,7 +246,7 @@
     memcached_return_t rc;
 
     memcached_result_st *result;
-    if ((result= memcached_fetch_result(memc, NULL, &rc)))
+    if ((result= memcached_fetch_result(memc_, NULL, &rc)))
     {
       // Key
       key.assign(memcached_result_key_value(result), memcached_result_key_length(result));
@@ -254,7 +254,8 @@
       // Actual value, null terminated
       ret_val.reserve(memcached_result_length(result) +1);
       ret_val.assign(memcached_result_value(result),
-                     memcached_result_value(result) +memcached_result_length(result));
+                     memcached_result_value(result) +memcached_result_length(result) +1);
+      ret_val.resize(memcached_result_length(result));
 
       // Misc
       flags= memcached_result_flags(result);
@@ -288,13 +289,15 @@
     memcached_return_t rc;
     size_t value_length= 0;
 
-    char *value= memcached_get(memc, key.c_str(), key.length(),
+    char *value= memcached_get(memc_, key.c_str(), key.length(),
                                &value_length, &flags, &rc);
     if (value != NULL && ret_val.empty())
     {
-      ret_val.reserve(value_length);
-      ret_val.assign(value, value +value_length);
+      ret_val.reserve(value_length +1); // Always provide null
+      ret_val.assign(value, value +value_length +1);
+      ret_val.resize(value_length);
       free(value);
+
       return true;
     }
 
@@ -321,15 +324,17 @@
     memcached_return_t rc;
     size_t value_length= 0;
 
-    char *value= memcached_get_by_key(memc,
+    char *value= memcached_get_by_key(memc_,
                                       master_key.c_str(), master_key.length(),
                                       key.c_str(), key.length(),
                                       &value_length, &flags, &rc);
     if (value)
     {
-      ret_val.reserve(value_length);
-      ret_val.assign(value, value +value_length);
+      ret_val.reserve(value_length +1); // Always provide null
+      ret_val.assign(value, value +value_length +1);
+      ret_val.resize(value_length);
       free(value);
+
       return true;
     }
     return false;
@@ -370,7 +375,7 @@
      */
     if (not real_keys.empty())
     {
-      return memcached_success(memcached_mget(memc, &real_keys[0], &key_len[0], real_keys.size()));
+      return memcached_success(memcached_mget(memc_, &real_keys[0], &key_len[0], real_keys.size()));
     }
 
     return false;
@@ -392,13 +397,25 @@
            time_t expiration,
            uint32_t flags)
   {
-    memcached_return_t rc= memcached_set(memc,
+    memcached_return_t rc= memcached_set(memc_,
                                          key.c_str(), key.length(),
                                          &value[0], value.size(),
                                          expiration, flags);
     return memcached_success(rc);
   }
 
+  bool set(const std::string &key,
+           const char* value, const size_t value_length,
+           time_t expiration,
+           uint32_t flags)
+  {
+    memcached_return_t rc= memcached_set(memc_,
+                                         key.c_str(), key.length(),
+                                         value, value_length,
+                                         expiration, flags);
+    return memcached_success(rc);
+  }
+
   /**
    * Writes an object to a server specified by the master_key parameter.
    * If the object already exists, it will overwrite the existing object.
@@ -416,7 +433,7 @@
                 time_t expiration,
                 uint32_t flags)
   {
-    return memcached_success(memcached_set_by_key(memc, master_key.c_str(),
+    return memcached_success(memcached_set_by_key(memc_, master_key.c_str(),
                                                   master_key.length(),
                                                   key.c_str(), key.length(),
                                                   &value[0], value.size(),
@@ -497,7 +514,7 @@
    */
   bool increment(const std::string& key, uint32_t offset, uint64_t *value)
   {
-    return memcached_success(memcached_increment(memc, key.c_str(), key.length(), offset, value));
+    return memcached_success(memcached_increment(memc_, key.c_str(), key.length(), offset, value));
   }
 
   /**
@@ -512,7 +529,7 @@
    */
   bool decrement(const std::string& key, uint32_t offset, uint64_t *value)
   {
-    return memcached_success(memcached_decrement(memc, key.c_str(),
+    return memcached_success(memcached_decrement(memc_, key.c_str(),
                                                  key.length(),
                                                  offset, value));
   }
@@ -528,7 +545,7 @@
    */
   bool add(const std::string& key, const std::vector<char>& value)
   {
-    return memcached_success(memcached_add(memc, key.c_str(), key.length(),
+    return memcached_success(memcached_add(memc_, key.c_str(), key.length(),
                                            &value[0], value.size(), 0, 0));
   }
 
@@ -546,7 +563,7 @@
                 const std::string& key,
                 const std::vector<char>& value)
   {
-    return memcached_success(memcached_add_by_key(memc,
+    return memcached_success(memcached_add_by_key(memc_,
                                                   master_key.c_str(),
                                                   master_key.length(),
                                                   key.c_str(),
@@ -566,7 +583,7 @@
    */
   bool replace(const std::string& key, const std::vector<char>& value)
   {
-    return memcached_success(memcached_replace(memc, key.c_str(), key.length(),
+    return memcached_success(memcached_replace(memc_, key.c_str(), key.length(),
                                                &value[0], value.size(),
                                                0, 0));
   }
@@ -585,7 +602,7 @@
                     const std::string& key,
                     const std::vector<char>& value)
   {
-    return memcached_success(memcached_replace_by_key(memc,
+    return memcached_success(memcached_replace_by_key(memc_,
                                                       master_key.c_str(),
                                                       master_key.length(),
                                                       key.c_str(),
@@ -604,7 +621,7 @@
    */
   bool prepend(const std::string& key, const std::vector<char>& value)
   {
-    return memcached_success(memcached_prepend(memc, key.c_str(), key.length(),
+    return memcached_success(memcached_prepend(memc_, key.c_str(), key.length(),
                                                &value[0], value.size(), 0, 0));
   }
 
@@ -622,7 +639,7 @@
                     const std::string& key,
                     const std::vector<char>& value)
   {
-    return memcached_success(memcached_prepend_by_key(memc,
+    return memcached_success(memcached_prepend_by_key(memc_,
                                                       master_key.c_str(),
                                                       master_key.length(),
                                                       key.c_str(),
@@ -642,7 +659,7 @@
    */
   bool append(const std::string& key, const std::vector<char>& value)
   {
-    return memcached_success(memcached_append(memc,
+    return memcached_success(memcached_append(memc_,
                                               key.c_str(),
                                               key.length(),
                                               &value[0],
@@ -664,7 +681,7 @@
                    const std::string& key,
                    const std::vector<char> &value)
   {
-    return memcached_success(memcached_append_by_key(memc,
+    return memcached_success(memcached_append_by_key(memc_,
                                                      master_key.c_str(),
                                                      master_key.length(),
                                                      key.c_str(),
@@ -686,7 +703,7 @@
            const std::vector<char>& value,
            uint64_t cas_arg)
   {
-    return memcached_success(memcached_cas(memc, key.c_str(), key.length(),
+    return memcached_success(memcached_cas(memc_, key.c_str(), key.length(),
                                            &value[0], value.size(),
                                            0, 0, cas_arg));
   }
@@ -706,7 +723,7 @@
                 const std::vector<char> &value,
                 uint64_t cas_arg)
   {
-    return memcached_success(memcached_cas_by_key(memc,
+    return memcached_success(memcached_cas_by_key(memc_,
                                                   master_key.c_str(),
                                                   master_key.length(),
                                                   key.c_str(),
@@ -724,7 +741,7 @@
    */
   bool remove(const std::string& key)
   {
-    return memcached_success(memcached_delete(memc, key.c_str(), key.length(), 0));
+    return memcached_success(memcached_delete(memc_, key.c_str(), key.length(), 0));
   }
 
   /**
@@ -736,7 +753,7 @@
    */
   bool remove(const std::string& key, time_t expiration)
   {
-    return memcached_success(memcached_delete(memc,
+    return memcached_success(memcached_delete(memc_,
                                               key.c_str(),
                                               key.length(),
                                               expiration));
@@ -752,7 +769,7 @@
   bool removeByKey(const std::string& master_key,
                    const std::string& key)
   {
-    return memcached_success(memcached_delete_by_key(memc,
+    return memcached_success(memcached_delete_by_key(memc_,
                                                      master_key.c_str(),
                                                      master_key.length(),
                                                      key.c_str(),
@@ -772,7 +789,7 @@
                    const std::string& key,
                    time_t expiration)
   {
-    return memcached_success(memcached_delete_by_key(memc,
+    return memcached_success(memcached_delete_by_key(memc_,
                                                      master_key.c_str(),
                                                      master_key.length(),
                                                      key.c_str(),
@@ -789,7 +806,7 @@
    */
   bool flush(time_t expiration= 0)
   {
-    return memcached_success(memcached_flush(memc, expiration));
+    return memcached_success(memcached_flush(memc_, expiration));
   }
 
   /**
@@ -814,7 +831,7 @@
   bool getStats(std::map< std::string, std::map<std::string, std::string> >& stats_map)
   {
     memcached_return_t rc;
-    memcached_stat_st *stats= memcached_stat(memc, NULL, &rc);
+    memcached_stat_st *stats= memcached_stat(memc_, NULL, &rc);
 
     if (rc != MEMCACHED_SUCCESS &&
         rc != MEMCACHED_SOME_ERRORS)
@@ -822,7 +839,7 @@
       return false;
     }
 
-    uint32_t server_count= memcached_server_count(memc);
+    uint32_t server_count= memcached_server_count(memc_);
 
     /*
      * For each memcached server, construct a std::map for its stats and add
@@ -830,7 +847,7 @@
      */
     for (uint32_t x= 0; x < server_count; x++)
     {
-      memcached_server_instance_st instance= memcached_server_instance_by_position(memc, x);
+      memcached_server_instance_st instance= memcached_server_instance_by_position(memc_, x);
       std::ostringstream strstm;
       std::string server_name(memcached_server_name(instance));
       server_name.append(":");
@@ -838,10 +855,10 @@
       server_name.append(strstm.str());
 
       std::map<std::string, std::string> server_stats;
-      char **list= memcached_stat_get_keys(memc, &stats[x], &rc);
+      char **list= memcached_stat_get_keys(memc_, &stats[x], &rc);
       for (char** ptr= list; *ptr; ptr++)
       {
-        char *value= memcached_stat_get_value(memc, &stats[x], *ptr, &rc);
+        char *value= memcached_stat_get_value(memc_, &stats[x], *ptr, &rc);
         server_stats[*ptr]= value;
         free(value);
       }
@@ -850,12 +867,12 @@
       free(list);
     }
 
-    memcached_stat_free(memc, stats);
+    memcached_stat_free(memc_, stats);
     return true;
   }
 
 private:
-  memcached_st *memc;
+  memcached_st *memc_;
 };
 
 }

=== modified file 'libmemcached-1.0/server.h'
--- libmemcached-1.0/server.h	2011-12-12 19:01:06 +0000
+++ libmemcached-1.0/server.h	2012-08-14 00:00:29 +0000
@@ -104,8 +104,20 @@
 in_port_t memcached_server_port(const memcached_server_instance_st self);
 
 LIBMEMCACHED_API
+void memcached_instance_next_retry(memcached_server_instance_st self, const time_t absolute_time);
+
+LIBMEMCACHED_API
 const char *memcached_server_type(const memcached_server_instance_st ptr);
 
+LIBMEMCACHED_API
+uint8_t memcached_server_major_version(const memcached_server_instance_st ptr);
+
+LIBMEMCACHED_API
+uint8_t memcached_server_minor_version(const memcached_server_instance_st ptr);
+
+LIBMEMCACHED_API
+uint8_t memcached_server_micro_version(const memcached_server_instance_st ptr);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

=== modified file 'libmemcached-1.0/strerror.h'
--- libmemcached-1.0/strerror.h	2011-10-02 18:02:19 +0000
+++ libmemcached-1.0/strerror.h	2012-08-14 00:00:29 +0000
@@ -2,7 +2,7 @@
  * 
  *  Libmemcached library
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
  *  Copyright (C) 2010 Brian Aker All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #endif
 
 LIBMEMCACHED_API
-const char *memcached_strerror(memcached_st *ptr, memcached_return_t rc);
+const char *memcached_strerror(const memcached_st *ptr, memcached_return_t rc);
 
 #ifdef __cplusplus
 }

=== modified file 'libmemcached-1.0/struct/memcached.h'
--- libmemcached-1.0/struct/memcached.h	2012-04-09 06:28:51 +0000
+++ libmemcached-1.0/struct/memcached.h	2012-08-14 00:00:29 +0000
@@ -45,6 +45,7 @@
     bool is_purging:1;
     bool is_processing_input:1;
     bool is_time_for_rebuild:1;
+    bool is_parsing:1;
   } state;
 
   struct {
@@ -63,6 +64,8 @@
     bool verify_key:1;
     bool tcp_keepalive:1;
     bool is_aes:1;
+    bool is_fetching_version:1;
+    bool not_used:1;
   } flags;
 
   memcached_server_distribution_t distribution;
@@ -71,8 +74,13 @@
     unsigned int version;
   } server_info;
   uint32_t number_of_hosts;
-  memcached_server_st *servers;
-  memcached_server_st *last_disconnected_server;
+#ifdef __cplusplus
+  org::libmemcached::Instance* servers;
+  org::libmemcached::Instance* last_disconnected_server;
+#else
+  void *servers;
+  void *last_disconnected_server;
+#endif
   int32_t snd_timeout;
   int32_t rcv_timeout;
   uint32_t server_failure_limit;
@@ -92,11 +100,11 @@
   memcached_result_st result;
 
   struct {
-    bool weighted;
+    bool weighted_;
     uint32_t continuum_count; // Ketama
     uint32_t continuum_points_counter; // Ketama
     time_t next_distribution_rebuild; // Ketama
-    memcached_continuum_item_st *continuum; // Ketama
+    struct memcached_continuum_item_st *continuum; // Ketama
   } ketama;
 
   struct memcached_virtual_bucket_t *virtual_bucket;

=== modified file 'libmemcached-1.0/struct/server.h'
--- libmemcached-1.0/struct/server.h	2012-04-24 16:13:12 +0000
+++ libmemcached-1.0/struct/server.h	2012-08-14 00:00:29 +0000
@@ -59,7 +59,8 @@
   MEMCACHED_SERVER_STATE_ADDRINFO, // ADDRRESS information has been gathered
   MEMCACHED_SERVER_STATE_IN_PROGRESS,
   MEMCACHED_SERVER_STATE_CONNECTED,
-  MEMCACHED_SERVER_STATE_IN_TIMEOUT
+  MEMCACHED_SERVER_STATE_IN_TIMEOUT,
+  MEMCACHED_SERVER_STATE_DISABLED
 };
 
 struct memcached_server_st {
@@ -72,8 +73,8 @@
   uint32_t number_of_hosts;
   uint32_t cursor_active;
   in_port_t port;
-  memcached_socket_t fd;
   uint32_t io_bytes_sent; /* # bytes sent since last read */
+  uint32_t request_id;
   uint32_t server_failure_counter;
   uint64_t server_failure_counter_query_id;
   uint32_t weight;
@@ -83,22 +84,15 @@
     uint32_t read;
     uint32_t write;
     uint32_t timeouts;
+    size_t _bytes_read;
   } io_wait_count;
   uint8_t major_version; // Default definition of UINT8_MAX means that it has not been set.
   uint8_t micro_version; // ditto, and note that this is the third, not second version bit
   uint8_t minor_version; // ditto
   memcached_connection_t type;
-  char *read_ptr;
-  size_t read_buffer_length;
-  size_t read_data_length;
-  size_t write_buffer_offset;
-  struct addrinfo *address_info;
-  struct addrinfo *address_info_next;
   time_t next_retry;
   struct memcached_st *root;
   uint64_t limit_maxbytes;
   struct memcached_error_t *error_messages;
-  char read_buffer[MEMCACHED_MAX_BUFFER];
-  char write_buffer[MEMCACHED_MAX_BUFFER];
   char hostname[MEMCACHED_NI_MAXHOST];
 };

=== modified file 'libmemcached-1.0/types.h'
--- libmemcached-1.0/types.h	2011-12-12 16:59:07 +0000
+++ libmemcached-1.0/types.h	2012-08-14 00:00:29 +0000
@@ -39,6 +39,9 @@
 #pragma once
 
 #ifdef __cplusplus
+
+namespace org { namespace libmemcached { struct Instance; } }
+
 struct memcached_st;
 struct memcached_stat_st;
 struct memcached_analysis_st;
@@ -48,7 +51,8 @@
 
 // All of the flavors of memcache_server_st
 struct memcached_server_st;
-typedef const struct memcached_server_st *memcached_server_instance_st;
+struct memcached_instance_st;
+typedef const org::libmemcached::Instance* memcached_server_instance_st;
 typedef struct memcached_server_st *memcached_server_list_st;
 
 struct memcached_callback_st;
@@ -69,7 +73,7 @@
 
 // All of the flavors of memcache_server_st
 typedef struct memcached_server_st memcached_server_st;
-typedef const struct memcached_server_st *memcached_server_instance_st;
+typedef const void *memcached_server_instance_st;
 typedef struct memcached_server_st *memcached_server_list_st;
 
 typedef struct memcached_callback_st memcached_callback_st;
@@ -77,6 +81,5 @@
 // The following two structures are internal, and never exposed to users.
 typedef struct memcached_string_st memcached_string_st;
 typedef struct memcached_string_t memcached_string_t;
-typedef struct memcached_continuum_item_st memcached_continuum_item_st;
 
 #endif

=== modified file 'libmemcached-1.2/include.am'
--- libmemcached-1.2/include.am	2011-12-12 16:59:07 +0000
+++ libmemcached-1.2/include.am	2012-08-14 00:00:29 +0000
@@ -5,8 +5,8 @@
 
 include libmemcached-1.2/t/include.am
 
-EXTRA_DIST+= \
-	     libmemcached-1.2/configure.h.in
+BUILT_SOURCES+= libmemcached-1.2/configure.h
+EXTRA_DIST+= libmemcached-1.2/configure.h.in
 
 nobase_include_HEADERS+= \
 			 libmemcached-1.2/allocators.h \

=== modified file 'libmemcached-2.0/include.am'
--- libmemcached-2.0/include.am	2011-12-06 05:44:43 +0000
+++ libmemcached-2.0/include.am	2012-08-14 00:00:29 +0000
@@ -4,9 +4,9 @@
 
 # This is not a public interface yet.
 
-EXTRA_DIST+= \
-	     libmemcached-1.2/configure.h.in
-
-noinst_HEADERS+= \
-		 libmemcached-1.2/memcached.h
+BUILT_SOURCES+= libmemcached-2.0/configure.h
+
+EXTRA_DIST+= libmemcached-1.2/configure.h.in
+
+noinst_HEADERS+= libmemcached-1.2/memcached.h
 

=== modified file 'libmemcached/allocators.cc'
--- libmemcached/allocators.cc	2012-04-27 02:09:29 +0000
+++ libmemcached/allocators.cc	2012-08-14 00:00:29 +0000
@@ -59,8 +59,8 @@
 {
   if (self->allocators.malloc != _libmemcached_malloc)
   {
-     void *ret = _libmemcached_malloc(self, nelem * size, context);
-     if (ret == NULL)
+     void *ret= _libmemcached_malloc(self, nelem * size, context);
+     if (ret)
      {
        memset(ret, 0, nelem * size);
      }

=== modified file 'libmemcached/array.c'
--- libmemcached/array.c	2011-05-24 20:43:14 +0000
+++ libmemcached/array.c	2012-08-14 00:00:29 +0000
@@ -49,10 +49,12 @@
 
 memcached_array_st *memcached_array_clone(struct memcached_st *memc, const memcached_array_st *original)
 {
-  if (not original)
-    return NULL;
+  if (original)
+  {
+    return memcached_strcpy(memc, original->c_str, original->size);
+  }
 
-  return memcached_strcpy(memc, original->c_str, original->size);
+  return NULL;
 }
 
 memcached_array_st *memcached_strcpy(struct memcached_st *memc, const char *str, size_t str_length)
@@ -63,29 +65,23 @@
 
   memcached_array_st *array= (struct memcached_array_st *)libmemcached_malloc(memc, sizeof(struct memcached_array_st) +str_length +1);
 
-  if (not array)
-    return NULL;
-
-  array->root= memc;
-  array->size= str_length; // We don't count the NULL ending
-  memcpy(array->c_str, str, str_length);
-  array->c_str[str_length]= 0;
+  if (array)
+  {
+    array->root= memc;
+    array->size= str_length; // We don't count the NULL ending
+    memcpy(array->c_str, str, str_length);
+    array->c_str[str_length]= 0;
+  }
 
   return array;
 }
 
 bool memcached_array_is_null(memcached_array_st *array)
 {
-  assert(array);
-  assert(array->root);
-
-  if (not array)
-    return false;
-
-  if (array->size and array->c_str)
-    return false;
-
-  assert(not array->size and not array->c_str);
+  if (array)
+  {
+    return false;
+  }
 
   return true;
 }
@@ -104,25 +100,29 @@
 
 void memcached_array_free(memcached_array_st *array)
 {
-  if (not array)
-    return;
-
-  WATCHPOINT_ASSERT(array->root);
-  libmemcached_free(array->root, array);
+  if (array)
+  {
+    WATCHPOINT_ASSERT(array->root);
+    libmemcached_free(array->root, array);
+  }
 }
 
 size_t memcached_array_size(memcached_array_st *array)
 {
-  if (not array)
-    return 0;
+  if (array)
+  {
+    return array->size;
+  }
 
-  return array->size;
+  return 0;
 }
 
 const char *memcached_array_string(memcached_array_st *array)
 {
-  if (not array)
-    return NULL;
+  if (array)
+  {
+    return array->c_str;
+  }
 
-  return array->c_str;
+  return NULL;
 }

=== modified file 'libmemcached/auto.cc'
--- libmemcached/auto.cc	2012-04-09 06:51:42 +0000
+++ libmemcached/auto.cc	2012-08-14 00:00:29 +0000
@@ -37,7 +37,7 @@
 
 #include <libmemcached/common.h>
 
-static void auto_response(memcached_server_write_instance_st instance, const bool reply,  memcached_return_t& rc, uint64_t* value)
+static void auto_response(org::libmemcached::Instance* instance, const bool reply,  memcached_return_t& rc, uint64_t* value)
 {
   // If the message was successfully sent, then get the response, otherwise
   // fail.
@@ -62,7 +62,7 @@
   }
 }
 
-static memcached_return_t text_incr_decr(memcached_server_write_instance_st instance,
+static memcached_return_t text_incr_decr(org::libmemcached::Instance* instance,
                                          const bool is_incr,
                                          const char *key, size_t key_length,
                                          const uint64_t offset,
@@ -83,7 +83,7 @@
     { memcached_literal_param("incr ") },
     { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) },
     { key, key_length },
-    { buffer, send_length },
+    { buffer, size_t(send_length) },
     { " noreply", reply ? 0 : memcached_literal_param_size(" noreply") },
     { memcached_literal_param("\r\n") }
   };
@@ -96,7 +96,7 @@
   return memcached_vdo(instance, vector, 7, true);
 }
 
-static memcached_return_t binary_incr_decr(memcached_server_write_instance_st instance,
+static memcached_return_t binary_incr_decr(org::libmemcached::Instance* instance,
                                            protocol_binary_command cmd,
                                            const char *key, const size_t key_length,
                                            const uint64_t offset,
@@ -118,7 +118,8 @@
   }
   protocol_binary_request_incr request= {}; // = {.bytes= {0}};
 
-  request.message.header.request.magic= PROTOCOL_BINARY_REQ;
+  initialize_binary_request(instance, request.message.header);
+
   request.message.header.request.opcode= cmd;
   request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(instance->root->_namespace)));
   request.message.header.request.extlen= 20;
@@ -178,7 +179,7 @@
   }
 
   uint32_t server_key= memcached_generate_hash_with_redistribution(memc, group_key, group_key_length);
-  memcached_server_write_instance_st instance= memcached_server_instance_fetch(memc, server_key);
+  org::libmemcached::Instance* instance= memcached_instance_fetch(memc, server_key);
 
   bool reply= memcached_is_replying(instance->root);
 
@@ -237,7 +238,7 @@
   }
 
   uint32_t server_key= memcached_generate_hash_with_redistribution(memc, group_key, group_key_length);
-  memcached_server_write_instance_st instance= memcached_server_instance_fetch(memc, server_key);
+  org::libmemcached::Instance* instance= memcached_instance_fetch(memc, server_key);
 
   bool reply= memcached_is_replying(instance->root);
 

=== modified file 'libmemcached/behavior.cc'
--- libmemcached/behavior.cc	2012-05-10 06:30:56 +0000
+++ libmemcached/behavior.cc	2012-08-14 00:00:29 +0000
@@ -42,6 +42,26 @@
 #include <ctime>
 #include <sys/types.h>
 
+bool memcached_is_consistent_distribution(const memcached_st* memc)
+{
+  switch (memc->distribution)
+  {
+  case MEMCACHED_DISTRIBUTION_CONSISTENT:
+  case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA:
+  case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY:
+  case MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED:
+    return true;
+
+  case MEMCACHED_DISTRIBUTION_MODULA:
+  case MEMCACHED_DISTRIBUTION_RANDOM:
+  case MEMCACHED_DISTRIBUTION_VIRTUAL_BUCKET:
+  case MEMCACHED_DISTRIBUTION_CONSISTENT_MAX:
+    break;
+  }
+
+  return false;
+}
+
 /*
   This function is used to modify the behavior of running client.
 
@@ -162,13 +182,17 @@
 
   case MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED:
     {
+      if (bool(data) == false)
+      {
+        return memcached_behavior_set(ptr, MEMCACHED_BEHAVIOR_KETAMA, true);
+      }
+
       (void)memcached_behavior_set_key_hash(ptr, MEMCACHED_HASH_MD5);
       (void)memcached_behavior_set_distribution_hash(ptr, MEMCACHED_HASH_MD5);
-      ptr->ketama.weighted= bool(data);
       /**
         @note We try to keep the same distribution going. This should be deprecated and rewritten.
       */
-      return memcached_behavior_set_distribution(ptr, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA);
+      return memcached_behavior_set_distribution(ptr, MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED);
     }
 
   case MEMCACHED_BEHAVIOR_HASH:
@@ -331,13 +355,17 @@
     return ptr->flags.verify_key;
 
   case MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED:
-    return ptr->ketama.weighted;
+    if (memcached_is_consistent_distribution(ptr))
+    {
+      return memcached_is_weighted_ketama(ptr);
+    }
+    return false;
 
   case MEMCACHED_BEHAVIOR_DISTRIBUTION:
     return ptr->distribution;
 
   case MEMCACHED_BEHAVIOR_KETAMA:
-    return (ptr->distribution == MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA) ? (uint64_t) 1 : 0;
+    return memcached_is_consistent_distribution(ptr);
 
   case MEMCACHED_BEHAVIOR_HASH:
     return hashkit_get_function(&ptr->hashkit);
@@ -383,7 +411,7 @@
         return (uint64_t) ptr->send_size;
       }
 
-      memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, 0);
+      org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, 0);
 
       if (instance) // If we have an instance we test, otherwise we just set and pray
       {
@@ -417,7 +445,7 @@
       if (ptr->recv_size != -1) // If value is -1 then we are using the default
         return (uint64_t) ptr->recv_size;
 
-      memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, 0);
+      org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, 0);
 
       /**
         @note REFACTOR
@@ -487,23 +515,37 @@
 
 memcached_return_t memcached_behavior_set_distribution(memcached_st *ptr, memcached_server_distribution_t type)
 {
-  if (type < MEMCACHED_DISTRIBUTION_CONSISTENT_MAX)
+  switch (type)
   {
-    if (MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED)
-    {
-      ptr->ketama.weighted= true;
-    }
-    else
-    {
-      ptr->ketama.weighted= false;
-    }
-
-    ptr->distribution= type;
-    return run_distribution(ptr);
+  case MEMCACHED_DISTRIBUTION_MODULA:
+    break;
+
+  case MEMCACHED_DISTRIBUTION_CONSISTENT:
+  case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA:
+    memcached_set_weighted_ketama(ptr, false);
+    break;
+
+  case MEMCACHED_DISTRIBUTION_RANDOM:
+    break;
+
+  case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY:
+    break;
+
+  case MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED:
+    memcached_set_weighted_ketama(ptr, true);
+    break;
+
+  case MEMCACHED_DISTRIBUTION_VIRTUAL_BUCKET:
+    break;
+
+  default:
+  case MEMCACHED_DISTRIBUTION_CONSISTENT_MAX:
+    return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT,
+                               memcached_literal_param("Invalid memcached_server_distribution_t"));
   }
+  ptr->distribution= type;
 
-  return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT,
-                             memcached_literal_param("Invalid memcached_server_distribution_t"));
+  return run_distribution(ptr);
 }
 
 
@@ -531,7 +573,9 @@
 memcached_return_t memcached_behavior_set_distribution_hash(memcached_st *ptr, memcached_hash_t type)
 {
   if (hashkit_success(hashkit_set_distribution_function(&ptr->hashkit, (hashkit_hash_algorithm_t)type)))
+  {
     return MEMCACHED_SUCCESS;
+  }
 
   return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT,
                              memcached_literal_param("Invalid memcached_hash_t()"));

=== modified file 'libmemcached/behavior.hpp'
--- libmemcached/behavior.hpp	2011-11-29 23:20:06 +0000
+++ libmemcached/behavior.hpp	2012-08-14 00:00:29 +0000
@@ -36,4 +36,5 @@
 
 #pragma once
 
+bool memcached_is_consistent_distribution(const memcached_st*);
 bool _is_auto_eject_host(const memcached_st *ptr);

=== modified file 'libmemcached/common.h'
--- libmemcached/common.h	2012-05-21 05:08:39 +0000
+++ libmemcached/common.h	2012-08-14 00:00:29 +0000
@@ -73,6 +73,7 @@
 #include <libmemcached/watchpoint.h>
 #include <libmemcached/is.h>
 
+#include <libmemcached/instance.h>
 #include <libmemcached/server_instance.h>
 
 #ifdef HAVE_POLL_H
@@ -81,31 +82,31 @@
 #include "poll/poll.h"
 #endif
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef memcached_return_t (*memcached_server_execute_fn)(memcached_st *ptr, memcached_server_write_instance_st server, void *context);
 
-LIBMEMCACHED_LOCAL
-memcached_server_write_instance_st memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key);
-
-LIBMEMCACHED_LOCAL
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+
+#ifdef __cplusplus
+org::libmemcached::Instance* memcached_instance_fetch(memcached_st *ptr, uint32_t server_key);
+#endif
+
 memcached_return_t memcached_server_execute(memcached_st *ptr,
                                             memcached_server_execute_fn callback,
                                             void *context);
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-
 /* These are private not to be installed headers */
 #include <libmemcached/error.hpp>
 #include <libmemcached/memory.h>
 #include <libmemcached/io.h>
 #ifdef __cplusplus
 #include <libmemcached/string.hpp>
+#include <libmemcached/memcached/protocol_binary.h>
 #include <libmemcached/io.hpp>
 #include <libmemcached/udp.hpp>
 #include <libmemcached/do.hpp>
@@ -114,7 +115,9 @@
 #include <libmemcached/allocators.hpp>
 #include <libmemcached/hash.hpp>
 #include <libmemcached/quit.hpp>
+#include <libmemcached/instance.hpp>
 #include <libmemcached/server.hpp>
+#include <libmemcached/flag.hpp>
 #include <libmemcached/behavior.hpp>
 #include <libmemcached/sasl.hpp>
 #include <libmemcached/server_list.hpp>
@@ -122,7 +125,6 @@
 #include <libmemcached/internal.h>
 #include <libmemcached/array.h>
 #include <libmemcached/libmemcached_probes.h>
-#include <libmemcached/memcached/protocol_binary.h>
 #include <libmemcached/byteorder.h>
 #include <libmemcached/initialize_query.h>
 #ifdef __cplusplus
@@ -138,6 +140,7 @@
 #include <libmemcached/key.hpp>
 #include <libmemcached/encoding_key.h>
 #include <libmemcached/result.h>
+#include <libmemcached/version.hpp>
 #endif
 
 #include <libmemcached/continuum.hpp>
@@ -162,15 +165,21 @@
 extern "C" {
 #endif
 
-LIBMEMCACHED_LOCAL
 memcached_return_t run_distribution(memcached_st *ptr);
 
-#define memcached_server_response_increment(A) (A)->cursor_active++
-#define memcached_server_response_decrement(A) (A)->cursor_active--
-#define memcached_server_response_reset(A) (A)->cursor_active=0
+#define memcached_server_response_increment(A) (A)->cursor_active_++
+#define memcached_server_response_decrement(A) (A)->cursor_active_--
+#define memcached_server_response_reset(A) (A)->cursor_active_=0
 
-bool memcached_purge(memcached_server_write_instance_st ptr);
+#define memcached_instance_response_increment(A) (A)->cursor_active_++
+#define memcached_instance_response_decrement(A) (A)->cursor_active_--
+#define memcached_instance_response_reset(A) (A)->cursor_active_=0
 
 #ifdef __cplusplus
 }
 #endif
+
+#ifdef __cplusplus
+bool memcached_purge(org::libmemcached::Instance*);
+org::libmemcached::Instance* memcached_instance_by_position(const memcached_st *ptr, uint32_t server_key);
+#endif

=== modified file 'libmemcached/connect.cc'
--- libmemcached/connect.cc	2012-05-21 09:34:18 +0000
+++ libmemcached/connect.cc	2012-08-14 00:00:29 +0000
@@ -42,7 +42,11 @@
 #include <ctime>
 #include <sys/time.h>
 
-static memcached_return_t connect_poll(memcached_server_st *server)
+#ifndef SOCK_CLOEXEC 
+#define SOCK_CLOEXEC 0
+#endif
+
+static memcached_return_t connect_poll(org::libmemcached::Instance* server)
 {
   struct pollfd fds[1];
   fds[0].fd= server->fd;
@@ -135,7 +139,7 @@
   return memcached_set_errno(*server, get_socket_errno(), MEMCACHED_AT);
 }
 
-static memcached_return_t set_hostinfo(memcached_server_st *server)
+static memcached_return_t set_hostinfo(org::libmemcached::Instance* server)
 {
   assert(server->type != MEMCACHED_CONNECTION_UNIX_SOCKET);
   if (server->address_info)
@@ -146,8 +150,8 @@
   }
 
   char str_port[NI_MAXSERV];
-  int length= snprintf(str_port, NI_MAXSERV, "%u", (uint32_t)server->port);
-  if (length >= NI_MAXSERV or length < 0)
+  int length= snprintf(str_port, NI_MAXSERV, "%u", uint32_t(server->port()));
+  if (length >= NI_MAXSERV or length <= 0)
   {
     return MEMCACHED_FAILURE;
   }
@@ -199,7 +203,7 @@
   return MEMCACHED_SUCCESS;
 }
 
-static inline void set_socket_nonblocking(memcached_server_st *server)
+static inline void set_socket_nonblocking(org::libmemcached::Instance* server)
 {
 #ifdef WIN32
   u_long arg= 1;
@@ -236,7 +240,7 @@
 #endif
 }
 
-static void set_socket_options(memcached_server_st *server)
+static void set_socket_options(org::libmemcached::Instance* server)
 {
   assert_msg(server->fd != INVALID_SOCKET, "invalid socket was passed to set_socket_options()");
 
@@ -246,29 +250,31 @@
   }
 
 #ifdef HAVE_SNDTIMEO
-  if (server->root->snd_timeout)
+  if (server->root->snd_timeout > 0)
   {
     struct timeval waittime;
 
-    waittime.tv_sec= 0;
-    waittime.tv_usec= server->root->snd_timeout;
+    waittime.tv_sec= server->root->snd_timeout / 1000000;
+    waittime.tv_usec= server->root->snd_timeout % 1000000;
 
     int error= setsockopt(server->fd, SOL_SOCKET, SO_SNDTIMEO,
-                      &waittime, (socklen_t)sizeof(struct timeval));
+                          &waittime, (socklen_t)sizeof(struct timeval));
+    (void)error;
     assert(error == 0);
   }
 #endif
 
 #ifdef HAVE_RCVTIMEO
-  if (server->root->rcv_timeout)
+  if (server->root->rcv_timeout > 0)
   {
     struct timeval waittime;
 
-    waittime.tv_sec= 0;
-    waittime.tv_usec= server->root->rcv_timeout;
+    waittime.tv_sec= server->root->rcv_timeout / 1000000;
+    waittime.tv_usec= server->root->rcv_timeout % 1000000;
 
     int error= setsockopt(server->fd, SOL_SOCKET, SO_RCVTIMEO,
                           &waittime, (socklen_t)sizeof(struct timeval));
+    (void)(error);
     assert(error == 0);
   }
 #endif
@@ -279,11 +285,14 @@
     int set= 1;
     int error= setsockopt(server->fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&set, sizeof(int));
 
+    assert(error == 0);
+
     // This is not considered a fatal error
     if (error == -1)
     {
-      WATCHPOINT_ERRNO(get_socket_errno());
+#if 0
       perror("setsockopt(SO_NOSIGPIPE)");
+#endif
     }
   }
 #endif
@@ -296,6 +305,7 @@
     linger.l_linger= 0; /* By default on close() just drop the socket */
     int error= setsockopt(server->fd, SOL_SOCKET, SO_LINGER,
                           &linger, (socklen_t)sizeof(struct linger));
+    (void)(error);
     assert(error == 0);
   }
 
@@ -305,6 +315,7 @@
 
     int error= setsockopt(server->fd, IPPROTO_TCP, TCP_NODELAY,
                           &flag, (socklen_t)sizeof(int));
+    (void)(error);
     assert(error == 0);
   }
 
@@ -314,6 +325,7 @@
 
     int error= setsockopt(server->fd, SOL_SOCKET, SO_KEEPALIVE,
                       &flag, (socklen_t)sizeof(int));
+    (void)(error);
     assert(error == 0);
   }
 
@@ -322,6 +334,7 @@
   {
     int error= setsockopt(server->fd, IPPROTO_TCP, TCP_KEEPIDLE,
                           &server->root->tcp_keepidle, (socklen_t)sizeof(int));
+    (void)(error);
     assert(error == 0);
   }
 #endif
@@ -330,6 +343,7 @@
   {
     int error= setsockopt(server->fd, SOL_SOCKET, SO_SNDBUF,
                           &server->root->send_size, (socklen_t)sizeof(int));
+    (void)(error);
     assert(error == 0);
   }
 
@@ -337,6 +351,7 @@
   {
     int error= setsockopt(server->fd, SOL_SOCKET, SO_RCVBUF,
                           &server->root->recv_size, (socklen_t)sizeof(int));
+    (void)(error);
     assert(error == 0);
   }
 
@@ -345,7 +360,7 @@
   set_socket_nonblocking(server);
 }
 
-static memcached_return_t unix_socket_connect(memcached_server_st *server)
+static memcached_return_t unix_socket_connect(org::libmemcached::Instance* server)
 {
 #ifndef WIN32
   WATCHPOINT_ASSERT(server->fd == INVALID_SOCKET);
@@ -396,12 +411,12 @@
 #endif
 }
 
-static memcached_return_t network_connect(memcached_server_st *server)
+static memcached_return_t network_connect(org::libmemcached::Instance* server)
 {
   bool timeout_error_occured= false;
 
   WATCHPOINT_ASSERT(server->fd == INVALID_SOCKET);
-  WATCHPOINT_ASSERT(server->cursor_active == 0);
+  WATCHPOINT_ASSERT(server->cursor_active_ == 0);
 
   /*
     We want to check both of these because if address_info_next has been fully tried, we want to do a new lookup to make sure we have picked up on any new DNS information.
@@ -451,13 +466,30 @@
       continue;
     }
 
+    int type= server->address_info_next->ai_socktype;
+    if (HAVE_SOCK_CLOEXEC)
+    {
+      type|= SOCK_CLOEXEC;
+    }
+
     if ((server->fd= socket(server->address_info_next->ai_family,
-                            server->address_info_next->ai_socktype,
+                            type,
                             server->address_info_next->ai_protocol)) < 0)
     {
       return memcached_set_errno(*server, get_socket_errno(), NULL);
     }
 
+    if (HAVE_SOCK_CLOEXEC == 0)
+    {
+#ifdef FD_CLOEXEC
+      int rval;
+      do
+      {
+        rval= fcntl (server->fd, F_SETFD, FD_CLOEXEC);
+      } while (rval == -1 && (errno == EINTR or errno == EAGAIN));
+#endif
+    }
+
     set_socket_options(server);
 
     /* connect to server */
@@ -533,7 +565,7 @@
 
   if (memcached_has_current_error(*server))
   {
-    return memcached_server_error_return(server);
+    return memcached_instance_error_return(server);
   }
 
   if (timeout_error_occured and server->state < MEMCACHED_SERVER_STATE_IN_PROGRESS)
@@ -551,7 +583,7 @@
   Based on time/failure count fail the connect without trying. This prevents waiting in a state where
   we get caught spending cycles just waiting.
 */
-static memcached_return_t backoff_handling(memcached_server_write_instance_st server, bool& in_timeout)
+static memcached_return_t backoff_handling(org::libmemcached::Instance* server, bool& in_timeout)
 {
   struct timeval curr_time;
   bool _gettime_success= (gettimeofday(&curr_time, NULL) == 0);
@@ -618,8 +650,9 @@
   return MEMCACHED_SUCCESS;
 }
 
-static memcached_return_t _memcached_connect(memcached_server_write_instance_st server, const bool set_last_disconnected)
+static memcached_return_t _memcached_connect(org::libmemcached::Instance* server, const bool set_last_disconnected)
 {
+  assert(server);
   if (server->fd != INVALID_SOCKET)
   {
     return MEMCACHED_SUCCESS;
@@ -674,7 +707,8 @@
 
   if (memcached_success(rc))
   {
-    memcached_mark_server_as_clean(server);
+    server->mark_server_as_clean();
+    memcached_version_instance(server);
     return rc;
   }
   else if (set_last_disconnected)
@@ -683,7 +717,7 @@
     if (memcached_has_current_error(*server))
     {
       memcached_mark_server_for_timeout(server);
-      assert(memcached_failed(memcached_server_error_return(server)));
+      assert(memcached_failed(memcached_instance_error_return(server)));
     }
     else
     {
@@ -696,7 +730,7 @@
     if (in_timeout)
     {
       char buffer[1024];
-      int snprintf_length= snprintf(buffer, sizeof(buffer), "%s:%d", server->hostname, int(server->port));
+      int snprintf_length= snprintf(buffer, sizeof(buffer), "%s:%d", server->hostname, int(server->port()));
       return memcached_set_error(*server, MEMCACHED_SERVER_TEMPORARILY_DISABLED, MEMCACHED_AT, buffer, snprintf_length);
     }
   }
@@ -704,12 +738,17 @@
   return rc;
 }
 
-memcached_return_t memcached_connect_try(memcached_server_write_instance_st server)
+memcached_return_t memcached_connect_try(org::libmemcached::Instance* server)
 {
+  if (server and server->root and server->root->state.is_parsing)
+  {
+    return MEMCACHED_SUCCESS;
+  }
+
   return _memcached_connect(server, false);
 }
 
-memcached_return_t memcached_connect(memcached_server_write_instance_st server)
+memcached_return_t memcached_connect(org::libmemcached::Instance* server)
 {
   return _memcached_connect(server, true);
 }

=== modified file 'libmemcached/connect.hpp'
--- libmemcached/connect.hpp	2012-01-23 07:21:54 +0000
+++ libmemcached/connect.hpp	2012-08-14 00:00:29 +0000
@@ -37,6 +37,6 @@
 
 #pragma once
 
-memcached_return_t memcached_connect_try(memcached_server_write_instance_st ptr);
-memcached_return_t memcached_connect(memcached_server_write_instance_st ptr);
+memcached_return_t memcached_connect_try(org::libmemcached::Instance*);
+memcached_return_t memcached_connect(org::libmemcached::Instance*);
 

=== modified file 'libmemcached/csl/context.h'
--- libmemcached/csl/context.h	2011-11-27 04:07:26 +0000
+++ libmemcached/csl/context.h	2012-08-14 00:00:29 +0000
@@ -61,6 +61,8 @@
     memc= memc_arg;
     init_scanner();
     rc= MEMCACHED_SUCCESS;
+
+    memc->state.is_parsing= true;
   }
 
   bool end()
@@ -106,6 +108,7 @@
   ~Context()
   {
     destroy_scanner();
+    memc->state.is_parsing= false;
   }
 
   yytokentype previous_token;

=== modified file 'libmemcached/csl/parser.cc'
--- libmemcached/csl/parser.cc	2012-04-28 05:31:58 +0000
+++ libmemcached/csl/parser.cc	2012-08-14 00:00:29 +0000
@@ -185,32 +185,33 @@
      _TCP_KEEPALIVE = 298,
      _TCP_KEEPIDLE = 299,
      _TCP_NODELAY = 300,
-     NAMESPACE = 301,
-     POOL_MIN = 302,
-     POOL_MAX = 303,
-     MD5 = 304,
-     CRC = 305,
-     FNV1_64 = 306,
-     FNV1A_64 = 307,
-     FNV1_32 = 308,
-     FNV1A_32 = 309,
-     HSIEH = 310,
-     MURMUR = 311,
-     JENKINS = 312,
-     CONSISTENT = 313,
-     MODULA = 314,
-     RANDOM = 315,
-     TRUE = 316,
-     FALSE = 317,
-     FLOAT = 318,
-     NUMBER = 319,
-     PORT = 320,
-     WEIGHT_START = 321,
-     IPADDRESS = 322,
-     HOSTNAME = 323,
-     STRING = 324,
-     QUOTED_STRING = 325,
-     FILE_PATH = 326
+     FETCH_VERSION = 301,
+     NAMESPACE = 302,
+     POOL_MIN = 303,
+     POOL_MAX = 304,
+     MD5 = 305,
+     CRC = 306,
+     FNV1_64 = 307,
+     FNV1A_64 = 308,
+     FNV1_32 = 309,
+     FNV1A_32 = 310,
+     HSIEH = 311,
+     MURMUR = 312,
+     JENKINS = 313,
+     CONSISTENT = 314,
+     MODULA = 315,
+     RANDOM = 316,
+     TRUE = 317,
+     FALSE = 318,
+     FLOAT = 319,
+     NUMBER = 320,
+     PORT = 321,
+     WEIGHT_START = 322,
+     IPADDRESS = 323,
+     HOSTNAME = 324,
+     STRING = 325,
+     QUOTED_STRING = 326,
+     FILE_PATH = 327
    };
 #endif
 
@@ -227,7 +228,7 @@
 
 
 /* Line 343 of yacc.c  */
-#line 231 "libmemcached/csl/parser.cc"
+#line 232 "libmemcached/csl/parser.cc"
 
 #ifdef short
 # undef short
@@ -444,22 +445,22 @@
 #endif /* !YYCOPY_NEEDED */
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  71
+#define YYFINAL  72
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   74
+#define YYLAST   75
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  75
+#define YYNTOKENS  76
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  12
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  67
+#define YYNRULES  68
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  85
+#define YYNSTATES  86
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   326
+#define YYMAXUTOK   327
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -470,10 +471,10 @@
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,    74,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,    63,     2,     2,     2,     2,     2,
+       2,     2,    75,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,    64,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,    64,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,    65,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -498,8 +499,8 @@
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    65,    66,
-      67,    68,    69,    70,    71,    72,    73
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    66,
+      67,    68,    69,    70,    71,    72,    73,    74
 };
 
 #if YYDEBUG
@@ -509,44 +510,44 @@
 {
        0,     0,     3,     5,     9,    11,    13,    15,    17,    19,
       21,    23,    27,    32,    37,    41,    44,    47,    50,    52,
-      55,    58,    63,    66,    69,    71,    73,    75,    77,    79,
+      55,    57,    60,    65,    68,    71,    73,    75,    77,    79,
       81,    83,    85,    87,    89,    91,    93,    95,    97,    99,
      101,   103,   105,   107,   109,   111,   113,   115,   117,   119,
-     121,   122,   124,   125,   127,   129,   131,   133,   135,   137,
-     139,   141,   143,   145,   147,   149,   151,   153
+     121,   123,   124,   126,   127,   129,   131,   133,   135,   137,
+     139,   141,   143,   145,   147,   149,   151,   153,   155
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-      76,     0,    -1,    77,    -1,    76,    74,    77,    -1,    78,
+      77,     0,    -1,    78,    -1,    77,    75,    78,    -1,    79,
       -1,     3,    -1,    10,    -1,     4,    -1,     5,    -1,     6,
-      -1,     7,    -1,     8,    74,    85,    -1,    11,    70,    82,
-      83,    -1,    11,    69,    82,    83,    -1,    12,    85,    83,
-      -1,     9,    85,    -1,    47,    66,    -1,    48,    66,    -1,
-      79,    -1,    46,    85,    -1,    20,    86,    -1,    20,    86,
-      63,    84,    -1,    21,    84,    -1,    80,    66,    -1,    81,
-      -1,    40,    -1,    33,    -1,    19,    -1,    25,    -1,    23,
-      -1,    24,    -1,    29,    -1,    30,    -1,    32,    -1,    34,
-      -1,    35,    -1,    36,    -1,    37,    -1,    17,    -1,    18,
-      -1,    22,    -1,    28,    -1,    31,    -1,    38,    -1,    39,
-      -1,    45,    -1,    43,    -1,    44,    -1,    41,    -1,    42,
-      -1,    -1,    67,    -1,    -1,    68,    -1,    49,    -1,    50,
+      -1,     7,    -1,     8,    75,    86,    -1,    11,    71,    83,
+      84,    -1,    11,    70,    83,    84,    -1,    12,    86,    84,
+      -1,     9,    86,    -1,    48,    67,    -1,    49,    67,    -1,
+      80,    -1,    47,    86,    -1,    46,    -1,    20,    87,    -1,
+      20,    87,    64,    85,    -1,    21,    85,    -1,    81,    67,
+      -1,    82,    -1,    40,    -1,    33,    -1,    19,    -1,    25,
+      -1,    23,    -1,    24,    -1,    29,    -1,    30,    -1,    32,
+      -1,    34,    -1,    35,    -1,    36,    -1,    37,    -1,    17,
+      -1,    18,    -1,    22,    -1,    28,    -1,    31,    -1,    38,
+      -1,    39,    -1,    45,    -1,    43,    -1,    44,    -1,    41,
+      -1,    42,    -1,    -1,    68,    -1,    -1,    69,    -1,    50,
       -1,    51,    -1,    52,    -1,    53,    -1,    54,    -1,    55,
-      -1,    56,    -1,    57,    -1,    71,    -1,    72,    -1,    58,
-      -1,    59,    -1,    60,    -1
+      -1,    56,    -1,    57,    -1,    58,    -1,    72,    -1,    73,
+      -1,    59,    -1,    60,    -1,    61,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   188,   188,   189,   193,   195,   197,   199,   204,   209,
-     213,   217,   228,   238,   248,   257,   261,   265,   269,   273,
-     285,   298,   311,   318,   325,   334,   340,   344,   348,   352,
-     356,   360,   364,   368,   372,   376,   380,   384,   391,   395,
-     399,   403,   407,   411,   415,   419,   423,   427,   431,   435,
-     442,   443,   448,   449,   454,   458,   462,   466,   470,   474,
-     478,   482,   486,   493,   497,   504,   508,   512
+       0,   189,   189,   190,   194,   196,   198,   200,   205,   210,
+     214,   218,   229,   239,   249,   258,   262,   266,   270,   274,
+     286,   290,   303,   316,   323,   330,   339,   345,   349,   353,
+     357,   361,   365,   369,   373,   377,   381,   385,   389,   396,
+     400,   404,   408,   412,   416,   420,   424,   428,   432,   436,
+     440,   447,   448,   453,   454,   459,   463,   467,   471,   475,
+     479,   483,   487,   491,   498,   502,   509,   513,   517
 };
 #endif
 
@@ -565,10 +566,10 @@
   "RCV_TIMEOUT", "REMOVE_FAILED_SERVERS", "RETRY_TIMEOUT", "SND_TIMEOUT",
   "SOCKET_RECV_SIZE", "SOCKET_SEND_SIZE", "SORT_HOSTS", "SUPPORT_CAS",
   "USER_DATA", "USE_UDP", "VERIFY_KEY", "_TCP_KEEPALIVE", "_TCP_KEEPIDLE",
-  "_TCP_NODELAY", "NAMESPACE", "POOL_MIN", "POOL_MAX", "MD5", "CRC",
-  "FNV1_64", "FNV1A_64", "FNV1_32", "FNV1A_32", "HSIEH", "MURMUR",
-  "JENKINS", "CONSISTENT", "MODULA", "RANDOM", "TRUE", "FALSE", "','",
-  "'='", "FLOAT", "NUMBER", "PORT", "WEIGHT_START", "IPADDRESS",
+  "_TCP_NODELAY", "FETCH_VERSION", "NAMESPACE", "POOL_MIN", "POOL_MAX",
+  "MD5", "CRC", "FNV1_64", "FNV1A_64", "FNV1_32", "FNV1A_32", "HSIEH",
+  "MURMUR", "JENKINS", "CONSISTENT", "MODULA", "RANDOM", "TRUE", "FALSE",
+  "','", "'='", "FLOAT", "NUMBER", "PORT", "WEIGHT_START", "IPADDRESS",
   "HOSTNAME", "STRING", "QUOTED_STRING", "FILE_PATH", "' '", "$accept",
   "begin", "statement", "expression", "behaviors", "behavior_number",
   "behavior_boolean", "optional_port", "optional_weight", "hash", "string",
@@ -587,21 +588,21 @@
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
      295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
      305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,    44,    61,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,    32
+     315,   316,   317,   318,    44,    61,   319,   320,   321,   322,
+     323,   324,   325,   326,   327,    32
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,    75,    76,    76,    77,    77,    77,    77,    77,    77,
-      77,    77,    78,    78,    78,    78,    78,    78,    78,    79,
-      79,    79,    79,    79,    79,    79,    80,    80,    80,    80,
-      80,    80,    80,    80,    80,    80,    80,    80,    81,    81,
-      81,    81,    81,    81,    81,    81,    81,    81,    81,    81,
-      82,    82,    83,    83,    84,    84,    84,    84,    84,    84,
-      84,    84,    84,    85,    85,    86,    86,    86
+       0,    76,    77,    77,    78,    78,    78,    78,    78,    78,
+      78,    78,    79,    79,    79,    79,    79,    79,    79,    80,
+      80,    80,    80,    80,    80,    80,    80,    81,    81,    81,
+      81,    81,    81,    81,    81,    81,    81,    81,    81,    82,
+      82,    82,    82,    82,    82,    82,    82,    82,    82,    82,
+      82,    83,    83,    84,    84,    85,    85,    85,    85,    85,
+      85,    85,    85,    85,    86,    86,    87,    87,    87
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -609,11 +610,11 @@
 {
        0,     2,     1,     3,     1,     1,     1,     1,     1,     1,
        1,     3,     4,     4,     3,     2,     2,     2,     1,     2,
-       2,     4,     2,     2,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       0,     1,     0,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1
+       1,     2,     4,     2,     2,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     0,     1,     0,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1
 };
 
 /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
@@ -622,44 +623,44 @@
 static const yytype_uint8 yydefact[] =
 {
        0,     5,     7,     8,     9,    10,     0,     0,     6,     0,
-       0,    38,    39,    27,     0,     0,    40,    29,    30,    28,
-      41,    31,    32,    42,    33,    26,    34,    35,    36,    37,
-      43,    44,    25,    48,    49,    46,    47,    45,     0,     0,
-       0,     0,     2,     4,    18,     0,    24,     0,    63,    64,
-      15,    50,    50,    52,    65,    66,    67,    20,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    22,    19,    16,
-      17,     1,     0,    23,    11,    51,    52,    52,    53,    14,
-       0,     3,    13,    12,    21
+       0,    39,    40,    28,     0,     0,    41,    30,    31,    29,
+      42,    32,    33,    43,    34,    27,    35,    36,    37,    38,
+      44,    45,    26,    49,    50,    47,    48,    46,    20,     0,
+       0,     0,     0,     2,     4,    18,     0,    25,     0,    64,
+      65,    15,    51,    51,    53,    66,    67,    68,    21,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    23,    19,
+      16,    17,     1,     0,    24,    11,    52,    53,    53,    54,
+      14,     0,     3,    13,    12,    22
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
-      -1,    41,    42,    43,    44,    45,    46,    76,    79,    67,
-      50,    57
+      -1,    42,    43,    44,    45,    46,    47,    77,    80,    68,
+      51,    58
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -61
+#define YYPACT_NINF -62
 static const yytype_int8 yypact[] =
 {
-      -2,   -61,   -61,   -61,   -61,   -61,   -60,   -24,   -61,   -20,
-     -24,   -61,   -61,   -61,   -47,    13,   -61,   -61,   -61,   -61,
-     -61,   -61,   -61,   -61,   -61,   -61,   -61,   -61,   -61,   -61,
-     -61,   -61,   -61,   -61,   -61,   -61,   -61,   -61,   -24,   -41,
-     -15,     0,   -61,   -61,   -61,   -11,   -61,   -24,   -61,   -61,
-     -61,   -10,   -10,   -12,   -61,   -61,   -61,    -5,   -61,   -61,
-     -61,   -61,   -61,   -61,   -61,   -61,   -61,   -61,   -61,   -61,
-     -61,   -61,    -2,   -61,   -61,   -61,   -12,   -12,   -61,   -61,
-      13,   -61,   -61,   -61,   -61
+      -2,   -62,   -62,   -62,   -62,   -62,   -61,   -24,   -62,   -20,
+     -24,   -62,   -62,   -62,   -48,    13,   -62,   -62,   -62,   -62,
+     -62,   -62,   -62,   -62,   -62,   -62,   -62,   -62,   -62,   -62,
+     -62,   -62,   -62,   -62,   -62,   -62,   -62,   -62,   -62,   -24,
+     -42,   -15,     0,   -62,   -62,   -62,   -11,   -62,   -24,   -62,
+     -62,   -62,   -10,   -10,   -12,   -62,   -62,   -62,    -5,   -62,
+     -62,   -62,   -62,   -62,   -62,   -62,   -62,   -62,   -62,   -62,
+     -62,   -62,   -62,    -2,   -62,   -62,   -62,   -12,   -12,   -62,
+     -62,    13,   -62,   -62,   -62,   -62
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-     -61,   -61,   -13,   -61,   -61,   -61,   -61,     8,   -23,    -9,
-      14,   -61
+     -62,   -62,   -13,   -62,   -62,   -62,   -62,     8,   -23,    -9,
+      14,   -62
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -668,18 +669,18 @@
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
-      71,     1,     2,     3,     4,     5,     6,     7,     8,     9,
-      10,    54,    55,    56,    47,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    53,    69,    20,    21,    22,    23,
+      72,     1,     2,     3,     4,     5,     6,     7,     8,     9,
+      10,    55,    56,    57,    48,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    54,    70,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    48,    49,    51,
-      52,    70,    68,    82,    83,    73,    78,    75,    80,    81,
-      77,    74,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    84,     0,     0,    72
+      34,    35,    36,    37,    38,    39,    40,    41,    49,    50,
+      52,    53,    71,    69,    83,    84,    74,    79,    76,    81,
+      82,    78,    75,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    85,     0,     0,    73
 };
 
 #define yypact_value_is_default(yystate) \
-  ((yystate) == (-61))
+  ((yystate) == (-62))
 
 #define yytable_value_is_error(yytable_value) \
   YYID (0)
@@ -687,13 +688,13 @@
 static const yytype_int8 yycheck[] =
 {
        0,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    58,    59,    60,    74,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    10,    66,    28,    29,    30,    31,
+      12,    59,    60,    61,    75,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    10,    67,    28,    29,    30,    31,
       32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,    47,    48,    71,    72,    69,
-      70,    66,    38,    76,    77,    66,    68,    67,    63,    72,
-      52,    47,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    80,    -1,    -1,    74
+      42,    43,    44,    45,    46,    47,    48,    49,    72,    73,
+      70,    71,    67,    39,    77,    78,    67,    69,    68,    64,
+      73,    53,    48,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    81,    -1,    -1,    75
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -704,11 +705,11 @@
       12,    17,    18,    19,    20,    21,    22,    23,    24,    25,
       28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
       38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    76,    77,    78,    79,    80,    81,    74,    71,    72,
-      85,    69,    70,    85,    58,    59,    60,    86,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    84,    85,    66,
-      66,     0,    74,    66,    85,    67,    82,    82,    68,    83,
-      63,    77,    83,    83,    84
+      48,    49,    77,    78,    79,    80,    81,    82,    75,    72,
+      73,    86,    70,    71,    86,    59,    60,    61,    87,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    85,    86,
+      67,    67,     0,    75,    67,    86,    68,    83,    83,    69,
+      84,    64,    78,    84,    84,    85
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1557,28 +1558,28 @@
         case 4:
 
 /* Line 1806 of yacc.c  */
-#line 194 "libmemcached/csl/parser.yy"
+#line 195 "libmemcached/csl/parser.yy"
     { }
     break;
 
   case 5:
 
 /* Line 1806 of yacc.c  */
-#line 196 "libmemcached/csl/parser.yy"
+#line 197 "libmemcached/csl/parser.yy"
     { }
     break;
 
   case 6:
 
 /* Line 1806 of yacc.c  */
-#line 198 "libmemcached/csl/parser.yy"
+#line 199 "libmemcached/csl/parser.yy"
     { }
     break;
 
   case 7:
 
 /* Line 1806 of yacc.c  */
-#line 200 "libmemcached/csl/parser.yy"
+#line 201 "libmemcached/csl/parser.yy"
     {
             context->set_end();
             YYACCEPT;
@@ -1588,7 +1589,7 @@
   case 8:
 
 /* Line 1806 of yacc.c  */
-#line 205 "libmemcached/csl/parser.yy"
+#line 206 "libmemcached/csl/parser.yy"
     {
             context->rc= MEMCACHED_PARSE_USER_ERROR;
             parser_abort(context, "ERROR called directly");
@@ -1598,7 +1599,7 @@
   case 9:
 
 /* Line 1806 of yacc.c  */
-#line 210 "libmemcached/csl/parser.yy"
+#line 211 "libmemcached/csl/parser.yy"
     {
             memcached_reset(context->memc);
           }
@@ -1607,7 +1608,7 @@
   case 10:
 
 /* Line 1806 of yacc.c  */
-#line 214 "libmemcached/csl/parser.yy"
+#line 215 "libmemcached/csl/parser.yy"
     {
             yydebug= 1;
           }
@@ -1616,7 +1617,7 @@
   case 11:
 
 /* Line 1806 of yacc.c  */
-#line 218 "libmemcached/csl/parser.yy"
+#line 219 "libmemcached/csl/parser.yy"
     {
             if ((context->rc= memcached_parse_configure_file(*context->memc, (yyvsp[(3) - (3)].string).c_str, (yyvsp[(3) - (3)].string).size)) != MEMCACHED_SUCCESS)
             {
@@ -1628,7 +1629,7 @@
   case 12:
 
 /* Line 1806 of yacc.c  */
-#line 229 "libmemcached/csl/parser.yy"
+#line 230 "libmemcached/csl/parser.yy"
     {
             if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, (yyvsp[(2) - (4)].server).c_str, (yyvsp[(3) - (4)].number), (yyvsp[(4) - (4)].number))))
             {
@@ -1643,7 +1644,7 @@
   case 13:
 
 /* Line 1806 of yacc.c  */
-#line 239 "libmemcached/csl/parser.yy"
+#line 240 "libmemcached/csl/parser.yy"
     {
             if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, (yyvsp[(2) - (4)].server).c_str, (yyvsp[(3) - (4)].number), (yyvsp[(4) - (4)].number))))
             {
@@ -1658,7 +1659,7 @@
   case 14:
 
 /* Line 1806 of yacc.c  */
-#line 249 "libmemcached/csl/parser.yy"
+#line 250 "libmemcached/csl/parser.yy"
     {
             if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, (yyvsp[(2) - (3)].string).c_str, (yyvsp[(3) - (3)].number))))
             {
@@ -1672,7 +1673,7 @@
   case 15:
 
 /* Line 1806 of yacc.c  */
-#line 258 "libmemcached/csl/parser.yy"
+#line 259 "libmemcached/csl/parser.yy"
     {
             memcached_set_configuration_file(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).size);
           }
@@ -1681,7 +1682,7 @@
   case 16:
 
 /* Line 1806 of yacc.c  */
-#line 262 "libmemcached/csl/parser.yy"
+#line 263 "libmemcached/csl/parser.yy"
     {
             context->memc->configure.initial_pool_size= (yyvsp[(2) - (2)].number);
           }
@@ -1690,7 +1691,7 @@
   case 17:
 
 /* Line 1806 of yacc.c  */
-#line 266 "libmemcached/csl/parser.yy"
+#line 267 "libmemcached/csl/parser.yy"
     {
             context->memc->configure.max_pool_size= (yyvsp[(2) - (2)].number);
           }
@@ -1699,7 +1700,7 @@
   case 19:
 
 /* Line 1806 of yacc.c  */
-#line 274 "libmemcached/csl/parser.yy"
+#line 275 "libmemcached/csl/parser.yy"
     {
             if (memcached_callback_get(context->memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL))
             {
@@ -1716,7 +1717,16 @@
   case 20:
 
 /* Line 1806 of yacc.c  */
-#line 286 "libmemcached/csl/parser.yy"
+#line 287 "libmemcached/csl/parser.yy"
+    {
+            memcached_flag(*context->memc, MEMCACHED_FLAG_IS_FETCHING_VERSION, true);
+          }
+    break;
+
+  case 21:
+
+/* Line 1806 of yacc.c  */
+#line 291 "libmemcached/csl/parser.yy"
     {
             // Check to see if DISTRIBUTION has already been set
             if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (2)].distribution))) != MEMCACHED_SUCCESS)
@@ -1731,10 +1741,10 @@
           }
     break;
 
-  case 21:
+  case 22:
 
 /* Line 1806 of yacc.c  */
-#line 299 "libmemcached/csl/parser.yy"
+#line 304 "libmemcached/csl/parser.yy"
     {
             // Check to see if DISTRIBUTION has already been set
             if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (4)].distribution))) != MEMCACHED_SUCCESS)
@@ -1749,10 +1759,10 @@
           }
     break;
 
-  case 22:
+  case 23:
 
 /* Line 1806 of yacc.c  */
-#line 312 "libmemcached/csl/parser.yy"
+#line 317 "libmemcached/csl/parser.yy"
     {
             if (context->set_hash((yyvsp[(2) - (2)].hash)) == false)
             {
@@ -1761,10 +1771,10 @@
           }
     break;
 
-  case 23:
+  case 24:
 
 /* Line 1806 of yacc.c  */
-#line 319 "libmemcached/csl/parser.yy"
+#line 324 "libmemcached/csl/parser.yy"
     {
             if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (2)].behavior), (yyvsp[(2) - (2)].number))) != MEMCACHED_SUCCESS)
             {
@@ -1773,10 +1783,10 @@
           }
     break;
 
-  case 24:
+  case 25:
 
 /* Line 1806 of yacc.c  */
-#line 326 "libmemcached/csl/parser.yy"
+#line 331 "libmemcached/csl/parser.yy"
     {
             if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (1)].behavior), true)) != MEMCACHED_SUCCESS)
             {
@@ -1787,352 +1797,343 @@
           }
     break;
 
-  case 25:
-
-/* Line 1806 of yacc.c  */
-#line 335 "libmemcached/csl/parser.yy"
-    {
-          }
-    break;
-
   case 26:
 
 /* Line 1806 of yacc.c  */
-#line 341 "libmemcached/csl/parser.yy"
+#line 340 "libmemcached/csl/parser.yy"
+    {
+          }
+    break;
+
+  case 27:
+
+/* Line 1806 of yacc.c  */
+#line 346 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS;
           }
     break;
 
-  case 27:
+  case 28:
 
 /* Line 1806 of yacc.c  */
-#line 345 "libmemcached/csl/parser.yy"
+#line 350 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT;
           }
     break;
 
-  case 28:
+  case 29:
 
 /* Line 1806 of yacc.c  */
-#line 349 "libmemcached/csl/parser.yy"
+#line 354 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK;
           }
     break;
 
-  case 29:
+  case 30:
 
 /* Line 1806 of yacc.c  */
-#line 353 "libmemcached/csl/parser.yy"
+#line 358 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK;
           }
     break;
 
-  case 30:
+  case 31:
 
 /* Line 1806 of yacc.c  */
-#line 357 "libmemcached/csl/parser.yy"
+#line 362 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH;
           }
     break;
 
-  case 31:
+  case 32:
 
 /* Line 1806 of yacc.c  */
-#line 361 "libmemcached/csl/parser.yy"
+#line 366 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS;
           }
     break;
 
-  case 32:
+  case 33:
 
 /* Line 1806 of yacc.c  */
-#line 365 "libmemcached/csl/parser.yy"
+#line 370 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_POLL_TIMEOUT;
           }
     break;
 
-  case 33:
+  case 34:
 
 /* Line 1806 of yacc.c  */
-#line 369 "libmemcached/csl/parser.yy"
+#line 374 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_RCV_TIMEOUT;
           }
     break;
 
-  case 34:
+  case 35:
 
 /* Line 1806 of yacc.c  */
-#line 373 "libmemcached/csl/parser.yy"
+#line 378 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT;
           }
     break;
 
-  case 35:
+  case 36:
 
 /* Line 1806 of yacc.c  */
-#line 377 "libmemcached/csl/parser.yy"
+#line 382 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_SND_TIMEOUT;
           }
     break;
 
-  case 36:
+  case 37:
 
 /* Line 1806 of yacc.c  */
-#line 381 "libmemcached/csl/parser.yy"
+#line 386 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE;
           }
     break;
 
-  case 37:
+  case 38:
 
 /* Line 1806 of yacc.c  */
-#line 385 "libmemcached/csl/parser.yy"
+#line 390 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE;
           }
     break;
 
-  case 38:
+  case 39:
 
 /* Line 1806 of yacc.c  */
-#line 392 "libmemcached/csl/parser.yy"
+#line 397 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL;
           }
     break;
 
-  case 39:
+  case 40:
 
 /* Line 1806 of yacc.c  */
-#line 396 "libmemcached/csl/parser.yy"
+#line 401 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
           }
     break;
 
-  case 40:
+  case 41:
 
 /* Line 1806 of yacc.c  */
-#line 400 "libmemcached/csl/parser.yy"
+#line 405 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
           }
     break;
 
-  case 41:
+  case 42:
 
 /* Line 1806 of yacc.c  */
-#line 404 "libmemcached/csl/parser.yy"
+#line 409 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_NOREPLY;
           }
     break;
 
-  case 42:
+  case 43:
 
 /* Line 1806 of yacc.c  */
-#line 408 "libmemcached/csl/parser.yy"
+#line 413 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ;
           }
     break;
 
-  case 43:
+  case 44:
 
 /* Line 1806 of yacc.c  */
-#line 412 "libmemcached/csl/parser.yy"
+#line 417 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_SORT_HOSTS;
           }
     break;
 
-  case 44:
+  case 45:
 
 /* Line 1806 of yacc.c  */
-#line 416 "libmemcached/csl/parser.yy"
+#line 421 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_SUPPORT_CAS;
           }
     break;
 
-  case 45:
+  case 46:
 
 /* Line 1806 of yacc.c  */
-#line 420 "libmemcached/csl/parser.yy"
+#line 425 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_NODELAY;
           }
     break;
 
-  case 46:
+  case 47:
 
 /* Line 1806 of yacc.c  */
-#line 424 "libmemcached/csl/parser.yy"
+#line 429 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPALIVE;
           }
     break;
 
-  case 47:
+  case 48:
 
 /* Line 1806 of yacc.c  */
-#line 428 "libmemcached/csl/parser.yy"
+#line 433 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPIDLE;
           }
     break;
 
-  case 48:
+  case 49:
 
 /* Line 1806 of yacc.c  */
-#line 432 "libmemcached/csl/parser.yy"
+#line 437 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_USE_UDP;
           }
     break;
 
-  case 49:
+  case 50:
 
 /* Line 1806 of yacc.c  */
-#line 436 "libmemcached/csl/parser.yy"
+#line 441 "libmemcached/csl/parser.yy"
     {
             (yyval.behavior)= MEMCACHED_BEHAVIOR_VERIFY_KEY;
           }
     break;
 
-  case 50:
+  case 51:
 
 /* Line 1806 of yacc.c  */
-#line 442 "libmemcached/csl/parser.yy"
+#line 447 "libmemcached/csl/parser.yy"
     { (yyval.number)= MEMCACHED_DEFAULT_PORT;}
     break;
 
-  case 51:
-
-/* Line 1806 of yacc.c  */
-#line 444 "libmemcached/csl/parser.yy"
-    { }
-    break;
-
   case 52:
 
 /* Line 1806 of yacc.c  */
-#line 448 "libmemcached/csl/parser.yy"
+#line 449 "libmemcached/csl/parser.yy"
+    { }
+    break;
+
+  case 53:
+
+/* Line 1806 of yacc.c  */
+#line 453 "libmemcached/csl/parser.yy"
     { (yyval.number)= 1; }
     break;
 
-  case 53:
-
-/* Line 1806 of yacc.c  */
-#line 450 "libmemcached/csl/parser.yy"
-    { }
-    break;
-
   case 54:
 
 /* Line 1806 of yacc.c  */
 #line 455 "libmemcached/csl/parser.yy"
+    { }
+    break;
+
+  case 55:
+
+/* Line 1806 of yacc.c  */
+#line 460 "libmemcached/csl/parser.yy"
     {
             (yyval.hash)= MEMCACHED_HASH_MD5;
           }
     break;
 
-  case 55:
+  case 56:
 
 /* Line 1806 of yacc.c  */
-#line 459 "libmemcached/csl/parser.yy"
+#line 464 "libmemcached/csl/parser.yy"
     {
             (yyval.hash)= MEMCACHED_HASH_CRC;
           }
     break;
 
-  case 56:
+  case 57:
 
 /* Line 1806 of yacc.c  */
-#line 463 "libmemcached/csl/parser.yy"
+#line 468 "libmemcached/csl/parser.yy"
     {
             (yyval.hash)= MEMCACHED_HASH_FNV1_64;
           }
     break;
 
-  case 57:
+  case 58:
 
 /* Line 1806 of yacc.c  */
-#line 467 "libmemcached/csl/parser.yy"
+#line 472 "libmemcached/csl/parser.yy"
     {
             (yyval.hash)= MEMCACHED_HASH_FNV1A_64;
           }
     break;
 
-  case 58:
+  case 59:
 
 /* Line 1806 of yacc.c  */
-#line 471 "libmemcached/csl/parser.yy"
+#line 476 "libmemcached/csl/parser.yy"
     {
             (yyval.hash)= MEMCACHED_HASH_FNV1_32;
           }
     break;
 
-  case 59:
+  case 60:
 
 /* Line 1806 of yacc.c  */
-#line 475 "libmemcached/csl/parser.yy"
+#line 480 "libmemcached/csl/parser.yy"
     {
             (yyval.hash)= MEMCACHED_HASH_FNV1A_32;
           }
     break;
 
-  case 60:
+  case 61:
 
 /* Line 1806 of yacc.c  */
-#line 479 "libmemcached/csl/parser.yy"
+#line 484 "libmemcached/csl/parser.yy"
     {
             (yyval.hash)= MEMCACHED_HASH_HSIEH;