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

Proposed by Jonathon Goldsmith
Status: Merged
Merge reported by: Brian Aker
Merged at revision: not available
Proposed branch: lp:~tangent-org/libmemcached/trunk
Merge into: lp:~jonathon-goldsmith/libmemcached/fix_sasl_configure
Diff against target: 20191 lines (+6714/-3550)
383 files modified
.bzrignore (+9/-8)
ChangeLog (+10/-0)
Makefile.am (+11/-33)
bootstrap.sh (+7/-2)
clients/memaslap.c (+2/-2)
clients/memcp.cc (+3/-0)
clients/memstat.cc (+4/-4)
clients/ms_conn.c (+1/-1)
clients/ms_setting.c (+2/-2)
clients/ms_setting.h (+1/-1)
clients/ms_stats.c (+4/-8)
config/autorun.sh (+2/-2)
configure.ac (+11/-16)
docs/conf.py.in (+4/-4)
docs/include.am (+117/-114)
docs/libmemcached_configuration.rst (+5/-5)
docs/man/hashkit_clone.3 (+1/-1)
docs/man/hashkit_crc32.3 (+1/-1)
docs/man/hashkit_create.3 (+1/-1)
docs/man/hashkit_fnv1_32.3 (+1/-1)
docs/man/hashkit_fnv1_64.3 (+1/-1)
docs/man/hashkit_fnv1a_32.3 (+1/-1)
docs/man/hashkit_fnv1a_64.3 (+1/-1)
docs/man/hashkit_free.3 (+1/-1)
docs/man/hashkit_functions.3 (+1/-1)
docs/man/hashkit_hsieh.3 (+1/-1)
docs/man/hashkit_is_allocated.3 (+1/-1)
docs/man/hashkit_jenkins.3 (+1/-1)
docs/man/hashkit_md5.3 (+1/-1)
docs/man/hashkit_murmur.3 (+1/-1)
docs/man/hashkit_value.3 (+1/-1)
docs/man/libhashkit.3 (+1/-1)
docs/man/libmemcached.3 (+1/-1)
docs/man/libmemcached_check_configuration.3 (+6/-6)
docs/man/libmemcached_configuration.3 (+6/-6)
docs/man/libmemcached_examples.3 (+1/-1)
docs/man/libmemcachedutil.3 (+1/-1)
docs/man/memaslap.1 (+1/-1)
docs/man/memcached.3 (+6/-6)
docs/man/memcached_add.3 (+1/-1)
docs/man/memcached_add_by_key.3 (+1/-1)
docs/man/memcached_analyze.3 (+1/-1)
docs/man/memcached_append.3 (+1/-1)
docs/man/memcached_append_by_key.3 (+1/-1)
docs/man/memcached_auto.3 (+1/-1)
docs/man/memcached_behavior.3 (+2/-2)
docs/man/memcached_behavior_get.3 (+2/-2)
docs/man/memcached_behavior_set.3 (+2/-2)
docs/man/memcached_callback.3 (+1/-1)
docs/man/memcached_callback_get.3 (+1/-1)
docs/man/memcached_callback_set.3 (+1/-1)
docs/man/memcached_cas.3 (+1/-1)
docs/man/memcached_cas_by_key.3 (+1/-1)
docs/man/memcached_clone.3 (+1/-1)
docs/man/memcached_create.3 (+1/-1)
docs/man/memcached_decrement.3 (+1/-1)
docs/man/memcached_decrement_with_initial.3 (+1/-1)
docs/man/memcached_delete.3 (+1/-1)
docs/man/memcached_delete_by_key.3 (+1/-1)
docs/man/memcached_destroy_sasl_auth_data.3 (+1/-1)
docs/man/memcached_dump.3 (+1/-1)
docs/man/memcached_exist.3 (+1/-1)
docs/man/memcached_exist_by_key.3 (+1/-1)
docs/man/memcached_fetch.3 (+1/-1)
docs/man/memcached_fetch_execute.3 (+1/-1)
docs/man/memcached_fetch_result.3 (+1/-1)
docs/man/memcached_flush.3 (+1/-1)
docs/man/memcached_flush_buffers.3 (+1/-1)
docs/man/memcached_free.3 (+1/-1)
docs/man/memcached_generate_hash.3 (+1/-1)
docs/man/memcached_generate_hash_value.3 (+1/-1)
docs/man/memcached_get.3 (+1/-1)
docs/man/memcached_get_by_key.3 (+1/-1)
docs/man/memcached_get_memory_allocators.3 (+1/-1)
docs/man/memcached_get_sasl_callbacks.3 (+1/-1)
docs/man/memcached_get_user_data.3 (+1/-1)
docs/man/memcached_increment.3 (+1/-1)
docs/man/memcached_increment_with_initial.3 (+1/-1)
docs/man/memcached_last_error_message.3 (+1/-1)
docs/man/memcached_lib_version.3 (+1/-1)
docs/man/memcached_memory_allocators.3 (+1/-1)
docs/man/memcached_mget.3 (+1/-1)
docs/man/memcached_mget_by_key.3 (+1/-1)
docs/man/memcached_mget_execute.3 (+1/-1)
docs/man/memcached_mget_execute_by_key.3 (+1/-1)
docs/man/memcached_pool.3 (+1/-1)
docs/man/memcached_pool_behavior_get.3 (+1/-1)
docs/man/memcached_pool_behavior_set.3 (+1/-1)
docs/man/memcached_pool_create.3 (+1/-1)
docs/man/memcached_pool_destroy.3 (+1/-1)
docs/man/memcached_pool_fetch.3 (+1/-1)
docs/man/memcached_pool_pop.3 (+1/-1)
docs/man/memcached_pool_push.3 (+1/-1)
docs/man/memcached_pool_release.3 (+1/-1)
docs/man/memcached_pool_st.3 (+1/-1)
docs/man/memcached_prepend.3 (+1/-1)
docs/man/memcached_prepend_by_key.3 (+1/-1)
docs/man/memcached_quit.3 (+1/-1)
docs/man/memcached_replace.3 (+1/-1)
docs/man/memcached_replace_by_key.3 (+1/-1)
docs/man/memcached_result_cas.3 (+1/-1)
docs/man/memcached_result_create.3 (+1/-1)
docs/man/memcached_result_flags.3 (+1/-1)
docs/man/memcached_result_free.3 (+1/-1)
docs/man/memcached_result_key_length.3 (+1/-1)
docs/man/memcached_result_key_value.3 (+1/-1)
docs/man/memcached_result_length.3 (+1/-1)
docs/man/memcached_result_st.3 (+1/-1)
docs/man/memcached_result_value.3 (+1/-1)
docs/man/memcached_return_t.3 (+1/-1)
docs/man/memcached_sasl.3 (+1/-1)
docs/man/memcached_sasl_set_auth_data.3 (+1/-1)
docs/man/memcached_server_add.3 (+1/-1)
docs/man/memcached_server_add_unix_socket.3 (+1/-1)
docs/man/memcached_server_count.3 (+1/-1)
docs/man/memcached_server_cursor.3 (+1/-1)
docs/man/memcached_server_list.3 (+1/-1)
docs/man/memcached_server_list_append.3 (+1/-1)
docs/man/memcached_server_list_count.3 (+1/-1)
docs/man/memcached_server_list_free.3 (+1/-1)
docs/man/memcached_server_push.3 (+1/-1)
docs/man/memcached_server_st.3 (+1/-1)
docs/man/memcached_servers.3 (+1/-1)
docs/man/memcached_servers_parse.3 (+1/-1)
docs/man/memcached_servers_reset.3 (+1/-1)
docs/man/memcached_set.3 (+1/-1)
docs/man/memcached_set_by_key.3 (+1/-1)
docs/man/memcached_set_encoding_key.3 (+1/-1)
docs/man/memcached_set_memory_allocators.3 (+1/-1)
docs/man/memcached_set_memory_allocators_context.3 (+1/-1)
docs/man/memcached_set_sasl_callbacks.3 (+1/-1)
docs/man/memcached_set_user_data.3 (+1/-1)
docs/man/memcached_stat.3 (+1/-1)
docs/man/memcached_stat_execute.3 (+1/-1)
docs/man/memcached_stat_get_keys.3 (+1/-1)
docs/man/memcached_stat_get_value.3 (+1/-1)
docs/man/memcached_stat_servername.3 (+1/-1)
docs/man/memcached_stats.3 (+1/-1)
docs/man/memcached_strerror.3 (+1/-1)
docs/man/memcached_touch.3 (+1/-1)
docs/man/memcached_touch_by_key.3 (+1/-1)
docs/man/memcached_user_data.3 (+1/-1)
docs/man/memcached_verbosity.3 (+1/-1)
docs/man/memcached_version.3 (+1/-1)
docs/man/memcapable.1 (+1/-1)
docs/man/memcat.1 (+1/-1)
docs/man/memcp.1 (+1/-1)
docs/man/memdump.1 (+1/-1)
docs/man/memerror.1 (+1/-1)
docs/man/memexist.1 (+1/-1)
docs/man/memflush.1 (+1/-1)
docs/man/memparse.1 (+1/-1)
docs/man/memping.1 (+1/-1)
docs/man/memrm.1 (+1/-1)
docs/man/memslap.1 (+1/-1)
docs/man/memstat.1 (+1/-1)
docs/man/memtouch.1 (+1/-1)
docs/memcached_behavior.rst (+1/-3)
example/include.am (+17/-17)
example/memcached_light.cc (+2/-1)
example/t/include.am (+6/-3)
example/t/memcached_light.cc (+8/-1)
libhashkit-1.0/include.am (+2/-2)
libmemcached-1.0/error.h (+11/-11)
libmemcached-1.0/exist.h (+7/-0)
libmemcached-1.0/include.am (+2/-2)
libmemcached-1.0/memcached.hpp (+72/-55)
libmemcached-1.0/server.h (+12/-0)
libmemcached-1.0/strerror.h (+2/-2)
libmemcached-1.0/struct/memcached.h (+12/-4)
libmemcached-1.0/struct/server.h (+4/-10)
libmemcached-1.0/types.h (+6/-3)
libmemcached-1.2/include.am (+2/-2)
libmemcached-2.0/include.am (+5/-5)
libmemcached/allocators.cc (+2/-2)
libmemcached/array.c (+31/-31)
libmemcached/auto.cc (+8/-7)
libmemcached/behavior.cc (+64/-20)
libmemcached/behavior.hpp (+1/-0)
libmemcached/common.h (+25/-16)
libmemcached/connect.cc (+65/-26)
libmemcached/connect.hpp (+2/-2)
libmemcached/csl/context.h (+3/-0)
libmemcached/csl/parser.cc (+260/-250)
libmemcached/csl/parser.h (+27/-26)
libmemcached/csl/parser.yy (+5/-0)
libmemcached/csl/scanner.cc (+682/-654)
libmemcached/csl/scanner.h (+21/-10)
libmemcached/csl/scanner.l (+3/-0)
libmemcached/delete.cc (+6/-5)
libmemcached/do.cc (+2/-2)
libmemcached/do.hpp (+1/-1)
libmemcached/dump.cc (+3/-3)
libmemcached/error.cc (+80/-56)
libmemcached/error.hpp (+30/-44)
libmemcached/exist.cc (+5/-4)
libmemcached/fetch.cc (+1/-1)
libmemcached/flag.cc (+156/-0)
libmemcached/flag.hpp (+59/-0)
libmemcached/flush.cc (+6/-6)
libmemcached/flush_buffers.cc (+1/-2)
libmemcached/get.cc (+28/-30)
libmemcached/hosts.cc (+93/-60)
libmemcached/include.am (+56/-51)
libmemcached/instance.cc (+378/-0)
libmemcached/instance.h (+137/-0)
libmemcached/instance.hpp (+58/-0)
libmemcached/io.cc (+172/-126)
libmemcached/io.hpp (+16/-14)
libmemcached/is.h (+34/-4)
libmemcached/memcached.cc (+33/-9)
libmemcached/purge.cc (+1/-1)
libmemcached/quit.cc (+6/-5)
libmemcached/quit.hpp (+1/-1)
libmemcached/response.cc (+7/-7)
libmemcached/response.h (+3/-3)
libmemcached/sasl.cc (+8/-6)
libmemcached/sasl.hpp (+1/-1)
libmemcached/server.cc (+44/-158)
libmemcached/server.hpp (+7/-34)
libmemcached/server_instance.h (+3/-7)
libmemcached/server_list.cc (+32/-13)
libmemcached/server_list.hpp (+5/-2)
libmemcached/stats.cc (+9/-7)
libmemcached/storage.cc (+10/-9)
libmemcached/strerror.cc (+1/-1)
libmemcached/touch.cc (+7/-5)
libmemcached/udp.cc (+2/-2)
libmemcached/udp.hpp (+2/-2)
libmemcached/verbosity.cc (+3/-3)
libmemcached/version.cc (+86/-22)
libmemcached/version.hpp (+44/-0)
libmemcachedutil-1.0/ostream.hpp (+7/-0)
libmemcachedutil/pid.cc (+3/-3)
libmemcachedutil/ping.cc (+6/-4)
libmemcachedutil/version.cc (+5/-5)
libtest/binaries.cc (+0/-58)
libtest/binaries.h (+0/-13)
libtest/cmdline.cc (+114/-101)
libtest/cmdline.h (+23/-20)
libtest/collection.cc (+23/-14)
libtest/collection.h (+14/-5)
libtest/common.h (+2/-0)
libtest/comparison.hpp (+23/-34)
libtest/core.cc (+5/-2)
libtest/cpu.cc (+1/-1)
libtest/dns.cc (+97/-0)
libtest/dns.hpp (+44/-0)
libtest/drizzled.cc (+2/-1)
libtest/failed.cc (+2/-2)
libtest/fatal.cc (+39/-20)
libtest/fatal.hpp (+83/-45)
libtest/formatter.cc (+191/-0)
libtest/formatter.hpp (+85/-0)
libtest/framework.cc (+30/-16)
libtest/framework.h (+21/-9)
libtest/gearmand.cc (+17/-8)
libtest/gearmand.h (+2/-0)
libtest/get.h (+1/-1)
libtest/has.cc (+110/-8)
libtest/has.hpp (+27/-5)
libtest/http.cc (+5/-1)
libtest/http.hpp (+2/-0)
libtest/include.am (+53/-44)
libtest/is_local.cc (+11/-0)
libtest/is_local.hpp (+6/-0)
libtest/m4/ax_lib_mysql.m4 (+147/-0)
libtest/m4/ax_prog_memcached.m4 (+59/-0)
libtest/m4/ax_prog_mysqld.m4 (+58/-0)
libtest/m4/memcached.m4 (+1/-0)
libtest/m4/mysql.m4 (+23/-0)
libtest/main.cc (+68/-10)
libtest/memcached.cc (+5/-13)
libtest/memcached.hpp (+70/-0)
libtest/poll_error.hpp (+100/-0)
libtest/port.cc (+18/-8)
libtest/port.h (+2/-0)
libtest/run-ci.gdb (+6/-0)
libtest/runner.cc (+2/-1)
libtest/server.cc (+36/-21)
libtest/server.h (+29/-2)
libtest/server_container.cc (+62/-23)
libtest/server_container.h (+3/-1)
libtest/skiptest.cc (+1/-1)
libtest/test.h (+12/-62)
libtest/timer.cc (+14/-2)
libtest/timer.hpp (+26/-2)
libtest/unittest.cc (+145/-67)
libtest/vchar.cc (+1/-0)
libtest/version.h.in (+8/-6)
libtest/yatl.m4 (+10/-0)
m4/README.md (+4/-0)
m4/ax_append_compile_flags.m4 (+65/-0)
m4/ax_append_flag.m4 (+69/-0)
m4/ax_append_link_flags.m4 (+63/-0)
m4/ax_check_compile_flag.m4 (+72/-0)
m4/ax_check_link_flag.m4 (+71/-0)
m4/ax_harden_compiler_flags.m4 (+72/-0)
m4/ax_pthread.m4 (+12/-8)
m4/bottom.m4 (+6/-0)
m4/check_sock_cloexec.m4 (+18/-0)
m4/include.am (+7/-0)
m4/pandora_header_assert.m4 (+4/-4)
m4/pandora_warnings.m4 (+1/-1)
memcached/README (+0/-28)
memcached/README.md (+38/-0)
memcached/assoc.c (+2/-10)
memcached/autogen.sh (+1/-1)
memcached/cache.c (+2/-1)
memcached/daemon.c (+4/-2)
memcached/devtools/clean-whitespace.pl (+1/-1)
memcached/doc/protocol.txt (+13/-3)
memcached/hash.c (+2/-8)
memcached/items.c (+19/-13)
memcached/memcached.c (+36/-87)
memcached/memcached.h (+2/-10)
memcached/memcached.spec.in (+1/-1)
memcached/memcached_dtrace.d (+11/-0)
memcached/slabs.c (+106/-80)
memcached/slabs.h (+1/-4)
memcached/t/binary.t (+5/-1)
memcached/t/slabs_reassign.t (+7/-5)
memcached/t/whitespace.t (+3/-2)
memcached/testapp.c (+7/-3)
memcached/thread.c (+7/-13)
memcached/util.c (+3/-1)
memcached/version.m4 (+0/-1)
rpm.am (+36/-0)
support/libmemcached.spec.in (+45/-9)
tests/cycle.cc (+8/-2)
tests/failure.cc (+20/-5)
tests/hash_plus.cc (+3/-3)
tests/hashkit_functions.cc (+1/-1)
tests/include.am (+0/-12)
tests/keys.hpp (+1/-1)
tests/libmemcached-1.0/all_tests.cc (+6/-2)
tests/libmemcached-1.0/all_tests.h (+5/-2)
tests/libmemcached-1.0/all_tests_socket.cc (+1/-1)
tests/libmemcached-1.0/atomsmasher.cc (+1/-1)
tests/libmemcached-1.0/debug.cc (+5/-3)
tests/libmemcached-1.0/dump.cc (+9/-12)
tests/libmemcached-1.0/encoding_key.cc (+20/-25)
tests/libmemcached-1.0/exist.cc (+8/-8)
tests/libmemcached-1.0/generate.cc (+21/-9)
tests/libmemcached-1.0/haldenbrand.cc (+2/-2)
tests/libmemcached-1.0/include.am (+12/-0)
tests/libmemcached-1.0/internals.cc (+1/-1)
tests/libmemcached-1.0/ketama.cc (+6/-5)
tests/libmemcached-1.0/mem_functions.cc (+220/-155)
tests/libmemcached-1.0/mem_functions.h (+18/-15)
tests/libmemcached-1.0/memcached_get.cc (+16/-19)
tests/libmemcached-1.0/parser.cc (+6/-2)
tests/libmemcached-1.0/plus.cpp (+39/-1)
tests/libmemcached-1.0/pool.cc (+8/-5)
tests/libmemcached-1.0/print.cc (+5/-5)
tests/libmemcached-1.0/replication.cc (+16/-11)
tests/libmemcached-1.0/sasl.cc (+1/-1)
tests/libmemcached-1.0/setup_and_teardowns.cc (+9/-15)
tests/libmemcached-1.0/stat.cc (+9/-12)
tests/libmemcached-1.0/touch.cc (+1/-1)
tests/libmemcached-1.0/virtual_buckets.cc (+1/-1)
tests/libmemcached_world.h (+9/-1)
tests/libmemcached_world_socket.h (+5/-1)
tests/mem_udp.cc (+3/-1)
tests/memcapable.cc (+3/-3)
tests/memcat.cc (+2/-2)
tests/memcp.cc (+2/-2)
tests/memdump.cc (+2/-2)
tests/memerror.cc (+8/-2)
tests/memexist.cc (+3/-3)
tests/memflush.cc (+3/-3)
tests/memrm.cc (+2/-2)
tests/memslap.cc (+2/-2)
tests/memstat.cc (+3/-3)
tests/memtouch.cc (+3/-4)
tests/parser.cc (+1/-1)
tests/print.h (+2/-2)
tests/runner.h (+3/-4)
util/instance.cc (+0/-2)
util/logfile.cc (+1/-0)
util/pidfile.cc (+6/-1)
util/signal.cc (+20/-1)
util/signal.hpp (+17/-1)
To merge this branch: bzr merge lp:~tangent-org/libmemcached/trunk
Reviewer Review Type Date Requested Status
Brian Aker (community) Approve
Review via email: mp+108000@code.launchpad.net

Description of the change

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).

To post a comment you must log in.
lp:~tangent-org/libmemcached/trunk updated
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.

Revision history for this message
Brian Aker (brianaker) wrote :

This was merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-05-05 22:11:48 +0000
3+++ .bzrignore 2012-08-14 00:00:29 +0000
4@@ -21,6 +21,7 @@
5 */Makefile
6 */Makefile.in
7 *TAGS
8+*patch
9 .deps
10 .hg/
11 .hgignore
12@@ -73,6 +74,7 @@
13 docs/linkcheck/
14 docs/text
15 example/memcached_light
16+example/t/memcached_light
17 libhashkit-1.0/configure.h
18 libmemcached-1.0/configure.h
19 libmemcached-1.0/t/c_sasl_test
20@@ -87,6 +89,7 @@
21 libmemcached/memcached_configure.h
22 libtest/.hg/
23 libtest/.hgignore
24+libtest/abort
25 libtest/skiptest
26 libtest/unittest
27 libtest/version.h
28@@ -98,6 +101,10 @@
29 m4/ltsugar.m4
30 m4/ltversion.m4
31 m4/lt~obsolete.m4
32+memcached/.git
33+memcached/.gitignore
34+memcached/memcached
35+memcached/memcached.spec
36 out
37 patch
38 patch2
39@@ -119,6 +126,7 @@
40 tests/libmemcached-1.0/internals
41 tests/libmemcached-1.0/sasl
42 tests/libmemcached-1.0/testapp
43+tests/libmemcached-1.0/testsocket
44 tests/memcapable
45 tests/memcat
46 tests/memcp
47@@ -132,6 +140,7 @@
48 tests/memstat
49 tests/memtouch
50 tests/output.cmp
51+tests/parser
52 tests/sasl
53 tests/startservers
54 tests/testapp
55@@ -141,11 +150,3 @@
56 tests/var/
57 tmp_chroot
58 unittests/unittests
59-tests/libmemcached-1.0/testsocket
60-example/t/memcached_light
61-libtest/abort
62-memcached/.git
63-memcached/.gitignore
64-memcached/memcached
65-memcached/memcached.spec
66-tests/parser
67
68=== modified file 'ChangeLog'
69--- ChangeLog 2012-05-22 19:57:15 +0000
70+++ ChangeLog 2012-08-14 00:00:29 +0000
71@@ -1,3 +1,13 @@
72+1.0.10 Sun Jul 29 21:50:15 PDT 2012
73+* --disable-assert has been removed from configure, and --enable-assert has been added in its place.
74+* Compiling fixes for Clang on OSX Mountain Lion.
75+
76+1.0.9 Wed Jul 4 22:46:19 EDT 2012
77+* Faster close on socket.
78+* Instance allocation is now seperated from server interface. This should allow for a better preservation of ABI compliance from now on.
79+* Fix close on exec bug.
80+* Numerous other bug fixes.
81+
82 1.0.8 Tue May 22 15:06:04 EDT 2012
83 * Added support for setting options via ENV variable LIBMEMCACHED
84 * Fix corner case on last used result.
85
86=== modified file 'Makefile.am'
87--- Makefile.am 2012-05-05 22:11:48 +0000
88+++ Makefile.am 2012-08-14 00:00:29 +0000
89@@ -1,6 +1,6 @@
90 # vim:ft=automake
91
92-ACLOCAL_AMFLAGS = -I m4
93+ACLOCAL_AMFLAGS = -I m4 -I libtest/m4
94
95 # includes append to these:
96 SUFFIXES =
97@@ -31,8 +31,6 @@
98
99 include libtest/include.am
100
101-libtest_libtest_la_DEPENDENCIES+= memcached/memcached
102-
103 include libhashkit-1.0/include.am
104 include libmemcached-1.0/include.am
105 include libmemcachedprotocol-0.0/include.am
106@@ -48,11 +46,18 @@
107 include libmemcachedinternal/include.am
108 include libmemcachedinternal/util/include.am
109 include poll/include.am
110+include rpm.am
111 include support/include.am
112 include tests/include.am
113 include util/include.am
114 include win32/include.am
115+
116+include m4/include.am
117+
118+if HAVE_LIBEVENT
119 include memcached/include.am
120+libtest_libtest_la_DEPENDENCIES+= memcached/memcached
121+endif
122
123 docs: html man
124
125@@ -60,41 +65,14 @@
126
127 EXTRA_DIST+= ${man_MANS}
128
129-fedora:
130- @rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
131- @rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
132- @cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
133- @rpmbuild -ba support/libmemcached.spec
134- @cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
135- @cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
136-
137-generic: support/libmemcached.spec
138- @rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
139- @rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
140- @cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
141- @rpmbuild -ba support/libmemcached.spec
142- @cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
143- @cp ~/rpmbuild/RPMS/x86_64/libmemcached-devel-$(VERSION)*.rpm .
144- @cp ~/rpmbuild/RPMS/x86_64/libmemcached-debuginfo-$(VERSION)*.rpm .
145- @cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
146-
147-rpm: man distcheck generic
148-
149-release: rpm
150- @rpm --addsign libmemcached-$(VERSION)*.rpm .
151- @rpm --checksig libmemcached-$(VERSION)*.rpm .
152- @rpm --addsign libmemcached-devel-$(VERSION)*.rpm .
153- @rpm --checksig libmemcached-devel-$(VERSION)*.rpm .
154- @rpm --addsign libmemcached-debuginfo-$(VERSION)*.rpm .
155- @rpm --checksig libmemcached-debuginfo-$(VERSION)*.rpm .
156-
157 merge-clean:
158 @find ./ | $(GREP) \.gcda | xargs rm -f
159 @find ./ | $(GREP) \.gcno | xargs rm -f
160 @find ./ | $(GREP) \.gz | xargs rm -f
161- @find ./ | $(GREP) \.orig | xargs rm -f
162+ @find ./ | $(GREP) \.moved | xargs rm -r -f
163+ @find ./ | $(GREP) \\.orig | xargs rm -f
164 @find ./ | $(GREP) \.rej | xargs rm -f
165- @find ./ | $(GREP) \.rpm | xargs rm -f
166+ @rm -f *\.rpm
167 @find ./ | $(GREP) \.THIS | xargs rm -f
168 @find ./ | $(GREP) \.OTHER | xargs rm -f
169 @find ./ | $(GREP) \.BASE | xargs rm -f
170
171=== modified file 'bootstrap.sh'
172--- bootstrap.sh 2012-05-05 22:11:48 +0000
173+++ bootstrap.sh 2012-08-14 00:00:29 +0000
174@@ -2,7 +2,12 @@
175
176 if test -f configure; then make clean; make merge-clean; make distclean; fi;
177
178-rm -r -f autom4te.cache
179+rm -r -f autom4te.cache/ config.h config.log config.status
180 ./config/autorun.sh
181-./configure
182+if [ $(uname) = "Darwin" ];
183+then
184+ ./configure CC=clang CXX=clang++ --enable-assert
185+else
186+ ./configure --enable-assert
187+fi
188 make
189
190=== modified file 'clients/memaslap.c'
191--- clients/memaslap.c 2011-04-05 02:06:15 +0000
192+++ clients/memaslap.c 2012-08-14 00:00:29 +0000
193@@ -594,7 +594,7 @@
194 break;
195
196 case OPT_BINARY_PROTOCOL: /* --binary or -B */
197- ms_setting.binary_prot= true;
198+ ms_setting.binary_prot_= true;
199 break;
200
201 case OPT_TPS: /* --tps or -P */
202@@ -800,7 +800,6 @@
203 /* the loop of the main thread, wait the work threads to complete */
204 static void ms_monitor_slap_mode()
205 {
206- int second= 0;
207 struct timeval start_time, end_time;
208
209 /* Wait all the threads complete initialization. */
210@@ -828,6 +827,7 @@
211 /* running in "run time" mode, user specify run time */
212 if (ms_setting.run_time > 0)
213 {
214+ int second= 0;
215 gettimeofday(&start_time, NULL);
216 while (1)
217 {
218
219=== modified file 'clients/memcp.cc'
220--- clients/memcp.cc 2012-02-23 01:16:50 +0000
221+++ clients/memcp.cc 2012-08-14 00:00:29 +0000
222@@ -207,6 +207,7 @@
223 if ((file_buffer_ptr= (char *)malloc(sizeof(char) * (size_t)sbuf.st_size)) == NULL)
224 {
225 std::cerr << "Error allocating file buffer(" << strerror(errno) << ")" << std::endl;
226+ close(fd);
227 exit(EXIT_FAILURE);
228 }
229
230@@ -214,12 +215,14 @@
231 if ((read_length= ::read(fd, file_buffer_ptr, (size_t)sbuf.st_size)) == -1)
232 {
233 std::cerr << "Error while reading file " << file_buffer_ptr << " (" << strerror(errno) << ")" << std::endl;
234+ close(fd);
235 exit(EXIT_FAILURE);
236 }
237
238 if (read_length != sbuf.st_size)
239 {
240 std::cerr << "Failure while reading file. Read length was not equal to stat() length" << std::endl;
241+ close(fd);
242 exit(EXIT_FAILURE);
243 }
244
245
246=== modified file 'clients/memstat.cc'
247--- clients/memstat.cc 2012-01-30 07:32:18 +0000
248+++ clients/memstat.cc 2012-08-14 00:00:29 +0000
249@@ -84,13 +84,13 @@
250 }
251
252 static memcached_return_t server_print_callback(const memcached_st *,
253- const memcached_server_st *instance,
254+ memcached_server_instance_st instance,
255 void *)
256 {
257 std::cerr << memcached_server_name(instance) << ":" << memcached_server_port(instance) <<
258- " " << int(instance->major_version) <<
259- "." << int(instance->minor_version) <<
260- "." << int(instance->micro_version) << std::endl;
261+ " " << int(memcached_server_major_version(instance)) <<
262+ "." << int(memcached_server_minor_version(instance)) <<
263+ "." << int(memcached_server_micro_version(instance)) << std::endl;
264
265 return MEMCACHED_SUCCESS;
266 }
267
268=== modified file 'clients/ms_conn.c'
269--- clients/ms_conn.c 2011-10-18 00:48:40 +0000
270+++ clients/ms_conn.c 2012-08-14 00:00:29 +0000
271@@ -358,7 +358,7 @@
272 c->mlget_task.mlget_num= 0;
273 c->mlget_task.value_index= -1; /* default invalid value */
274
275- if (ms_setting.binary_prot)
276+ if (ms_setting.binary_prot_)
277 {
278 c->protocol= binary_prot;
279 }
280
281=== modified file 'clients/ms_setting.c'
282--- clients/ms_setting.c 2011-03-17 21:45:08 +0000
283+++ clients/ms_setting.c 2012-08-14 00:00:29 +0000
284@@ -683,7 +683,7 @@
285 exit(1);
286 }
287
288- if (! ms_setting.binary_prot
289+ if (! ms_setting.binary_prot_
290 && ((start_len > MAX_KEY_SIZE) || (end_len > MAX_KEY_SIZE)))
291 {
292 fprintf(stderr, "key length must be less than 250 bytes.\n");
293@@ -880,7 +880,7 @@
294 ms_setting.reconnect= false;
295 ms_setting.verbose= false;
296 ms_setting.facebook_test= false;
297- ms_setting.binary_prot= false;
298+ ms_setting.binary_prot_= false;
299 ms_setting.stat_freq= 0;
300 ms_setting.srv_str= NULL;
301 ms_setting.cfg_file= NULL;
302
303=== modified file 'clients/ms_setting.h'
304--- clients/ms_setting.h 2011-04-28 00:28:00 +0000
305+++ clients/ms_setting.h 2012-08-14 00:00:29 +0000
306@@ -153,7 +153,7 @@
307 bool verbose; /* whether it outputs detailed information when verification */
308 bool facebook_test; /* facebook test, TCP set and multi-get with UDP */
309 uint32_t sock_per_conn; /* number of socks per connection structure */
310- bool binary_prot; /* whether it use binary protocol */
311+ bool binary_prot_; /* whether it use binary protocol */
312 int expected_tps; /* expected throughput */
313 uint32_t rep_write_srv; /* which servers are used to do replication writing */
314 } ms_setting_st;
315
316=== modified file 'clients/ms_stats.c'
317--- clients/ms_stats.c 2009-12-03 20:16:27 +0000
318+++ clients/ms_stats.c 2012-08-14 00:00:29 +0000
319@@ -219,10 +219,6 @@
320 double global_std= 0;
321 double global_log= 0;
322
323- uint64_t diff_time= 0;
324- uint64_t diff_events= 0;
325- double diff_squares= 0;
326- double diff_log_product= 0;
327 double period_average= 0;
328 uint64_t period_tps= 0;
329 double period_rate= 0;
330@@ -241,17 +237,17 @@
331 * global_average) / (double)(events - 1));
332 global_log= exp(stat->log_product / (double)events);
333
334- diff_time= stat->total_time - stat->pre_total_time;
335- diff_events= events - stat->pre_events;
336+ uint64_t diff_time= stat->total_time - stat->pre_total_time;
337+ uint64_t diff_events= events - stat->pre_events;
338 if (diff_events >= 1)
339 {
340 period_average= (double)(diff_time / diff_events);
341 period_tps= diff_events / (uint64_t)freq;
342 period_rate= (double)diff_events * obj_size / 1024 / 1024 / freq;
343- diff_squares= (double)stat->squares - (double)stat->pre_squares;
344+ double diff_squares= (double)stat->squares - (double)stat->pre_squares;
345 period_std= sqrt((diff_squares - (double)diff_events * period_average
346 * period_average) / (double)(diff_events - 1));
347- diff_log_product= stat->log_product - stat->pre_log_product;
348+ double diff_log_product= stat->log_product - stat->pre_log_product;
349 period_log= exp(diff_log_product / (double)diff_events);
350 }
351
352
353=== modified file 'config/autorun.sh'
354--- config/autorun.sh 2012-03-03 23:14:47 +0000
355+++ config/autorun.sh 2012-08-14 00:00:29 +0000
356@@ -1,5 +1,5 @@
357 #!/bin/sh
358-# Copyright (C) 2011 Brian Aker
359+# Copyright (C) 2011 Brian Aker, brian@tangent.org
360 # All rights reserved.
361 #
362 # Redistribution and use in source and binary forms, with or without
363@@ -49,7 +49,7 @@
364 }
365
366
367-AUTORECONF_FLAGS=" --install --force --verbose -Wall"
368+AUTORECONF_FLAGS=" --install --verbose -Wall"
369
370 if test -f config/pre_hook.sh
371 then
372
373=== modified file 'configure.ac'
374--- configure.ac 2012-05-30 15:33:05 +0000
375+++ configure.ac 2012-08-14 00:00:29 +0000
376@@ -7,7 +7,7 @@
377 # Use and distribution licensed under the BSD license. See
378 # the COPYING file in this directory for full text.
379
380-AC_INIT([libmemcached],[1.0.8],[http://libmemcached.org/])
381+AC_INIT([libmemcached],[1.0.10],[http://libmemcached.org/])
382
383 AC_CONFIG_AUX_DIR(config)
384
385@@ -33,7 +33,7 @@
386 #shared library versioning
387 MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0
388 MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
389-MEMCACHED_LIBRARY_VERSION=10:0:0
390+MEMCACHED_LIBRARY_VERSION=11:0:0
391 # | | |
392 # +------+ | +---+
393 # | | |
394@@ -63,11 +63,12 @@
395 AC_MSG_ERROR([Your system lacks a new enough C++ compiler])
396 fi
397
398-m4_include([m4/memcached.m4])
399+# Adding support for libtest
400+m4_include([libtest/yatl.m4])
401+
402 m4_include([m4/memcached_sasl.m4])
403 m4_include([m4/gearmand.m4])
404 m4_include([m4/libgearman.m4])
405-m4_include([memcached/version.m4])
406
407 AM_CONDITIONAL(BUILDING_LIBMEMCACHED, true)
408 AM_CONDITIONAL(HAVE_LIBMEMCACHED, false)
409@@ -79,17 +80,7 @@
410 AC_SEARCH_LIBS(getopt_long, gnugetopt)
411 AC_SEARCH_LIBS(gethostbyname, nsl)
412
413-case "$target_os" in
414- *linux*)
415- AS_IF([test "x$GCC" = "xyes"],
416- [
417- LDFLAGS="$LDFLAGS -z relro -z now"
418- ])
419- ;;
420- esac
421-
422 dnl Specialty checks
423-AX_PTHREAD
424 AX_CXX_CINTTYPES
425 CONFIG_EXTRA
426 DETECT_BYTEORDER
427@@ -102,6 +93,7 @@
428 ENABLE_DEPRECATED
429
430 AC_CHECK_FUNCS([alarm])
431+AC_CHECK_FUNCS([clock_gettime])
432 AC_CHECK_FUNCS([dup2])
433 AC_CHECK_FUNCS([getline])
434 AC_CHECK_FUNCS([gettimeofday])
435@@ -291,7 +283,11 @@
436 fi
437 ])
438
439-AC_C_ENDIAN
440+AX_CHECK_SOCK_CLOEXEC([AC_DEFINE([HAVE_SOCK_CLOEXEC], [1], [Check for SOCK_CLOEXEC.])],
441+ [AC_DEFINE([HAVE_SOCK_CLOEXEC], [0], [Check for SOCK_CLOEXEC.])])
442+
443+AX_HARDEN_COMPILER_FLAGS
444+AX_PTHREAD
445
446 AC_CONFIG_FILES([
447 Makefile
448@@ -303,7 +299,6 @@
449 support/libmemcached.pc
450 support/libmemcached.spec
451 support/libmemcached-fc.spec
452- libtest/version.h
453 ])
454 AC_OUTPUT
455
456
457=== modified file 'docs/conf.py.in'
458--- docs/conf.py.in 2012-04-09 06:28:51 +0000
459+++ docs/conf.py.in 2012-08-14 00:00:29 +0000
460@@ -27,11 +27,11 @@
461 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
462 extensions = []
463
464-extensions = ['sphinxcontrib.googleanalytics']
465+#extensions = ['sphinxcontrib.googleanalytics']
466
467 # Google
468-googleanalytics_id = 'UA-15307604-2'
469-googleanalytics_enabled = 'True'
470+#googleanalytics_id = 'UA-15307604-2'
471+#googleanalytics_enabled = 'True'
472
473 # Add any paths that contain templates here, relative to this directory.
474 templates_path = ['_templates']
475@@ -47,7 +47,7 @@
476
477 # General information about the project.
478 project = u'libmemcached'
479-copyright = u'2011, Brian Aker DataDifferential, http://datadifferential.com/'
480+copyright = u'2011-2012, Brian Aker DataDifferential, http://datadifferential.com/'
481
482 # The version info for the project you're documenting, acts as replacement for
483 # |version| and |release|, also used in various other places throughout the
484
485=== modified file 'docs/include.am'
486--- docs/include.am 2011-10-18 21:08:56 +0000
487+++ docs/include.am 2012-08-14 00:00:29 +0000
488@@ -16,120 +16,123 @@
489
490 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
491
492-man_MANS+= \
493- docs/man/hashkit_clone.3 \
494- docs/man/hashkit_crc32.3 \
495- docs/man/hashkit_create.3 \
496- docs/man/hashkit_fnv1_32.3 \
497- docs/man/hashkit_fnv1_64.3 \
498- docs/man/hashkit_fnv1a_32.3 \
499- docs/man/hashkit_fnv1a_64.3 \
500- docs/man/hashkit_free.3 \
501- docs/man/hashkit_functions.3 \
502- docs/man/hashkit_hsieh.3 \
503- docs/man/hashkit_is_allocated.3 \
504- docs/man/hashkit_jenkins.3 \
505- docs/man/hashkit_md5.3 \
506- docs/man/hashkit_murmur.3 \
507- docs/man/hashkit_value.3 \
508- docs/man/libhashkit.3 \
509- docs/man/libmemcached.3 \
510- docs/man/libmemcached_examples.3 \
511- docs/man/libmemcachedutil.3 \
512- docs/man/memaslap.1 \
513- docs/man/memcached_add.3 \
514- docs/man/memcached_add_by_key.3 \
515- docs/man/memcached_analyze.3 \
516- docs/man/memcached_append.3 \
517- docs/man/memcached_append_by_key.3 \
518- docs/man/memcached_behavior_get.3 \
519- docs/man/memcached_behavior_set.3 \
520- docs/man/memcached_callback_get.3 \
521- docs/man/memcached_callback_set.3 \
522- docs/man/memcached_cas.3 \
523- docs/man/memcached_cas_by_key.3 \
524- docs/man/memcached_clone.3 \
525- docs/man/memcached_create.3 \
526- docs/man/memcached_decrement.3 \
527- docs/man/memcached_decrement_with_initial.3 \
528- docs/man/memcached_delete.3 \
529- docs/man/memcached_delete_by_key.3 \
530- docs/man/libmemcached_check_configuration.3 \
531- docs/man/libmemcached_configuration.3 \
532- docs/man/memcached.3 \
533- docs/man/memcached_destroy_sasl_auth_data.3 \
534- docs/man/memcached_dump.3 \
535- docs/man/memcached_exist.3 \
536- docs/man/memcached_exist_by_key.3 \
537- docs/man/memcached_fetch.3 \
538- docs/man/memcached_fetch_execute.3 \
539- docs/man/memcached_fetch_result.3 \
540- docs/man/memcached_flush_buffers.3 \
541- docs/man/memcached_free.3 \
542- docs/man/memcached_generate_hash.3 \
543- docs/man/memcached_generate_hash_value.3 \
544- docs/man/memcached_get.3 \
545- docs/man/memcached_get_by_key.3 \
546- docs/man/memcached_get_memory_allocators.3 \
547- docs/man/memcached_get_sasl_callbacks.3 \
548- docs/man/memcached_get_user_data.3 \
549- docs/man/memcached_increment.3 \
550- docs/man/memcached_increment_with_initial.3 \
551- docs/man/memcached_lib_version.3 \
552- docs/man/memcached_mget.3 \
553- docs/man/memcached_mget_by_key.3 \
554- docs/man/memcached_mget_execute.3 \
555- docs/man/memcached_mget_execute_by_key.3 \
556- docs/man/memcached_pool.3 \
557- docs/man/memcached_pool_behavior_get.3 \
558- docs/man/memcached_pool_behavior_set.3 \
559- docs/man/memcached_pool_create.3 \
560- docs/man/memcached_pool_destroy.3 \
561- docs/man/memcached_pool_fetch.3 \
562- docs/man/memcached_pool_pop.3 \
563- docs/man/memcached_pool_push.3 \
564- docs/man/memcached_pool_release.3 \
565- docs/man/memcached_pool_st.3 \
566- docs/man/memcached_prepend.3 \
567- docs/man/memcached_prepend_by_key.3 \
568- docs/man/memcached_quit.3 \
569- docs/man/memcached_replace.3 \
570- docs/man/memcached_replace_by_key.3 \
571- docs/man/memcached_last_error_message.3 \
572- docs/man/memcached_sasl_set_auth_data.3 \
573- docs/man/memcached_server_add.3 \
574- docs/man/memcached_server_count.3 \
575- docs/man/memcached_server_cursor.3 \
576- docs/man/memcached_server_list.3 \
577- docs/man/memcached_server_list_append.3 \
578- docs/man/memcached_server_list_count.3 \
579- docs/man/memcached_server_list_free.3 \
580- docs/man/memcached_server_push.3 \
581- docs/man/memcached_servers_parse.3 \
582- docs/man/memcached_set.3 \
583- docs/man/memcached_set_by_key.3 \
584- docs/man/memcached_set_memory_allocators.3 \
585- docs/man/memcached_set_sasl_callbacks.3 \
586- docs/man/memcached_set_user_data.3 \
587- docs/man/memcached_stat.3 \
588- docs/man/memcached_stat_execute.3 \
589- docs/man/memcached_stat_get_keys.3 \
590- docs/man/memcached_stat_get_value.3 \
591- docs/man/memcached_stat_servername.3 \
592- docs/man/memcached_strerror.3 \
593- docs/man/memcached_touch.3 \
594- docs/man/memcached_touch_by_key.3 \
595- docs/man/memcached_verbosity.3 \
596- docs/man/memcached_version.3 \
597- docs/man/memcapable.1 \
598- docs/man/memcat.1 \
599- docs/man/memcp.1 \
600- docs/man/memdump.1 \
601- docs/man/memerror.1 \
602- docs/man/memflush.1 \
603- docs/man/memrm.1 \
604- docs/man/memslap.1 \
605- docs/man/memstat.1
606+man_MANS+= docs/man/hashkit_clone.3
607+man_MANS+= docs/man/hashkit_crc32.3
608+man_MANS+= docs/man/hashkit_create.3
609+man_MANS+= docs/man/hashkit_fnv1_32.3
610+man_MANS+= docs/man/hashkit_fnv1_64.3
611+man_MANS+= docs/man/hashkit_fnv1a_32.3
612+man_MANS+= docs/man/hashkit_fnv1a_64.3
613+man_MANS+= docs/man/hashkit_free.3
614+man_MANS+= docs/man/hashkit_functions.3
615+man_MANS+= docs/man/hashkit_hsieh.3
616+man_MANS+= docs/man/hashkit_is_allocated.3
617+man_MANS+= docs/man/hashkit_jenkins.3
618+man_MANS+= docs/man/hashkit_md5.3
619+man_MANS+= docs/man/hashkit_murmur.3
620+man_MANS+= docs/man/hashkit_value.3
621+man_MANS+= docs/man/libhashkit.3
622+man_MANS+= docs/man/libmemcached.3
623+man_MANS+= docs/man/libmemcached_examples.3
624+man_MANS+= docs/man/libmemcachedutil.3
625+man_MANS+= docs/man/memaslap.1
626+man_MANS+= docs/man/memcached_add.3
627+man_MANS+= docs/man/memcached_add_by_key.3
628+man_MANS+= docs/man/memcached_analyze.3
629+man_MANS+= docs/man/memcached_append.3
630+man_MANS+= docs/man/memcached_append_by_key.3
631+man_MANS+= docs/man/memcached_behavior_get.3
632+man_MANS+= docs/man/memcached_behavior_set.3
633+man_MANS+= docs/man/memcached_callback_get.3
634+man_MANS+= docs/man/memcached_callback_set.3
635+man_MANS+= docs/man/memcached_cas.3
636+man_MANS+= docs/man/memcached_cas_by_key.3
637+man_MANS+= docs/man/memcached_clone.3
638+man_MANS+= docs/man/memcached_create.3
639+man_MANS+= docs/man/memcached_decrement.3
640+man_MANS+= docs/man/memcached_decrement_with_initial.3
641+man_MANS+= docs/man/memcached_delete.3
642+man_MANS+= docs/man/memcached_delete_by_key.3
643+man_MANS+= docs/man/libmemcached_check_configuration.3
644+man_MANS+= docs/man/libmemcached_configuration.3
645+man_MANS+= docs/man/memcached.3
646+man_MANS+= docs/man/memcached_destroy_sasl_auth_data.3
647+man_MANS+= docs/man/memcached_dump.3
648+man_MANS+= docs/man/memcached_exist.3
649+man_MANS+= docs/man/memcached_exist_by_key.3
650+man_MANS+= docs/man/memcached_fetch.3
651+man_MANS+= docs/man/memcached_fetch_execute.3
652+man_MANS+= docs/man/memcached_fetch_result.3
653+man_MANS+= docs/man/memcached_flush_buffers.3
654+man_MANS+= docs/man/memcached_free.3
655+man_MANS+= docs/man/memcached_generate_hash.3
656+man_MANS+= docs/man/memcached_generate_hash_value.3
657+man_MANS+= docs/man/memcached_get.3
658+man_MANS+= docs/man/memcached_get_by_key.3
659+man_MANS+= docs/man/memcached_get_memory_allocators.3
660+man_MANS+= docs/man/memcached_get_sasl_callbacks.3
661+man_MANS+= docs/man/memcached_get_user_data.3
662+man_MANS+= docs/man/memcached_increment.3
663+man_MANS+= docs/man/memcached_increment_with_initial.3
664+man_MANS+= docs/man/memcached_lib_version.3
665+man_MANS+= docs/man/memcached_mget.3
666+man_MANS+= docs/man/memcached_mget_by_key.3
667+man_MANS+= docs/man/memcached_mget_execute.3
668+man_MANS+= docs/man/memcached_mget_execute_by_key.3
669+man_MANS+= docs/man/memcached_pool.3
670+man_MANS+= docs/man/memcached_pool_behavior_get.3
671+man_MANS+= docs/man/memcached_pool_behavior_set.3
672+man_MANS+= docs/man/memcached_pool_create.3
673+man_MANS+= docs/man/memcached_pool_destroy.3
674+man_MANS+= docs/man/memcached_pool_fetch.3
675+man_MANS+= docs/man/memcached_pool_pop.3
676+man_MANS+= docs/man/memcached_pool_push.3
677+man_MANS+= docs/man/memcached_pool_release.3
678+man_MANS+= docs/man/memcached_pool_st.3
679+man_MANS+= docs/man/memcached_prepend.3
680+man_MANS+= docs/man/memcached_prepend_by_key.3
681+man_MANS+= docs/man/memcached_quit.3
682+man_MANS+= docs/man/memcached_replace.3
683+man_MANS+= docs/man/memcached_replace_by_key.3
684+man_MANS+= docs/man/memcached_last_error_message.3
685+man_MANS+= docs/man/memcached_sasl_set_auth_data.3
686+man_MANS+= docs/man/memcached_server_add.3
687+man_MANS+= docs/man/memcached_server_count.3
688+man_MANS+= docs/man/memcached_server_cursor.3
689+man_MANS+= docs/man/memcached_server_list.3
690+man_MANS+= docs/man/memcached_server_list_append.3
691+man_MANS+= docs/man/memcached_server_list_count.3
692+man_MANS+= docs/man/memcached_server_list_free.3
693+man_MANS+= docs/man/memcached_server_push.3
694+man_MANS+= docs/man/memcached_servers_parse.3
695+man_MANS+= docs/man/memcached_set.3
696+man_MANS+= docs/man/memcached_set_by_key.3
697+man_MANS+= docs/man/memcached_set_memory_allocators.3
698+man_MANS+= docs/man/memcached_set_sasl_callbacks.3
699+man_MANS+= docs/man/memcached_set_user_data.3
700+man_MANS+= docs/man/memcached_stat.3
701+man_MANS+= docs/man/memcached_stat_execute.3
702+man_MANS+= docs/man/memcached_stat_get_keys.3
703+man_MANS+= docs/man/memcached_stat_get_value.3
704+man_MANS+= docs/man/memcached_stat_servername.3
705+man_MANS+= docs/man/memcached_strerror.3
706+man_MANS+= docs/man/memcached_touch.3
707+man_MANS+= docs/man/memcached_touch_by_key.3
708+man_MANS+= docs/man/memcached_verbosity.3
709+man_MANS+= docs/man/memcached_version.3
710+man_MANS+= docs/man/memcapable.1
711+man_MANS+= docs/man/memexist.1
712+man_MANS+= docs/man/memparse.1
713+man_MANS+= docs/man/memping.1
714+man_MANS+= docs/man/memcat.1
715+man_MANS+= docs/man/memcp.1
716+man_MANS+= docs/man/memdump.1
717+man_MANS+= docs/man/memtouch.1
718+man_MANS+= docs/man/memerror.1
719+man_MANS+= docs/man/memflush.1
720+man_MANS+= docs/man/memrm.1
721+man_MANS+= docs/man/memslap.1
722+man_MANS+= docs/man/memstat.1
723
724 if HAVE_SPHINX
725 sphinx-help:
726
727=== modified file 'docs/libmemcached_configuration.rst'
728--- docs/libmemcached_configuration.rst 2012-05-04 03:27:41 +0000
729+++ docs/libmemcached_configuration.rst 2012-08-14 00:00:29 +0000
730@@ -41,7 +41,7 @@
731
732 .. describe:: --REMOVE_FAILED_SERVERS
733
734-Enable the behavior MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS.
735+Enable the behavior :c:type:`MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS`.
736
737 .. describe:: --BINARY-PROTOCOL
738
739@@ -49,7 +49,7 @@
740
741 .. describe:: --BUFFER-REQUESTS
742
743-Enable MEMCACHED_BEHAVIOR_BUFFER_REQUESTS.
744+Please see :c:type:`MEMCACHED_BEHAVIOR_BUFFER_REQUESTS`.
745
746 .. describe:: --CONFIGURE-FILE=
747
748@@ -57,7 +57,7 @@
749
750 .. describe:: --CONNECT-TIMEOUT=
751
752-Enable MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT.
753+Please see :c:type:`MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT`.
754
755 .. describe:: --DISTRIBUTION=
756
757@@ -91,11 +91,11 @@
758
759 .. describe:: --SUPPORT-CAS
760
761-See :manpage:`memcached_behavior_set(3)` for MEMCACHED_BEHAVIOR_SUPPORT_CAS
762+See :manpage:`memcached_behavior_set(3)` for :c:type:`MEMCACHED_BEHAVIOR_SUPPORT_CAS`
763
764 .. describe:: --USE-UDP
765
766-See :manpage:`memcached_behavior_set(3)` for MEMCACHED_BEHAVIOR_USE_UDP
767+See :manpage:`memcached_behavior_set(3)` for :c:type:`MEMCACHED_BEHAVIOR_USE_UDP`
768
769 .. describe:: --NAMESPACE=
770
771
772=== modified file 'docs/man/hashkit_clone.3'
773--- docs/man/hashkit_clone.3 2012-05-22 19:57:15 +0000
774+++ docs/man/hashkit_clone.3 2012-08-14 00:00:29 +0000
775@@ -1,4 +1,4 @@
776-.TH "HASHKIT_CLONE" "3" "May 22, 2012" "1.0.8" "libmemcached"
777+.TH "HASHKIT_CLONE" "3" "August 02, 2012" "1.0.10" "libmemcached"
778 .SH NAME
779 hashkit_clone \- libhashkit Documentation
780 .
781
782=== modified file 'docs/man/hashkit_crc32.3'
783--- docs/man/hashkit_crc32.3 2012-05-22 19:57:15 +0000
784+++ docs/man/hashkit_crc32.3 2012-08-14 00:00:29 +0000
785@@ -1,4 +1,4 @@
786-.TH "HASHKIT_CRC32" "3" "May 22, 2012" "1.0.8" "libmemcached"
787+.TH "HASHKIT_CRC32" "3" "August 02, 2012" "1.0.10" "libmemcached"
788 .SH NAME
789 hashkit_crc32 \- libhashkit Documentation
790 .
791
792=== modified file 'docs/man/hashkit_create.3'
793--- docs/man/hashkit_create.3 2012-05-22 19:57:15 +0000
794+++ docs/man/hashkit_create.3 2012-08-14 00:00:29 +0000
795@@ -1,4 +1,4 @@
796-.TH "HASHKIT_CREATE" "3" "May 22, 2012" "1.0.8" "libmemcached"
797+.TH "HASHKIT_CREATE" "3" "August 02, 2012" "1.0.10" "libmemcached"
798 .SH NAME
799 hashkit_create \- libhashkit Documentation
800 .
801
802=== modified file 'docs/man/hashkit_fnv1_32.3'
803--- docs/man/hashkit_fnv1_32.3 2012-05-22 19:57:15 +0000
804+++ docs/man/hashkit_fnv1_32.3 2012-08-14 00:00:29 +0000
805@@ -1,4 +1,4 @@
806-.TH "HASHKIT_FNV1_32" "3" "May 22, 2012" "1.0.8" "libmemcached"
807+.TH "HASHKIT_FNV1_32" "3" "August 02, 2012" "1.0.10" "libmemcached"
808 .SH NAME
809 hashkit_fnv1_32 \- libhashkit Documentation
810 .
811
812=== modified file 'docs/man/hashkit_fnv1_64.3'
813--- docs/man/hashkit_fnv1_64.3 2012-05-22 19:57:15 +0000
814+++ docs/man/hashkit_fnv1_64.3 2012-08-14 00:00:29 +0000
815@@ -1,4 +1,4 @@
816-.TH "HASHKIT_FNV1_64" "3" "May 22, 2012" "1.0.8" "libmemcached"
817+.TH "HASHKIT_FNV1_64" "3" "August 02, 2012" "1.0.10" "libmemcached"
818 .SH NAME
819 hashkit_fnv1_64 \- libhashkit Documentation
820 .
821
822=== modified file 'docs/man/hashkit_fnv1a_32.3'
823--- docs/man/hashkit_fnv1a_32.3 2012-05-22 19:57:15 +0000
824+++ docs/man/hashkit_fnv1a_32.3 2012-08-14 00:00:29 +0000
825@@ -1,4 +1,4 @@
826-.TH "HASHKIT_FNV1A_32" "3" "May 22, 2012" "1.0.8" "libmemcached"
827+.TH "HASHKIT_FNV1A_32" "3" "August 02, 2012" "1.0.10" "libmemcached"
828 .SH NAME
829 hashkit_fnv1a_32 \- libhashkit Documentation
830 .
831
832=== modified file 'docs/man/hashkit_fnv1a_64.3'
833--- docs/man/hashkit_fnv1a_64.3 2012-05-22 19:57:15 +0000
834+++ docs/man/hashkit_fnv1a_64.3 2012-08-14 00:00:29 +0000
835@@ -1,4 +1,4 @@
836-.TH "HASHKIT_FNV1A_64" "3" "May 22, 2012" "1.0.8" "libmemcached"
837+.TH "HASHKIT_FNV1A_64" "3" "August 02, 2012" "1.0.10" "libmemcached"
838 .SH NAME
839 hashkit_fnv1a_64 \- libhashkit Documentation
840 .
841
842=== modified file 'docs/man/hashkit_free.3'
843--- docs/man/hashkit_free.3 2012-05-22 19:57:15 +0000
844+++ docs/man/hashkit_free.3 2012-08-14 00:00:29 +0000
845@@ -1,4 +1,4 @@
846-.TH "HASHKIT_FREE" "3" "May 22, 2012" "1.0.8" "libmemcached"
847+.TH "HASHKIT_FREE" "3" "August 02, 2012" "1.0.10" "libmemcached"
848 .SH NAME
849 hashkit_free \- libhashkit Documentation
850 .
851
852=== modified file 'docs/man/hashkit_functions.3'
853--- docs/man/hashkit_functions.3 2012-05-22 19:57:15 +0000
854+++ docs/man/hashkit_functions.3 2012-08-14 00:00:29 +0000
855@@ -1,4 +1,4 @@
856-.TH "HASHKIT_FUNCTIONS" "3" "May 22, 2012" "1.0.8" "libmemcached"
857+.TH "HASHKIT_FUNCTIONS" "3" "August 02, 2012" "1.0.10" "libmemcached"
858 .SH NAME
859 hashkit_functions \- libhashkit Documentation
860 .
861
862=== modified file 'docs/man/hashkit_hsieh.3'
863--- docs/man/hashkit_hsieh.3 2012-05-22 19:57:15 +0000
864+++ docs/man/hashkit_hsieh.3 2012-08-14 00:00:29 +0000
865@@ -1,4 +1,4 @@
866-.TH "HASHKIT_HSIEH" "3" "May 22, 2012" "1.0.8" "libmemcached"
867+.TH "HASHKIT_HSIEH" "3" "August 02, 2012" "1.0.10" "libmemcached"
868 .SH NAME
869 hashkit_hsieh \- libhashkit Documentation
870 .
871
872=== modified file 'docs/man/hashkit_is_allocated.3'
873--- docs/man/hashkit_is_allocated.3 2012-05-22 19:57:15 +0000
874+++ docs/man/hashkit_is_allocated.3 2012-08-14 00:00:29 +0000
875@@ -1,4 +1,4 @@
876-.TH "HASHKIT_IS_ALLOCATED" "3" "May 22, 2012" "1.0.8" "libmemcached"
877+.TH "HASHKIT_IS_ALLOCATED" "3" "August 02, 2012" "1.0.10" "libmemcached"
878 .SH NAME
879 hashkit_is_allocated \- libhashkit Documentation
880 .
881
882=== modified file 'docs/man/hashkit_jenkins.3'
883--- docs/man/hashkit_jenkins.3 2012-05-22 19:57:15 +0000
884+++ docs/man/hashkit_jenkins.3 2012-08-14 00:00:29 +0000
885@@ -1,4 +1,4 @@
886-.TH "HASHKIT_JENKINS" "3" "May 22, 2012" "1.0.8" "libmemcached"
887+.TH "HASHKIT_JENKINS" "3" "August 02, 2012" "1.0.10" "libmemcached"
888 .SH NAME
889 hashkit_jenkins \- libhashkit Documentation
890 .
891
892=== modified file 'docs/man/hashkit_md5.3'
893--- docs/man/hashkit_md5.3 2012-05-22 19:57:15 +0000
894+++ docs/man/hashkit_md5.3 2012-08-14 00:00:29 +0000
895@@ -1,4 +1,4 @@
896-.TH "HASHKIT_MD5" "3" "May 22, 2012" "1.0.8" "libmemcached"
897+.TH "HASHKIT_MD5" "3" "August 02, 2012" "1.0.10" "libmemcached"
898 .SH NAME
899 hashkit_md5 \- libhashkit Documentation
900 .
901
902=== modified file 'docs/man/hashkit_murmur.3'
903--- docs/man/hashkit_murmur.3 2012-05-22 19:57:15 +0000
904+++ docs/man/hashkit_murmur.3 2012-08-14 00:00:29 +0000
905@@ -1,4 +1,4 @@
906-.TH "HASHKIT_MURMUR" "3" "May 22, 2012" "1.0.8" "libmemcached"
907+.TH "HASHKIT_MURMUR" "3" "August 02, 2012" "1.0.10" "libmemcached"
908 .SH NAME
909 hashkit_murmur \- libhashkit Documentation
910 .
911
912=== modified file 'docs/man/hashkit_value.3'
913--- docs/man/hashkit_value.3 2012-05-22 19:57:15 +0000
914+++ docs/man/hashkit_value.3 2012-08-14 00:00:29 +0000
915@@ -1,4 +1,4 @@
916-.TH "HASHKIT_VALUE" "3" "May 22, 2012" "1.0.8" "libmemcached"
917+.TH "HASHKIT_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached"
918 .SH NAME
919 hashkit_value \- libhashkit Documentation
920 .
921
922=== modified file 'docs/man/libhashkit.3'
923--- docs/man/libhashkit.3 2012-05-22 19:57:15 +0000
924+++ docs/man/libhashkit.3 2012-08-14 00:00:29 +0000
925@@ -1,4 +1,4 @@
926-.TH "LIBHASHKIT" "3" "May 22, 2012" "1.0.8" "libmemcached"
927+.TH "LIBHASHKIT" "3" "August 02, 2012" "1.0.10" "libmemcached"
928 .SH NAME
929 libhashkit \- libhashkit Documentation
930 .
931
932=== modified file 'docs/man/libmemcached.3'
933--- docs/man/libmemcached.3 2012-05-22 19:57:15 +0000
934+++ docs/man/libmemcached.3 2012-08-14 00:00:29 +0000
935@@ -1,4 +1,4 @@
936-.TH "LIBMEMCACHED" "3" "May 22, 2012" "1.0.8" "libmemcached"
937+.TH "LIBMEMCACHED" "3" "August 02, 2012" "1.0.10" "libmemcached"
938 .SH NAME
939 libmemcached \- Introducing the C Client Library for memcached
940 .
941
942=== modified file 'docs/man/libmemcached_check_configuration.3'
943--- docs/man/libmemcached_check_configuration.3 2012-05-22 19:57:15 +0000
944+++ docs/man/libmemcached_check_configuration.3 2012-08-14 00:00:29 +0000
945@@ -1,4 +1,4 @@
946-.TH "LIBMEMCACHED_CHECK_CONFIGURATION" "3" "May 22, 2012" "1.0.8" "libmemcached"
947+.TH "LIBMEMCACHED_CHECK_CONFIGURATION" "3" "August 02, 2012" "1.0.10" "libmemcached"
948 .SH NAME
949 libmemcached_check_configuration \- libmemcached Documentation
950 .
951@@ -75,7 +75,7 @@
952 .B \-\-REMOVE_FAILED_SERVERS
953 .UNINDENT
954 .sp
955-Enable the behavior MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS.
956+Enable the behavior \fBMEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS\fP.
957 .INDENT 0.0
958 .TP
959 .B \-\-BINARY\-PROTOCOL
960@@ -87,7 +87,7 @@
961 .B \-\-BUFFER\-REQUESTS
962 .UNINDENT
963 .sp
964-Enable MEMCACHED_BEHAVIOR_BUFFER_REQUESTS.
965+Please see \fBMEMCACHED_BEHAVIOR_BUFFER_REQUESTS\fP.
966 .INDENT 0.0
967 .TP
968 .B \-\-CONFIGURE\-FILE=
969@@ -99,7 +99,7 @@
970 .B \-\-CONNECT\-TIMEOUT=
971 .UNINDENT
972 .sp
973-Enable MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT.
974+Please see \fBMEMCACHED_BEHAVIOR_CONNECT_TIMEOUT\fP.
975 .INDENT 0.0
976 .TP
977 .B \-\-DISTRIBUTION=
978@@ -149,13 +149,13 @@
979 .B \-\-SUPPORT\-CAS
980 .UNINDENT
981 .sp
982-See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SUPPORT_CAS
983+See \fImemcached_behavior_set(3)\fP for \fBMEMCACHED_BEHAVIOR_SUPPORT_CAS\fP
984 .INDENT 0.0
985 .TP
986 .B \-\-USE\-UDP
987 .UNINDENT
988 .sp
989-See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP
990+See \fImemcached_behavior_set(3)\fP for \fBMEMCACHED_BEHAVIOR_USE_UDP\fP
991 .INDENT 0.0
992 .TP
993 .B \-\-NAMESPACE=
994
995=== modified file 'docs/man/libmemcached_configuration.3'
996--- docs/man/libmemcached_configuration.3 2012-05-22 19:57:15 +0000
997+++ docs/man/libmemcached_configuration.3 2012-08-14 00:00:29 +0000
998@@ -1,4 +1,4 @@
999-.TH "LIBMEMCACHED_CONFIGURATION" "3" "May 22, 2012" "1.0.8" "libmemcached"
1000+.TH "LIBMEMCACHED_CONFIGURATION" "3" "August 02, 2012" "1.0.10" "libmemcached"
1001 .SH NAME
1002 libmemcached_configuration \- libmemcached Documentation
1003 .
1004@@ -75,7 +75,7 @@
1005 .B \-\-REMOVE_FAILED_SERVERS
1006 .UNINDENT
1007 .sp
1008-Enable the behavior MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS.
1009+Enable the behavior \fBMEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS\fP.
1010 .INDENT 0.0
1011 .TP
1012 .B \-\-BINARY\-PROTOCOL
1013@@ -87,7 +87,7 @@
1014 .B \-\-BUFFER\-REQUESTS
1015 .UNINDENT
1016 .sp
1017-Enable MEMCACHED_BEHAVIOR_BUFFER_REQUESTS.
1018+Please see \fBMEMCACHED_BEHAVIOR_BUFFER_REQUESTS\fP.
1019 .INDENT 0.0
1020 .TP
1021 .B \-\-CONFIGURE\-FILE=
1022@@ -99,7 +99,7 @@
1023 .B \-\-CONNECT\-TIMEOUT=
1024 .UNINDENT
1025 .sp
1026-Enable MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT.
1027+Please see \fBMEMCACHED_BEHAVIOR_CONNECT_TIMEOUT\fP.
1028 .INDENT 0.0
1029 .TP
1030 .B \-\-DISTRIBUTION=
1031@@ -149,13 +149,13 @@
1032 .B \-\-SUPPORT\-CAS
1033 .UNINDENT
1034 .sp
1035-See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SUPPORT_CAS
1036+See \fImemcached_behavior_set(3)\fP for \fBMEMCACHED_BEHAVIOR_SUPPORT_CAS\fP
1037 .INDENT 0.0
1038 .TP
1039 .B \-\-USE\-UDP
1040 .UNINDENT
1041 .sp
1042-See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP
1043+See \fImemcached_behavior_set(3)\fP for \fBMEMCACHED_BEHAVIOR_USE_UDP\fP
1044 .INDENT 0.0
1045 .TP
1046 .B \-\-NAMESPACE=
1047
1048=== modified file 'docs/man/libmemcached_examples.3'
1049--- docs/man/libmemcached_examples.3 2012-05-22 19:57:15 +0000
1050+++ docs/man/libmemcached_examples.3 2012-08-14 00:00:29 +0000
1051@@ -1,4 +1,4 @@
1052-.TH "LIBMEMCACHED_EXAMPLES" "3" "May 22, 2012" "1.0.8" "libmemcached"
1053+.TH "LIBMEMCACHED_EXAMPLES" "3" "August 02, 2012" "1.0.10" "libmemcached"
1054 .SH NAME
1055 libmemcached_examples \- libmemcached Documentation
1056 .
1057
1058=== modified file 'docs/man/libmemcachedutil.3'
1059--- docs/man/libmemcachedutil.3 2012-05-22 19:57:15 +0000
1060+++ docs/man/libmemcachedutil.3 2012-08-14 00:00:29 +0000
1061@@ -1,4 +1,4 @@
1062-.TH "LIBMEMCACHEDUTIL" "3" "May 22, 2012" "1.0.8" "libmemcached"
1063+.TH "LIBMEMCACHEDUTIL" "3" "August 02, 2012" "1.0.10" "libmemcached"
1064 .SH NAME
1065 libmemcachedutil \- libmemcached Documentation
1066 .
1067
1068=== modified file 'docs/man/memaslap.1'
1069--- docs/man/memaslap.1 2012-05-22 19:57:15 +0000
1070+++ docs/man/memaslap.1 2012-08-14 00:00:29 +0000
1071@@ -1,4 +1,4 @@
1072-.TH "MEMASLAP" "1" "May 22, 2012" "1.0.8" "libmemcached"
1073+.TH "MEMASLAP" "1" "August 02, 2012" "1.0.10" "libmemcached"
1074 .SH NAME
1075 memaslap \- libmemcached Documentation
1076 .
1077
1078=== modified file 'docs/man/memcached.3'
1079--- docs/man/memcached.3 2012-05-22 19:57:15 +0000
1080+++ docs/man/memcached.3 2012-08-14 00:00:29 +0000
1081@@ -1,4 +1,4 @@
1082-.TH "MEMCACHED" "3" "May 22, 2012" "1.0.8" "libmemcached"
1083+.TH "MEMCACHED" "3" "August 02, 2012" "1.0.10" "libmemcached"
1084 .SH NAME
1085 memcached \- libmemcached Documentation
1086 .
1087@@ -75,7 +75,7 @@
1088 .B \-\-REMOVE_FAILED_SERVERS
1089 .UNINDENT
1090 .sp
1091-Enable the behavior MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS.
1092+Enable the behavior \fBMEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS\fP.
1093 .INDENT 0.0
1094 .TP
1095 .B \-\-BINARY\-PROTOCOL
1096@@ -87,7 +87,7 @@
1097 .B \-\-BUFFER\-REQUESTS
1098 .UNINDENT
1099 .sp
1100-Enable MEMCACHED_BEHAVIOR_BUFFER_REQUESTS.
1101+Please see \fBMEMCACHED_BEHAVIOR_BUFFER_REQUESTS\fP.
1102 .INDENT 0.0
1103 .TP
1104 .B \-\-CONFIGURE\-FILE=
1105@@ -99,7 +99,7 @@
1106 .B \-\-CONNECT\-TIMEOUT=
1107 .UNINDENT
1108 .sp
1109-Enable MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT.
1110+Please see \fBMEMCACHED_BEHAVIOR_CONNECT_TIMEOUT\fP.
1111 .INDENT 0.0
1112 .TP
1113 .B \-\-DISTRIBUTION=
1114@@ -149,13 +149,13 @@
1115 .B \-\-SUPPORT\-CAS
1116 .UNINDENT
1117 .sp
1118-See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_SUPPORT_CAS
1119+See \fImemcached_behavior_set(3)\fP for \fBMEMCACHED_BEHAVIOR_SUPPORT_CAS\fP
1120 .INDENT 0.0
1121 .TP
1122 .B \-\-USE\-UDP
1123 .UNINDENT
1124 .sp
1125-See \fImemcached_behavior_set(3)\fP for MEMCACHED_BEHAVIOR_USE_UDP
1126+See \fImemcached_behavior_set(3)\fP for \fBMEMCACHED_BEHAVIOR_USE_UDP\fP
1127 .INDENT 0.0
1128 .TP
1129 .B \-\-NAMESPACE=
1130
1131=== modified file 'docs/man/memcached_add.3'
1132--- docs/man/memcached_add.3 2012-05-22 19:57:15 +0000
1133+++ docs/man/memcached_add.3 2012-08-14 00:00:29 +0000
1134@@ -1,4 +1,4 @@
1135-.TH "MEMCACHED_ADD" "3" "May 22, 2012" "1.0.8" "libmemcached"
1136+.TH "MEMCACHED_ADD" "3" "August 02, 2012" "1.0.10" "libmemcached"
1137 .SH NAME
1138 memcached_add \- Storing and Replacing Data
1139 .
1140
1141=== modified file 'docs/man/memcached_add_by_key.3'
1142--- docs/man/memcached_add_by_key.3 2012-05-22 19:57:15 +0000
1143+++ docs/man/memcached_add_by_key.3 2012-08-14 00:00:29 +0000
1144@@ -1,4 +1,4 @@
1145-.TH "MEMCACHED_ADD_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
1146+.TH "MEMCACHED_ADD_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
1147 .SH NAME
1148 memcached_add_by_key \- Storing and Replacing Data
1149 .
1150
1151=== modified file 'docs/man/memcached_analyze.3'
1152--- docs/man/memcached_analyze.3 2012-05-22 19:57:15 +0000
1153+++ docs/man/memcached_analyze.3 2012-08-14 00:00:29 +0000
1154@@ -1,4 +1,4 @@
1155-.TH "MEMCACHED_ANALYZE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1156+.TH "MEMCACHED_ANALYZE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1157 .SH NAME
1158 memcached_analyze \- libmemcached Documentation
1159 .
1160
1161=== modified file 'docs/man/memcached_append.3'
1162--- docs/man/memcached_append.3 2012-05-22 19:57:15 +0000
1163+++ docs/man/memcached_append.3 2012-08-14 00:00:29 +0000
1164@@ -1,4 +1,4 @@
1165-.TH "MEMCACHED_APPEND" "3" "May 22, 2012" "1.0.8" "libmemcached"
1166+.TH "MEMCACHED_APPEND" "3" "August 02, 2012" "1.0.10" "libmemcached"
1167 .SH NAME
1168 memcached_append \- Appending to or Prepending to data on the server
1169 .
1170
1171=== modified file 'docs/man/memcached_append_by_key.3'
1172--- docs/man/memcached_append_by_key.3 2012-05-22 19:57:15 +0000
1173+++ docs/man/memcached_append_by_key.3 2012-08-14 00:00:29 +0000
1174@@ -1,4 +1,4 @@
1175-.TH "MEMCACHED_APPEND_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
1176+.TH "MEMCACHED_APPEND_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
1177 .SH NAME
1178 memcached_append_by_key \- Appending to or Prepending to data on the server
1179 .
1180
1181=== modified file 'docs/man/memcached_auto.3'
1182--- docs/man/memcached_auto.3 2012-05-22 19:57:15 +0000
1183+++ docs/man/memcached_auto.3 2012-08-14 00:00:29 +0000
1184@@ -1,4 +1,4 @@
1185-.TH "MEMCACHED_AUTO" "3" "May 22, 2012" "1.0.8" "libmemcached"
1186+.TH "MEMCACHED_AUTO" "3" "August 02, 2012" "1.0.10" "libmemcached"
1187 .SH NAME
1188 memcached_auto \- Incrementing and Decrementing Values
1189 .
1190
1191=== modified file 'docs/man/memcached_behavior.3'
1192--- docs/man/memcached_behavior.3 2012-05-22 19:57:15 +0000
1193+++ docs/man/memcached_behavior.3 2012-08-14 00:00:29 +0000
1194@@ -1,4 +1,4 @@
1195-.TH "MEMCACHED_BEHAVIOR" "3" "May 22, 2012" "1.0.8" "libmemcached"
1196+.TH "MEMCACHED_BEHAVIOR" "3" "August 02, 2012" "1.0.10" "libmemcached"
1197 .SH NAME
1198 memcached_behavior \- libmemcached Documentation
1199 .
1200@@ -211,7 +211,7 @@
1201 .B MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT
1202 .UNINDENT
1203 .sp
1204-In non\-blocking mode this changes the value of the timeout during socket connection.
1205+In non\-blocking mode this changes the value of the timeout during socket connection in milliseconds. Specifying \-1 means an infinite time‐out.
1206 .INDENT 0.0
1207 .TP
1208 .B MEMCACHED_BEHAVIOR_BINARY_PROTOCOL
1209
1210=== modified file 'docs/man/memcached_behavior_get.3'
1211--- docs/man/memcached_behavior_get.3 2012-05-22 19:57:15 +0000
1212+++ docs/man/memcached_behavior_get.3 2012-08-14 00:00:29 +0000
1213@@ -1,4 +1,4 @@
1214-.TH "MEMCACHED_BEHAVIOR_GET" "3" "May 22, 2012" "1.0.8" "libmemcached"
1215+.TH "MEMCACHED_BEHAVIOR_GET" "3" "August 02, 2012" "1.0.10" "libmemcached"
1216 .SH NAME
1217 memcached_behavior_get \- libmemcached Documentation
1218 .
1219@@ -211,7 +211,7 @@
1220 .B MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT
1221 .UNINDENT
1222 .sp
1223-In non\-blocking mode this changes the value of the timeout during socket connection.
1224+In non\-blocking mode this changes the value of the timeout during socket connection in milliseconds. Specifying \-1 means an infinite time‐out.
1225 .INDENT 0.0
1226 .TP
1227 .B MEMCACHED_BEHAVIOR_BINARY_PROTOCOL
1228
1229=== modified file 'docs/man/memcached_behavior_set.3'
1230--- docs/man/memcached_behavior_set.3 2012-05-22 19:57:15 +0000
1231+++ docs/man/memcached_behavior_set.3 2012-08-14 00:00:29 +0000
1232@@ -1,4 +1,4 @@
1233-.TH "MEMCACHED_BEHAVIOR_SET" "3" "May 22, 2012" "1.0.8" "libmemcached"
1234+.TH "MEMCACHED_BEHAVIOR_SET" "3" "August 02, 2012" "1.0.10" "libmemcached"
1235 .SH NAME
1236 memcached_behavior_set \- libmemcached Documentation
1237 .
1238@@ -211,7 +211,7 @@
1239 .B MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT
1240 .UNINDENT
1241 .sp
1242-In non\-blocking mode this changes the value of the timeout during socket connection.
1243+In non\-blocking mode this changes the value of the timeout during socket connection in milliseconds. Specifying \-1 means an infinite time‐out.
1244 .INDENT 0.0
1245 .TP
1246 .B MEMCACHED_BEHAVIOR_BINARY_PROTOCOL
1247
1248=== modified file 'docs/man/memcached_callback.3'
1249--- docs/man/memcached_callback.3 2012-05-22 19:57:15 +0000
1250+++ docs/man/memcached_callback.3 2012-08-14 00:00:29 +0000
1251@@ -1,4 +1,4 @@
1252-.TH "MEMCACHED_CALLBACK" "3" "May 22, 2012" "1.0.8" "libmemcached"
1253+.TH "MEMCACHED_CALLBACK" "3" "August 02, 2012" "1.0.10" "libmemcached"
1254 .SH NAME
1255 memcached_callback \- libmemcached Documentation
1256 .
1257
1258=== modified file 'docs/man/memcached_callback_get.3'
1259--- docs/man/memcached_callback_get.3 2012-05-22 19:57:15 +0000
1260+++ docs/man/memcached_callback_get.3 2012-08-14 00:00:29 +0000
1261@@ -1,4 +1,4 @@
1262-.TH "MEMCACHED_CALLBACK_GET" "3" "May 22, 2012" "1.0.8" "libmemcached"
1263+.TH "MEMCACHED_CALLBACK_GET" "3" "August 02, 2012" "1.0.10" "libmemcached"
1264 .SH NAME
1265 memcached_callback_get \- libmemcached Documentation
1266 .
1267
1268=== modified file 'docs/man/memcached_callback_set.3'
1269--- docs/man/memcached_callback_set.3 2012-05-22 19:57:15 +0000
1270+++ docs/man/memcached_callback_set.3 2012-08-14 00:00:29 +0000
1271@@ -1,4 +1,4 @@
1272-.TH "MEMCACHED_CALLBACK_SET" "3" "May 22, 2012" "1.0.8" "libmemcached"
1273+.TH "MEMCACHED_CALLBACK_SET" "3" "August 02, 2012" "1.0.10" "libmemcached"
1274 .SH NAME
1275 memcached_callback_set \- libmemcached Documentation
1276 .
1277
1278=== modified file 'docs/man/memcached_cas.3'
1279--- docs/man/memcached_cas.3 2012-05-22 19:57:15 +0000
1280+++ docs/man/memcached_cas.3 2012-08-14 00:00:29 +0000
1281@@ -1,4 +1,4 @@
1282-.TH "MEMCACHED_CAS" "3" "May 22, 2012" "1.0.8" "libmemcached"
1283+.TH "MEMCACHED_CAS" "3" "August 02, 2012" "1.0.10" "libmemcached"
1284 .SH NAME
1285 memcached_cas \- Working with data on the server in an atomic fashion
1286 .
1287
1288=== modified file 'docs/man/memcached_cas_by_key.3'
1289--- docs/man/memcached_cas_by_key.3 2012-05-22 19:57:15 +0000
1290+++ docs/man/memcached_cas_by_key.3 2012-08-14 00:00:29 +0000
1291@@ -1,4 +1,4 @@
1292-.TH "MEMCACHED_CAS_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
1293+.TH "MEMCACHED_CAS_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
1294 .SH NAME
1295 memcached_cas_by_key \- Storing and Replacing Data
1296 .
1297
1298=== modified file 'docs/man/memcached_clone.3'
1299--- docs/man/memcached_clone.3 2012-05-22 19:57:15 +0000
1300+++ docs/man/memcached_clone.3 2012-08-14 00:00:29 +0000
1301@@ -1,4 +1,4 @@
1302-.TH "MEMCACHED_CLONE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1303+.TH "MEMCACHED_CLONE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1304 .SH NAME
1305 memcached_clone \- libmemcached Documentation
1306 .
1307
1308=== modified file 'docs/man/memcached_create.3'
1309--- docs/man/memcached_create.3 2012-05-22 19:57:15 +0000
1310+++ docs/man/memcached_create.3 2012-08-14 00:00:29 +0000
1311@@ -1,4 +1,4 @@
1312-.TH "MEMCACHED_CREATE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1313+.TH "MEMCACHED_CREATE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1314 .SH NAME
1315 memcached_create \- libmemcached Documentation
1316 .
1317
1318=== modified file 'docs/man/memcached_decrement.3'
1319--- docs/man/memcached_decrement.3 2012-05-22 19:57:15 +0000
1320+++ docs/man/memcached_decrement.3 2012-08-14 00:00:29 +0000
1321@@ -1,4 +1,4 @@
1322-.TH "MEMCACHED_DECREMENT" "3" "May 22, 2012" "1.0.8" "libmemcached"
1323+.TH "MEMCACHED_DECREMENT" "3" "August 02, 2012" "1.0.10" "libmemcached"
1324 .SH NAME
1325 memcached_decrement \- Incrementing and Decrementing Values
1326 .
1327
1328=== modified file 'docs/man/memcached_decrement_with_initial.3'
1329--- docs/man/memcached_decrement_with_initial.3 2012-05-22 19:57:15 +0000
1330+++ docs/man/memcached_decrement_with_initial.3 2012-08-14 00:00:29 +0000
1331@@ -1,4 +1,4 @@
1332-.TH "MEMCACHED_DECREMENT_WITH_INITIAL" "3" "May 22, 2012" "1.0.8" "libmemcached"
1333+.TH "MEMCACHED_DECREMENT_WITH_INITIAL" "3" "August 02, 2012" "1.0.10" "libmemcached"
1334 .SH NAME
1335 memcached_decrement_with_initial \- Incrementing and Decrementing Values
1336 .
1337
1338=== modified file 'docs/man/memcached_delete.3'
1339--- docs/man/memcached_delete.3 2012-05-22 19:57:15 +0000
1340+++ docs/man/memcached_delete.3 2012-08-14 00:00:29 +0000
1341@@ -1,4 +1,4 @@
1342-.TH "MEMCACHED_DELETE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1343+.TH "MEMCACHED_DELETE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1344 .SH NAME
1345 memcached_delete \- libmemcached Documentation
1346 .
1347
1348=== modified file 'docs/man/memcached_delete_by_key.3'
1349--- docs/man/memcached_delete_by_key.3 2012-05-22 19:57:15 +0000
1350+++ docs/man/memcached_delete_by_key.3 2012-08-14 00:00:29 +0000
1351@@ -1,4 +1,4 @@
1352-.TH "MEMCACHED_DELETE_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
1353+.TH "MEMCACHED_DELETE_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
1354 .SH NAME
1355 memcached_delete_by_key \- libmemcached Documentation
1356 .
1357
1358=== modified file 'docs/man/memcached_destroy_sasl_auth_data.3'
1359--- docs/man/memcached_destroy_sasl_auth_data.3 2012-05-22 19:57:15 +0000
1360+++ docs/man/memcached_destroy_sasl_auth_data.3 2012-08-14 00:00:29 +0000
1361@@ -1,4 +1,4 @@
1362-.TH "MEMCACHED_DESTROY_SASL_AUTH_DATA" "3" "May 22, 2012" "1.0.8" "libmemcached"
1363+.TH "MEMCACHED_DESTROY_SASL_AUTH_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached"
1364 .SH NAME
1365 memcached_destroy_sasl_auth_data \- libmemcached Documentation
1366 .
1367
1368=== modified file 'docs/man/memcached_dump.3'
1369--- docs/man/memcached_dump.3 2012-05-22 19:57:15 +0000
1370+++ docs/man/memcached_dump.3 2012-08-14 00:00:29 +0000
1371@@ -1,4 +1,4 @@
1372-.TH "MEMCACHED_DUMP" "3" "May 22, 2012" "1.0.8" "libmemcached"
1373+.TH "MEMCACHED_DUMP" "3" "August 02, 2012" "1.0.10" "libmemcached"
1374 .SH NAME
1375 memcached_dump \- libmemcached Documentation
1376 .
1377
1378=== modified file 'docs/man/memcached_exist.3'
1379--- docs/man/memcached_exist.3 2012-05-22 19:57:15 +0000
1380+++ docs/man/memcached_exist.3 2012-08-14 00:00:29 +0000
1381@@ -1,4 +1,4 @@
1382-.TH "MEMCACHED_EXIST" "3" "May 22, 2012" "1.0.8" "libmemcached"
1383+.TH "MEMCACHED_EXIST" "3" "August 02, 2012" "1.0.10" "libmemcached"
1384 .SH NAME
1385 memcached_exist \- libmemcached Documentation
1386 .
1387
1388=== modified file 'docs/man/memcached_exist_by_key.3'
1389--- docs/man/memcached_exist_by_key.3 2012-05-22 19:57:15 +0000
1390+++ docs/man/memcached_exist_by_key.3 2012-08-14 00:00:29 +0000
1391@@ -1,4 +1,4 @@
1392-.TH "MEMCACHED_EXIST_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
1393+.TH "MEMCACHED_EXIST_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
1394 .SH NAME
1395 memcached_exist_by_key \- libmemcached Documentation
1396 .
1397
1398=== modified file 'docs/man/memcached_fetch.3'
1399--- docs/man/memcached_fetch.3 2012-05-22 19:57:15 +0000
1400+++ docs/man/memcached_fetch.3 2012-08-14 00:00:29 +0000
1401@@ -1,4 +1,4 @@
1402-.TH "MEMCACHED_FETCH" "3" "May 22, 2012" "1.0.8" "libmemcached"
1403+.TH "MEMCACHED_FETCH" "3" "August 02, 2012" "1.0.10" "libmemcached"
1404 .SH NAME
1405 memcached_fetch \- Retrieving data from the server
1406 .
1407
1408=== modified file 'docs/man/memcached_fetch_execute.3'
1409--- docs/man/memcached_fetch_execute.3 2012-05-22 19:57:15 +0000
1410+++ docs/man/memcached_fetch_execute.3 2012-08-14 00:00:29 +0000
1411@@ -1,4 +1,4 @@
1412-.TH "MEMCACHED_FETCH_EXECUTE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1413+.TH "MEMCACHED_FETCH_EXECUTE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1414 .SH NAME
1415 memcached_fetch_execute \- Retrieving data from the server
1416 .
1417
1418=== modified file 'docs/man/memcached_fetch_result.3'
1419--- docs/man/memcached_fetch_result.3 2012-05-22 19:57:15 +0000
1420+++ docs/man/memcached_fetch_result.3 2012-08-14 00:00:29 +0000
1421@@ -1,4 +1,4 @@
1422-.TH "MEMCACHED_FETCH_RESULT" "3" "May 22, 2012" "1.0.8" "libmemcached"
1423+.TH "MEMCACHED_FETCH_RESULT" "3" "August 02, 2012" "1.0.10" "libmemcached"
1424 .SH NAME
1425 memcached_fetch_result \- Retrieving data from the server
1426 .
1427
1428=== modified file 'docs/man/memcached_flush.3'
1429--- docs/man/memcached_flush.3 2012-05-22 19:57:15 +0000
1430+++ docs/man/memcached_flush.3 2012-08-14 00:00:29 +0000
1431@@ -1,4 +1,4 @@
1432-.TH "MEMCACHED_FLUSH" "3" "May 22, 2012" "1.0.8" "libmemcached"
1433+.TH "MEMCACHED_FLUSH" "3" "August 02, 2012" "1.0.10" "libmemcached"
1434 .SH NAME
1435 memcached_flush \- libmemcached Documentation
1436 .
1437
1438=== modified file 'docs/man/memcached_flush_buffers.3'
1439--- docs/man/memcached_flush_buffers.3 2012-05-22 19:57:15 +0000
1440+++ docs/man/memcached_flush_buffers.3 2012-08-14 00:00:29 +0000
1441@@ -1,4 +1,4 @@
1442-.TH "MEMCACHED_FLUSH_BUFFERS" "3" "May 22, 2012" "1.0.8" "libmemcached"
1443+.TH "MEMCACHED_FLUSH_BUFFERS" "3" "August 02, 2012" "1.0.10" "libmemcached"
1444 .SH NAME
1445 memcached_flush_buffers \- libmemcached Documentation
1446 .
1447
1448=== modified file 'docs/man/memcached_free.3'
1449--- docs/man/memcached_free.3 2012-05-22 19:57:15 +0000
1450+++ docs/man/memcached_free.3 2012-08-14 00:00:29 +0000
1451@@ -1,4 +1,4 @@
1452-.TH "MEMCACHED_FREE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1453+.TH "MEMCACHED_FREE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1454 .SH NAME
1455 memcached_free \- libmemcached Documentation
1456 .
1457
1458=== modified file 'docs/man/memcached_generate_hash.3'
1459--- docs/man/memcached_generate_hash.3 2012-05-22 19:57:15 +0000
1460+++ docs/man/memcached_generate_hash.3 2012-08-14 00:00:29 +0000
1461@@ -1,4 +1,4 @@
1462-.TH "MEMCACHED_GENERATE_HASH" "3" "May 22, 2012" "1.0.8" "libmemcached"
1463+.TH "MEMCACHED_GENERATE_HASH" "3" "August 02, 2012" "1.0.10" "libmemcached"
1464 .SH NAME
1465 memcached_generate_hash \- Generating hash values directly
1466 .
1467
1468=== modified file 'docs/man/memcached_generate_hash_value.3'
1469--- docs/man/memcached_generate_hash_value.3 2012-05-22 19:57:15 +0000
1470+++ docs/man/memcached_generate_hash_value.3 2012-08-14 00:00:29 +0000
1471@@ -1,4 +1,4 @@
1472-.TH "MEMCACHED_GENERATE_HASH_VALUE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1473+.TH "MEMCACHED_GENERATE_HASH_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1474 .SH NAME
1475 memcached_generate_hash_value \- Generating hash values directly
1476 .
1477
1478=== modified file 'docs/man/memcached_get.3'
1479--- docs/man/memcached_get.3 2012-05-22 19:57:15 +0000
1480+++ docs/man/memcached_get.3 2012-08-14 00:00:29 +0000
1481@@ -1,4 +1,4 @@
1482-.TH "MEMCACHED_GET" "3" "May 22, 2012" "1.0.8" "libmemcached"
1483+.TH "MEMCACHED_GET" "3" "August 02, 2012" "1.0.10" "libmemcached"
1484 .SH NAME
1485 memcached_get \- Retrieving data from the server
1486 .
1487
1488=== modified file 'docs/man/memcached_get_by_key.3'
1489--- docs/man/memcached_get_by_key.3 2012-05-22 19:57:15 +0000
1490+++ docs/man/memcached_get_by_key.3 2012-08-14 00:00:29 +0000
1491@@ -1,4 +1,4 @@
1492-.TH "MEMCACHED_GET_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
1493+.TH "MEMCACHED_GET_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
1494 .SH NAME
1495 memcached_get_by_key \- Retrieving data from the server
1496 .
1497
1498=== modified file 'docs/man/memcached_get_memory_allocators.3'
1499--- docs/man/memcached_get_memory_allocators.3 2012-05-22 19:57:15 +0000
1500+++ docs/man/memcached_get_memory_allocators.3 2012-08-14 00:00:29 +0000
1501@@ -1,4 +1,4 @@
1502-.TH "MEMCACHED_GET_MEMORY_ALLOCATORS" "3" "May 22, 2012" "1.0.8" "libmemcached"
1503+.TH "MEMCACHED_GET_MEMORY_ALLOCATORS" "3" "August 02, 2012" "1.0.10" "libmemcached"
1504 .SH NAME
1505 memcached_get_memory_allocators \- libmemcached Documentation
1506 .
1507
1508=== modified file 'docs/man/memcached_get_sasl_callbacks.3'
1509--- docs/man/memcached_get_sasl_callbacks.3 2012-05-22 19:57:15 +0000
1510+++ docs/man/memcached_get_sasl_callbacks.3 2012-08-14 00:00:29 +0000
1511@@ -1,4 +1,4 @@
1512-.TH "MEMCACHED_GET_SASL_CALLBACKS" "3" "May 22, 2012" "1.0.8" "libmemcached"
1513+.TH "MEMCACHED_GET_SASL_CALLBACKS" "3" "August 02, 2012" "1.0.10" "libmemcached"
1514 .SH NAME
1515 memcached_get_sasl_callbacks \- libmemcached Documentation
1516 .
1517
1518=== modified file 'docs/man/memcached_get_user_data.3'
1519--- docs/man/memcached_get_user_data.3 2012-05-22 19:57:15 +0000
1520+++ docs/man/memcached_get_user_data.3 2012-08-14 00:00:29 +0000
1521@@ -1,4 +1,4 @@
1522-.TH "MEMCACHED_GET_USER_DATA" "3" "May 22, 2012" "1.0.8" "libmemcached"
1523+.TH "MEMCACHED_GET_USER_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached"
1524 .SH NAME
1525 memcached_get_user_data \- libmemcached Documentation
1526 .
1527
1528=== modified file 'docs/man/memcached_increment.3'
1529--- docs/man/memcached_increment.3 2012-05-22 19:57:15 +0000
1530+++ docs/man/memcached_increment.3 2012-08-14 00:00:29 +0000
1531@@ -1,4 +1,4 @@
1532-.TH "MEMCACHED_INCREMENT" "3" "May 22, 2012" "1.0.8" "libmemcached"
1533+.TH "MEMCACHED_INCREMENT" "3" "August 02, 2012" "1.0.10" "libmemcached"
1534 .SH NAME
1535 memcached_increment \- Incrementing and Decrementing Values
1536 .
1537
1538=== modified file 'docs/man/memcached_increment_with_initial.3'
1539--- docs/man/memcached_increment_with_initial.3 2012-05-22 19:57:15 +0000
1540+++ docs/man/memcached_increment_with_initial.3 2012-08-14 00:00:29 +0000
1541@@ -1,4 +1,4 @@
1542-.TH "MEMCACHED_INCREMENT_WITH_INITIAL" "3" "May 22, 2012" "1.0.8" "libmemcached"
1543+.TH "MEMCACHED_INCREMENT_WITH_INITIAL" "3" "August 02, 2012" "1.0.10" "libmemcached"
1544 .SH NAME
1545 memcached_increment_with_initial \- Incrementing and Decrementing Values
1546 .
1547
1548=== modified file 'docs/man/memcached_last_error_message.3'
1549--- docs/man/memcached_last_error_message.3 2012-05-22 19:57:15 +0000
1550+++ docs/man/memcached_last_error_message.3 2012-08-14 00:00:29 +0000
1551@@ -1,4 +1,4 @@
1552-.TH "MEMCACHED_LAST_ERROR_MESSAGE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1553+.TH "MEMCACHED_LAST_ERROR_MESSAGE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1554 .SH NAME
1555 memcached_last_error_message \- libmemcached Documentation
1556 .
1557
1558=== modified file 'docs/man/memcached_lib_version.3'
1559--- docs/man/memcached_lib_version.3 2012-05-22 19:57:15 +0000
1560+++ docs/man/memcached_lib_version.3 2012-08-14 00:00:29 +0000
1561@@ -1,4 +1,4 @@
1562-.TH "MEMCACHED_LIB_VERSION" "3" "May 22, 2012" "1.0.8" "libmemcached"
1563+.TH "MEMCACHED_LIB_VERSION" "3" "August 02, 2012" "1.0.10" "libmemcached"
1564 .SH NAME
1565 memcached_lib_version \- libmemcached Documentation
1566 .
1567
1568=== modified file 'docs/man/memcached_memory_allocators.3'
1569--- docs/man/memcached_memory_allocators.3 2012-05-22 19:57:15 +0000
1570+++ docs/man/memcached_memory_allocators.3 2012-08-14 00:00:29 +0000
1571@@ -1,4 +1,4 @@
1572-.TH "MEMCACHED_MEMORY_ALLOCATORS" "3" "May 22, 2012" "1.0.8" "libmemcached"
1573+.TH "MEMCACHED_MEMORY_ALLOCATORS" "3" "August 02, 2012" "1.0.10" "libmemcached"
1574 .SH NAME
1575 memcached_memory_allocators \- libmemcached Documentation
1576 .
1577
1578=== modified file 'docs/man/memcached_mget.3'
1579--- docs/man/memcached_mget.3 2012-05-22 19:57:15 +0000
1580+++ docs/man/memcached_mget.3 2012-08-14 00:00:29 +0000
1581@@ -1,4 +1,4 @@
1582-.TH "MEMCACHED_MGET" "3" "May 22, 2012" "1.0.8" "libmemcached"
1583+.TH "MEMCACHED_MGET" "3" "August 02, 2012" "1.0.10" "libmemcached"
1584 .SH NAME
1585 memcached_mget \- Retrieving data from the server
1586 .
1587
1588=== modified file 'docs/man/memcached_mget_by_key.3'
1589--- docs/man/memcached_mget_by_key.3 2012-05-22 19:57:15 +0000
1590+++ docs/man/memcached_mget_by_key.3 2012-08-14 00:00:29 +0000
1591@@ -1,4 +1,4 @@
1592-.TH "MEMCACHED_MGET_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
1593+.TH "MEMCACHED_MGET_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
1594 .SH NAME
1595 memcached_mget_by_key \- Retrieving data from the server
1596 .
1597
1598=== modified file 'docs/man/memcached_mget_execute.3'
1599--- docs/man/memcached_mget_execute.3 2012-05-22 19:57:15 +0000
1600+++ docs/man/memcached_mget_execute.3 2012-08-14 00:00:29 +0000
1601@@ -1,4 +1,4 @@
1602-.TH "MEMCACHED_MGET_EXECUTE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1603+.TH "MEMCACHED_MGET_EXECUTE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1604 .SH NAME
1605 memcached_mget_execute \- Retrieving data from the server
1606 .
1607
1608=== modified file 'docs/man/memcached_mget_execute_by_key.3'
1609--- docs/man/memcached_mget_execute_by_key.3 2012-05-22 19:57:15 +0000
1610+++ docs/man/memcached_mget_execute_by_key.3 2012-08-14 00:00:29 +0000
1611@@ -1,4 +1,4 @@
1612-.TH "MEMCACHED_MGET_EXECUTE_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
1613+.TH "MEMCACHED_MGET_EXECUTE_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
1614 .SH NAME
1615 memcached_mget_execute_by_key \- Retrieving data from the server
1616 .
1617
1618=== modified file 'docs/man/memcached_pool.3'
1619--- docs/man/memcached_pool.3 2012-05-22 19:57:15 +0000
1620+++ docs/man/memcached_pool.3 2012-08-14 00:00:29 +0000
1621@@ -1,4 +1,4 @@
1622-.TH "MEMCACHED_POOL" "3" "May 22, 2012" "1.0.8" "libmemcached"
1623+.TH "MEMCACHED_POOL" "3" "August 02, 2012" "1.0.10" "libmemcached"
1624 .SH NAME
1625 memcached_pool \- libmemcached Documentation
1626 .
1627
1628=== modified file 'docs/man/memcached_pool_behavior_get.3'
1629--- docs/man/memcached_pool_behavior_get.3 2012-05-22 19:57:15 +0000
1630+++ docs/man/memcached_pool_behavior_get.3 2012-08-14 00:00:29 +0000
1631@@ -1,4 +1,4 @@
1632-.TH "MEMCACHED_POOL_BEHAVIOR_GET" "3" "May 22, 2012" "1.0.8" "libmemcached"
1633+.TH "MEMCACHED_POOL_BEHAVIOR_GET" "3" "August 02, 2012" "1.0.10" "libmemcached"
1634 .SH NAME
1635 memcached_pool_behavior_get \- libmemcached Documentation
1636 .
1637
1638=== modified file 'docs/man/memcached_pool_behavior_set.3'
1639--- docs/man/memcached_pool_behavior_set.3 2012-05-22 19:57:15 +0000
1640+++ docs/man/memcached_pool_behavior_set.3 2012-08-14 00:00:29 +0000
1641@@ -1,4 +1,4 @@
1642-.TH "MEMCACHED_POOL_BEHAVIOR_SET" "3" "May 22, 2012" "1.0.8" "libmemcached"
1643+.TH "MEMCACHED_POOL_BEHAVIOR_SET" "3" "August 02, 2012" "1.0.10" "libmemcached"
1644 .SH NAME
1645 memcached_pool_behavior_set \- libmemcached Documentation
1646 .
1647
1648=== modified file 'docs/man/memcached_pool_create.3'
1649--- docs/man/memcached_pool_create.3 2012-05-22 19:57:15 +0000
1650+++ docs/man/memcached_pool_create.3 2012-08-14 00:00:29 +0000
1651@@ -1,4 +1,4 @@
1652-.TH "MEMCACHED_POOL_CREATE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1653+.TH "MEMCACHED_POOL_CREATE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1654 .SH NAME
1655 memcached_pool_create \- libmemcached Documentation
1656 .
1657
1658=== modified file 'docs/man/memcached_pool_destroy.3'
1659--- docs/man/memcached_pool_destroy.3 2012-05-22 19:57:15 +0000
1660+++ docs/man/memcached_pool_destroy.3 2012-08-14 00:00:29 +0000
1661@@ -1,4 +1,4 @@
1662-.TH "MEMCACHED_POOL_DESTROY" "3" "May 22, 2012" "1.0.8" "libmemcached"
1663+.TH "MEMCACHED_POOL_DESTROY" "3" "August 02, 2012" "1.0.10" "libmemcached"
1664 .SH NAME
1665 memcached_pool_destroy \- libmemcached Documentation
1666 .
1667
1668=== modified file 'docs/man/memcached_pool_fetch.3'
1669--- docs/man/memcached_pool_fetch.3 2012-05-22 19:57:15 +0000
1670+++ docs/man/memcached_pool_fetch.3 2012-08-14 00:00:29 +0000
1671@@ -1,4 +1,4 @@
1672-.TH "MEMCACHED_POOL_FETCH" "3" "May 22, 2012" "1.0.8" "libmemcached"
1673+.TH "MEMCACHED_POOL_FETCH" "3" "August 02, 2012" "1.0.10" "libmemcached"
1674 .SH NAME
1675 memcached_pool_fetch \- libmemcached Documentation
1676 .
1677
1678=== modified file 'docs/man/memcached_pool_pop.3'
1679--- docs/man/memcached_pool_pop.3 2012-05-22 19:57:15 +0000
1680+++ docs/man/memcached_pool_pop.3 2012-08-14 00:00:29 +0000
1681@@ -1,4 +1,4 @@
1682-.TH "MEMCACHED_POOL_POP" "3" "May 22, 2012" "1.0.8" "libmemcached"
1683+.TH "MEMCACHED_POOL_POP" "3" "August 02, 2012" "1.0.10" "libmemcached"
1684 .SH NAME
1685 memcached_pool_pop \- libmemcached Documentation
1686 .
1687
1688=== modified file 'docs/man/memcached_pool_push.3'
1689--- docs/man/memcached_pool_push.3 2012-05-22 19:57:15 +0000
1690+++ docs/man/memcached_pool_push.3 2012-08-14 00:00:29 +0000
1691@@ -1,4 +1,4 @@
1692-.TH "MEMCACHED_POOL_PUSH" "3" "May 22, 2012" "1.0.8" "libmemcached"
1693+.TH "MEMCACHED_POOL_PUSH" "3" "August 02, 2012" "1.0.10" "libmemcached"
1694 .SH NAME
1695 memcached_pool_push \- libmemcached Documentation
1696 .
1697
1698=== modified file 'docs/man/memcached_pool_release.3'
1699--- docs/man/memcached_pool_release.3 2012-05-22 19:57:15 +0000
1700+++ docs/man/memcached_pool_release.3 2012-08-14 00:00:29 +0000
1701@@ -1,4 +1,4 @@
1702-.TH "MEMCACHED_POOL_RELEASE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1703+.TH "MEMCACHED_POOL_RELEASE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1704 .SH NAME
1705 memcached_pool_release \- libmemcached Documentation
1706 .
1707
1708=== modified file 'docs/man/memcached_pool_st.3'
1709--- docs/man/memcached_pool_st.3 2012-05-22 19:57:15 +0000
1710+++ docs/man/memcached_pool_st.3 2012-08-14 00:00:29 +0000
1711@@ -1,4 +1,4 @@
1712-.TH "MEMCACHED_POOL_ST" "3" "May 22, 2012" "1.0.8" "libmemcached"
1713+.TH "MEMCACHED_POOL_ST" "3" "August 02, 2012" "1.0.10" "libmemcached"
1714 .SH NAME
1715 memcached_pool_st \- libmemcached Documentation
1716 .
1717
1718=== modified file 'docs/man/memcached_prepend.3'
1719--- docs/man/memcached_prepend.3 2012-05-22 19:57:15 +0000
1720+++ docs/man/memcached_prepend.3 2012-08-14 00:00:29 +0000
1721@@ -1,4 +1,4 @@
1722-.TH "MEMCACHED_PREPEND" "3" "May 22, 2012" "1.0.8" "libmemcached"
1723+.TH "MEMCACHED_PREPEND" "3" "August 02, 2012" "1.0.10" "libmemcached"
1724 .SH NAME
1725 memcached_prepend \- Appending to or Prepending to data on the server
1726 .
1727
1728=== modified file 'docs/man/memcached_prepend_by_key.3'
1729--- docs/man/memcached_prepend_by_key.3 2012-05-22 19:57:15 +0000
1730+++ docs/man/memcached_prepend_by_key.3 2012-08-14 00:00:29 +0000
1731@@ -1,4 +1,4 @@
1732-.TH "MEMCACHED_PREPEND_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
1733+.TH "MEMCACHED_PREPEND_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
1734 .SH NAME
1735 memcached_prepend_by_key \- Appending to or Prepending to data on the server
1736 .
1737
1738=== modified file 'docs/man/memcached_quit.3'
1739--- docs/man/memcached_quit.3 2012-05-22 19:57:15 +0000
1740+++ docs/man/memcached_quit.3 2012-08-14 00:00:29 +0000
1741@@ -1,4 +1,4 @@
1742-.TH "MEMCACHED_QUIT" "3" "May 22, 2012" "1.0.8" "libmemcached"
1743+.TH "MEMCACHED_QUIT" "3" "August 02, 2012" "1.0.10" "libmemcached"
1744 .SH NAME
1745 memcached_quit \- libmemcached Documentation
1746 .
1747
1748=== modified file 'docs/man/memcached_replace.3'
1749--- docs/man/memcached_replace.3 2012-05-22 19:57:15 +0000
1750+++ docs/man/memcached_replace.3 2012-08-14 00:00:29 +0000
1751@@ -1,4 +1,4 @@
1752-.TH "MEMCACHED_REPLACE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1753+.TH "MEMCACHED_REPLACE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1754 .SH NAME
1755 memcached_replace \- Storing and Replacing Data
1756 .
1757
1758=== modified file 'docs/man/memcached_replace_by_key.3'
1759--- docs/man/memcached_replace_by_key.3 2012-05-22 19:57:15 +0000
1760+++ docs/man/memcached_replace_by_key.3 2012-08-14 00:00:29 +0000
1761@@ -1,4 +1,4 @@
1762-.TH "MEMCACHED_REPLACE_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
1763+.TH "MEMCACHED_REPLACE_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
1764 .SH NAME
1765 memcached_replace_by_key \- Storing and Replacing Data
1766 .
1767
1768=== modified file 'docs/man/memcached_result_cas.3'
1769--- docs/man/memcached_result_cas.3 2012-05-22 19:57:15 +0000
1770+++ docs/man/memcached_result_cas.3 2012-08-14 00:00:29 +0000
1771@@ -1,4 +1,4 @@
1772-.TH "MEMCACHED_RESULT_CAS" "3" "May 22, 2012" "1.0.8" "libmemcached"
1773+.TH "MEMCACHED_RESULT_CAS" "3" "August 02, 2012" "1.0.10" "libmemcached"
1774 .SH NAME
1775 memcached_result_cas \- Working with result sets
1776 .
1777
1778=== modified file 'docs/man/memcached_result_create.3'
1779--- docs/man/memcached_result_create.3 2012-05-22 19:57:15 +0000
1780+++ docs/man/memcached_result_create.3 2012-08-14 00:00:29 +0000
1781@@ -1,4 +1,4 @@
1782-.TH "MEMCACHED_RESULT_CREATE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1783+.TH "MEMCACHED_RESULT_CREATE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1784 .SH NAME
1785 memcached_result_create \- Working with result sets
1786 .
1787
1788=== modified file 'docs/man/memcached_result_flags.3'
1789--- docs/man/memcached_result_flags.3 2012-05-22 19:57:15 +0000
1790+++ docs/man/memcached_result_flags.3 2012-08-14 00:00:29 +0000
1791@@ -1,4 +1,4 @@
1792-.TH "MEMCACHED_RESULT_FLAGS" "3" "May 22, 2012" "1.0.8" "libmemcached"
1793+.TH "MEMCACHED_RESULT_FLAGS" "3" "August 02, 2012" "1.0.10" "libmemcached"
1794 .SH NAME
1795 memcached_result_flags \- Working with result sets
1796 .
1797
1798=== modified file 'docs/man/memcached_result_free.3'
1799--- docs/man/memcached_result_free.3 2012-05-22 19:57:15 +0000
1800+++ docs/man/memcached_result_free.3 2012-08-14 00:00:29 +0000
1801@@ -1,4 +1,4 @@
1802-.TH "MEMCACHED_RESULT_FREE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1803+.TH "MEMCACHED_RESULT_FREE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1804 .SH NAME
1805 memcached_result_free \- Working with result sets
1806 .
1807
1808=== modified file 'docs/man/memcached_result_key_length.3'
1809--- docs/man/memcached_result_key_length.3 2012-05-22 19:57:15 +0000
1810+++ docs/man/memcached_result_key_length.3 2012-08-14 00:00:29 +0000
1811@@ -1,4 +1,4 @@
1812-.TH "MEMCACHED_RESULT_KEY_LENGTH" "3" "May 22, 2012" "1.0.8" "libmemcached"
1813+.TH "MEMCACHED_RESULT_KEY_LENGTH" "3" "August 02, 2012" "1.0.10" "libmemcached"
1814 .SH NAME
1815 memcached_result_key_length \- Working with result sets
1816 .
1817
1818=== modified file 'docs/man/memcached_result_key_value.3'
1819--- docs/man/memcached_result_key_value.3 2012-05-22 19:57:15 +0000
1820+++ docs/man/memcached_result_key_value.3 2012-08-14 00:00:29 +0000
1821@@ -1,4 +1,4 @@
1822-.TH "MEMCACHED_RESULT_KEY_VALUE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1823+.TH "MEMCACHED_RESULT_KEY_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1824 .SH NAME
1825 memcached_result_key_value \- Working with result sets
1826 .
1827
1828=== modified file 'docs/man/memcached_result_length.3'
1829--- docs/man/memcached_result_length.3 2012-05-22 19:57:15 +0000
1830+++ docs/man/memcached_result_length.3 2012-08-14 00:00:29 +0000
1831@@ -1,4 +1,4 @@
1832-.TH "MEMCACHED_RESULT_LENGTH" "3" "May 22, 2012" "1.0.8" "libmemcached"
1833+.TH "MEMCACHED_RESULT_LENGTH" "3" "August 02, 2012" "1.0.10" "libmemcached"
1834 .SH NAME
1835 memcached_result_length \- Working with result sets
1836 .
1837
1838=== modified file 'docs/man/memcached_result_st.3'
1839--- docs/man/memcached_result_st.3 2012-05-22 19:57:15 +0000
1840+++ docs/man/memcached_result_st.3 2012-08-14 00:00:29 +0000
1841@@ -1,4 +1,4 @@
1842-.TH "MEMCACHED_RESULT_ST" "3" "May 22, 2012" "1.0.8" "libmemcached"
1843+.TH "MEMCACHED_RESULT_ST" "3" "August 02, 2012" "1.0.10" "libmemcached"
1844 .SH NAME
1845 memcached_result_st \- Working with result sets
1846 .
1847
1848=== modified file 'docs/man/memcached_result_value.3'
1849--- docs/man/memcached_result_value.3 2012-05-22 19:57:15 +0000
1850+++ docs/man/memcached_result_value.3 2012-08-14 00:00:29 +0000
1851@@ -1,4 +1,4 @@
1852-.TH "MEMCACHED_RESULT_VALUE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1853+.TH "MEMCACHED_RESULT_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1854 .SH NAME
1855 memcached_result_value \- Working with result sets
1856 .
1857
1858=== modified file 'docs/man/memcached_return_t.3'
1859--- docs/man/memcached_return_t.3 2012-05-22 19:57:15 +0000
1860+++ docs/man/memcached_return_t.3 2012-08-14 00:00:29 +0000
1861@@ -1,4 +1,4 @@
1862-.TH "MEMCACHED_RETURN_T" "3" "May 22, 2012" "1.0.8" "libmemcached"
1863+.TH "MEMCACHED_RETURN_T" "3" "August 02, 2012" "1.0.10" "libmemcached"
1864 .SH NAME
1865 memcached_return_t \- Return type values
1866 .
1867
1868=== modified file 'docs/man/memcached_sasl.3'
1869--- docs/man/memcached_sasl.3 2012-05-22 19:57:15 +0000
1870+++ docs/man/memcached_sasl.3 2012-08-14 00:00:29 +0000
1871@@ -1,4 +1,4 @@
1872-.TH "MEMCACHED_SASL" "3" "May 22, 2012" "1.0.8" "libmemcached"
1873+.TH "MEMCACHED_SASL" "3" "August 02, 2012" "1.0.10" "libmemcached"
1874 .SH NAME
1875 memcached_sasl \- libmemcached Documentation
1876 .
1877
1878=== modified file 'docs/man/memcached_sasl_set_auth_data.3'
1879--- docs/man/memcached_sasl_set_auth_data.3 2012-05-22 19:57:15 +0000
1880+++ docs/man/memcached_sasl_set_auth_data.3 2012-08-14 00:00:29 +0000
1881@@ -1,4 +1,4 @@
1882-.TH "MEMCACHED_SASL_SET_AUTH_DATA" "3" "May 22, 2012" "1.0.8" "libmemcached"
1883+.TH "MEMCACHED_SASL_SET_AUTH_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached"
1884 .SH NAME
1885 memcached_sasl_set_auth_data \- libmemcached Documentation
1886 .
1887
1888=== modified file 'docs/man/memcached_server_add.3'
1889--- docs/man/memcached_server_add.3 2012-05-22 19:57:15 +0000
1890+++ docs/man/memcached_server_add.3 2012-08-14 00:00:29 +0000
1891@@ -1,4 +1,4 @@
1892-.TH "MEMCACHED_SERVER_ADD" "3" "May 22, 2012" "1.0.8" "libmemcached"
1893+.TH "MEMCACHED_SERVER_ADD" "3" "August 02, 2012" "1.0.10" "libmemcached"
1894 .SH NAME
1895 memcached_server_add \- libmemcached Documentation
1896 .
1897
1898=== modified file 'docs/man/memcached_server_add_unix_socket.3'
1899--- docs/man/memcached_server_add_unix_socket.3 2012-05-22 19:57:15 +0000
1900+++ docs/man/memcached_server_add_unix_socket.3 2012-08-14 00:00:29 +0000
1901@@ -1,4 +1,4 @@
1902-.TH "MEMCACHED_SERVER_ADD_UNIX_SOCKET" "3" "May 22, 2012" "1.0.8" "libmemcached"
1903+.TH "MEMCACHED_SERVER_ADD_UNIX_SOCKET" "3" "August 02, 2012" "1.0.10" "libmemcached"
1904 .SH NAME
1905 memcached_server_add_unix_socket \- libmemcached Documentation
1906 .
1907
1908=== modified file 'docs/man/memcached_server_count.3'
1909--- docs/man/memcached_server_count.3 2012-05-22 19:57:15 +0000
1910+++ docs/man/memcached_server_count.3 2012-08-14 00:00:29 +0000
1911@@ -1,4 +1,4 @@
1912-.TH "MEMCACHED_SERVER_COUNT" "3" "May 22, 2012" "1.0.8" "libmemcached"
1913+.TH "MEMCACHED_SERVER_COUNT" "3" "August 02, 2012" "1.0.10" "libmemcached"
1914 .SH NAME
1915 memcached_server_count \- libmemcached Documentation
1916 .
1917
1918=== modified file 'docs/man/memcached_server_cursor.3'
1919--- docs/man/memcached_server_cursor.3 2012-05-22 19:57:15 +0000
1920+++ docs/man/memcached_server_cursor.3 2012-08-14 00:00:29 +0000
1921@@ -1,4 +1,4 @@
1922-.TH "MEMCACHED_SERVER_CURSOR" "3" "May 22, 2012" "1.0.8" "libmemcached"
1923+.TH "MEMCACHED_SERVER_CURSOR" "3" "August 02, 2012" "1.0.10" "libmemcached"
1924 .SH NAME
1925 memcached_server_cursor \- libmemcached Documentation
1926 .
1927
1928=== modified file 'docs/man/memcached_server_list.3'
1929--- docs/man/memcached_server_list.3 2012-05-22 19:57:15 +0000
1930+++ docs/man/memcached_server_list.3 2012-08-14 00:00:29 +0000
1931@@ -1,4 +1,4 @@
1932-.TH "MEMCACHED_SERVER_LIST" "3" "May 22, 2012" "1.0.8" "libmemcached"
1933+.TH "MEMCACHED_SERVER_LIST" "3" "August 02, 2012" "1.0.10" "libmemcached"
1934 .SH NAME
1935 memcached_server_list \- libmemcached Documentation
1936 .
1937
1938=== modified file 'docs/man/memcached_server_list_append.3'
1939--- docs/man/memcached_server_list_append.3 2012-05-22 19:57:15 +0000
1940+++ docs/man/memcached_server_list_append.3 2012-08-14 00:00:29 +0000
1941@@ -1,4 +1,4 @@
1942-.TH "MEMCACHED_SERVER_LIST_APPEND" "3" "May 22, 2012" "1.0.8" "libmemcached"
1943+.TH "MEMCACHED_SERVER_LIST_APPEND" "3" "August 02, 2012" "1.0.10" "libmemcached"
1944 .SH NAME
1945 memcached_server_list_append \- libmemcached Documentation
1946 .
1947
1948=== modified file 'docs/man/memcached_server_list_count.3'
1949--- docs/man/memcached_server_list_count.3 2012-05-22 19:57:15 +0000
1950+++ docs/man/memcached_server_list_count.3 2012-08-14 00:00:29 +0000
1951@@ -1,4 +1,4 @@
1952-.TH "MEMCACHED_SERVER_LIST_COUNT" "3" "May 22, 2012" "1.0.8" "libmemcached"
1953+.TH "MEMCACHED_SERVER_LIST_COUNT" "3" "August 02, 2012" "1.0.10" "libmemcached"
1954 .SH NAME
1955 memcached_server_list_count \- libmemcached Documentation
1956 .
1957
1958=== modified file 'docs/man/memcached_server_list_free.3'
1959--- docs/man/memcached_server_list_free.3 2012-05-22 19:57:15 +0000
1960+++ docs/man/memcached_server_list_free.3 2012-08-14 00:00:29 +0000
1961@@ -1,4 +1,4 @@
1962-.TH "MEMCACHED_SERVER_LIST_FREE" "3" "May 22, 2012" "1.0.8" "libmemcached"
1963+.TH "MEMCACHED_SERVER_LIST_FREE" "3" "August 02, 2012" "1.0.10" "libmemcached"
1964 .SH NAME
1965 memcached_server_list_free \- libmemcached Documentation
1966 .
1967
1968=== modified file 'docs/man/memcached_server_push.3'
1969--- docs/man/memcached_server_push.3 2012-05-22 19:57:15 +0000
1970+++ docs/man/memcached_server_push.3 2012-08-14 00:00:29 +0000
1971@@ -1,4 +1,4 @@
1972-.TH "MEMCACHED_SERVER_PUSH" "3" "May 22, 2012" "1.0.8" "libmemcached"
1973+.TH "MEMCACHED_SERVER_PUSH" "3" "August 02, 2012" "1.0.10" "libmemcached"
1974 .SH NAME
1975 memcached_server_push \- libmemcached Documentation
1976 .
1977
1978=== modified file 'docs/man/memcached_server_st.3'
1979--- docs/man/memcached_server_st.3 2012-05-22 19:57:15 +0000
1980+++ docs/man/memcached_server_st.3 2012-08-14 00:00:29 +0000
1981@@ -1,4 +1,4 @@
1982-.TH "MEMCACHED_SERVER_ST" "3" "May 22, 2012" "1.0.8" "libmemcached"
1983+.TH "MEMCACHED_SERVER_ST" "3" "August 02, 2012" "1.0.10" "libmemcached"
1984 .SH NAME
1985 memcached_server_st \- libmemcached Documentation
1986 .
1987
1988=== modified file 'docs/man/memcached_servers.3'
1989--- docs/man/memcached_servers.3 2012-05-22 19:57:15 +0000
1990+++ docs/man/memcached_servers.3 2012-08-14 00:00:29 +0000
1991@@ -1,4 +1,4 @@
1992-.TH "MEMCACHED_SERVERS" "3" "May 22, 2012" "1.0.8" "libmemcached"
1993+.TH "MEMCACHED_SERVERS" "3" "August 02, 2012" "1.0.10" "libmemcached"
1994 .SH NAME
1995 memcached_servers \- libmemcached Documentation
1996 .
1997
1998=== modified file 'docs/man/memcached_servers_parse.3'
1999--- docs/man/memcached_servers_parse.3 2012-05-22 19:57:15 +0000
2000+++ docs/man/memcached_servers_parse.3 2012-08-14 00:00:29 +0000
2001@@ -1,4 +1,4 @@
2002-.TH "MEMCACHED_SERVERS_PARSE" "3" "May 22, 2012" "1.0.8" "libmemcached"
2003+.TH "MEMCACHED_SERVERS_PARSE" "3" "August 02, 2012" "1.0.10" "libmemcached"
2004 .SH NAME
2005 memcached_servers_parse \- libmemcached Documentation
2006 .
2007
2008=== modified file 'docs/man/memcached_servers_reset.3'
2009--- docs/man/memcached_servers_reset.3 2012-05-22 19:57:15 +0000
2010+++ docs/man/memcached_servers_reset.3 2012-08-14 00:00:29 +0000
2011@@ -1,4 +1,4 @@
2012-.TH "MEMCACHED_SERVERS_RESET" "3" "May 22, 2012" "1.0.8" "libmemcached"
2013+.TH "MEMCACHED_SERVERS_RESET" "3" "August 02, 2012" "1.0.10" "libmemcached"
2014 .SH NAME
2015 memcached_servers_reset \- libmemcached Documentation
2016 .
2017
2018=== modified file 'docs/man/memcached_set.3'
2019--- docs/man/memcached_set.3 2012-05-22 19:57:15 +0000
2020+++ docs/man/memcached_set.3 2012-08-14 00:00:29 +0000
2021@@ -1,4 +1,4 @@
2022-.TH "MEMCACHED_SET" "3" "May 22, 2012" "1.0.8" "libmemcached"
2023+.TH "MEMCACHED_SET" "3" "August 02, 2012" "1.0.10" "libmemcached"
2024 .SH NAME
2025 memcached_set \- Storing and Replacing Data
2026 .
2027
2028=== modified file 'docs/man/memcached_set_by_key.3'
2029--- docs/man/memcached_set_by_key.3 2012-05-22 19:57:15 +0000
2030+++ docs/man/memcached_set_by_key.3 2012-08-14 00:00:29 +0000
2031@@ -1,4 +1,4 @@
2032-.TH "MEMCACHED_SET_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
2033+.TH "MEMCACHED_SET_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
2034 .SH NAME
2035 memcached_set_by_key \- Storing and Replacing Data
2036 .
2037
2038=== modified file 'docs/man/memcached_set_encoding_key.3'
2039--- docs/man/memcached_set_encoding_key.3 2012-05-22 19:57:15 +0000
2040+++ docs/man/memcached_set_encoding_key.3 2012-08-14 00:00:29 +0000
2041@@ -1,4 +1,4 @@
2042-.TH "MEMCACHED_SET_ENCODING_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
2043+.TH "MEMCACHED_SET_ENCODING_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
2044 .SH NAME
2045 memcached_set_encoding_key \- libmemcached Documentation
2046 .
2047
2048=== modified file 'docs/man/memcached_set_memory_allocators.3'
2049--- docs/man/memcached_set_memory_allocators.3 2012-05-22 19:57:15 +0000
2050+++ docs/man/memcached_set_memory_allocators.3 2012-08-14 00:00:29 +0000
2051@@ -1,4 +1,4 @@
2052-.TH "MEMCACHED_SET_MEMORY_ALLOCATORS" "3" "May 22, 2012" "1.0.8" "libmemcached"
2053+.TH "MEMCACHED_SET_MEMORY_ALLOCATORS" "3" "August 02, 2012" "1.0.10" "libmemcached"
2054 .SH NAME
2055 memcached_set_memory_allocators \- libmemcached Documentation
2056 .
2057
2058=== modified file 'docs/man/memcached_set_memory_allocators_context.3'
2059--- docs/man/memcached_set_memory_allocators_context.3 2012-05-22 19:57:15 +0000
2060+++ docs/man/memcached_set_memory_allocators_context.3 2012-08-14 00:00:29 +0000
2061@@ -1,4 +1,4 @@
2062-.TH "MEMCACHED_SET_MEMORY_ALLOCATORS_CONTEXT" "3" "May 22, 2012" "1.0.8" "libmemcached"
2063+.TH "MEMCACHED_SET_MEMORY_ALLOCATORS_CONTEXT" "3" "August 02, 2012" "1.0.10" "libmemcached"
2064 .SH NAME
2065 memcached_set_memory_allocators_context \- libmemcached Documentation
2066 .
2067
2068=== modified file 'docs/man/memcached_set_sasl_callbacks.3'
2069--- docs/man/memcached_set_sasl_callbacks.3 2012-05-22 19:57:15 +0000
2070+++ docs/man/memcached_set_sasl_callbacks.3 2012-08-14 00:00:29 +0000
2071@@ -1,4 +1,4 @@
2072-.TH "MEMCACHED_SET_SASL_CALLBACKS" "3" "May 22, 2012" "1.0.8" "libmemcached"
2073+.TH "MEMCACHED_SET_SASL_CALLBACKS" "3" "August 02, 2012" "1.0.10" "libmemcached"
2074 .SH NAME
2075 memcached_set_sasl_callbacks \- libmemcached Documentation
2076 .
2077
2078=== modified file 'docs/man/memcached_set_user_data.3'
2079--- docs/man/memcached_set_user_data.3 2012-05-22 19:57:15 +0000
2080+++ docs/man/memcached_set_user_data.3 2012-08-14 00:00:29 +0000
2081@@ -1,4 +1,4 @@
2082-.TH "MEMCACHED_SET_USER_DATA" "3" "May 22, 2012" "1.0.8" "libmemcached"
2083+.TH "MEMCACHED_SET_USER_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached"
2084 .SH NAME
2085 memcached_set_user_data \- libmemcached Documentation
2086 .
2087
2088=== modified file 'docs/man/memcached_stat.3'
2089--- docs/man/memcached_stat.3 2012-05-22 19:57:15 +0000
2090+++ docs/man/memcached_stat.3 2012-08-14 00:00:29 +0000
2091@@ -1,4 +1,4 @@
2092-.TH "MEMCACHED_STAT" "3" "May 22, 2012" "1.0.8" "libmemcached"
2093+.TH "MEMCACHED_STAT" "3" "August 02, 2012" "1.0.10" "libmemcached"
2094 .SH NAME
2095 memcached_stat \- libmemcached Documentation
2096 .
2097
2098=== modified file 'docs/man/memcached_stat_execute.3'
2099--- docs/man/memcached_stat_execute.3 2012-05-22 19:57:15 +0000
2100+++ docs/man/memcached_stat_execute.3 2012-08-14 00:00:29 +0000
2101@@ -1,4 +1,4 @@
2102-.TH "MEMCACHED_STAT_EXECUTE" "3" "May 22, 2012" "1.0.8" "libmemcached"
2103+.TH "MEMCACHED_STAT_EXECUTE" "3" "August 02, 2012" "1.0.10" "libmemcached"
2104 .SH NAME
2105 memcached_stat_execute \- libmemcached Documentation
2106 .
2107
2108=== modified file 'docs/man/memcached_stat_get_keys.3'
2109--- docs/man/memcached_stat_get_keys.3 2012-05-22 19:57:15 +0000
2110+++ docs/man/memcached_stat_get_keys.3 2012-08-14 00:00:29 +0000
2111@@ -1,4 +1,4 @@
2112-.TH "MEMCACHED_STAT_GET_KEYS" "3" "May 22, 2012" "1.0.8" "libmemcached"
2113+.TH "MEMCACHED_STAT_GET_KEYS" "3" "August 02, 2012" "1.0.10" "libmemcached"
2114 .SH NAME
2115 memcached_stat_get_keys \- libmemcached Documentation
2116 .
2117
2118=== modified file 'docs/man/memcached_stat_get_value.3'
2119--- docs/man/memcached_stat_get_value.3 2012-05-22 19:57:15 +0000
2120+++ docs/man/memcached_stat_get_value.3 2012-08-14 00:00:29 +0000
2121@@ -1,4 +1,4 @@
2122-.TH "MEMCACHED_STAT_GET_VALUE" "3" "May 22, 2012" "1.0.8" "libmemcached"
2123+.TH "MEMCACHED_STAT_GET_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached"
2124 .SH NAME
2125 memcached_stat_get_value \- libmemcached Documentation
2126 .
2127
2128=== modified file 'docs/man/memcached_stat_servername.3'
2129--- docs/man/memcached_stat_servername.3 2012-05-22 19:57:15 +0000
2130+++ docs/man/memcached_stat_servername.3 2012-08-14 00:00:29 +0000
2131@@ -1,4 +1,4 @@
2132-.TH "MEMCACHED_STAT_SERVERNAME" "3" "May 22, 2012" "1.0.8" "libmemcached"
2133+.TH "MEMCACHED_STAT_SERVERNAME" "3" "August 02, 2012" "1.0.10" "libmemcached"
2134 .SH NAME
2135 memcached_stat_servername \- libmemcached Documentation
2136 .
2137
2138=== modified file 'docs/man/memcached_stats.3'
2139--- docs/man/memcached_stats.3 2012-05-22 19:57:15 +0000
2140+++ docs/man/memcached_stats.3 2012-08-14 00:00:29 +0000
2141@@ -1,4 +1,4 @@
2142-.TH "MEMCACHED_STATS" "3" "May 22, 2012" "1.0.8" "libmemcached"
2143+.TH "MEMCACHED_STATS" "3" "August 02, 2012" "1.0.10" "libmemcached"
2144 .SH NAME
2145 memcached_stats \- libmemcached Documentation
2146 .
2147
2148=== modified file 'docs/man/memcached_strerror.3'
2149--- docs/man/memcached_strerror.3 2012-05-22 19:57:15 +0000
2150+++ docs/man/memcached_strerror.3 2012-08-14 00:00:29 +0000
2151@@ -1,4 +1,4 @@
2152-.TH "MEMCACHED_STRERROR" "3" "May 22, 2012" "1.0.8" "libmemcached"
2153+.TH "MEMCACHED_STRERROR" "3" "August 02, 2012" "1.0.10" "libmemcached"
2154 .SH NAME
2155 memcached_strerror \- libmemcached Documentation
2156 .
2157
2158=== modified file 'docs/man/memcached_touch.3'
2159--- docs/man/memcached_touch.3 2012-05-22 19:57:15 +0000
2160+++ docs/man/memcached_touch.3 2012-08-14 00:00:29 +0000
2161@@ -1,4 +1,4 @@
2162-.TH "MEMCACHED_TOUCH" "3" "May 22, 2012" "1.0.8" "libmemcached"
2163+.TH "MEMCACHED_TOUCH" "3" "August 02, 2012" "1.0.10" "libmemcached"
2164 .SH NAME
2165 memcached_touch \- libmemcached Documentation
2166 .
2167
2168=== modified file 'docs/man/memcached_touch_by_key.3'
2169--- docs/man/memcached_touch_by_key.3 2012-05-22 19:57:15 +0000
2170+++ docs/man/memcached_touch_by_key.3 2012-08-14 00:00:29 +0000
2171@@ -1,4 +1,4 @@
2172-.TH "MEMCACHED_TOUCH_BY_KEY" "3" "May 22, 2012" "1.0.8" "libmemcached"
2173+.TH "MEMCACHED_TOUCH_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached"
2174 .SH NAME
2175 memcached_touch_by_key \- libmemcached Documentation
2176 .
2177
2178=== modified file 'docs/man/memcached_user_data.3'
2179--- docs/man/memcached_user_data.3 2012-05-22 19:57:15 +0000
2180+++ docs/man/memcached_user_data.3 2012-08-14 00:00:29 +0000
2181@@ -1,4 +1,4 @@
2182-.TH "MEMCACHED_USER_DATA" "3" "May 22, 2012" "1.0.8" "libmemcached"
2183+.TH "MEMCACHED_USER_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached"
2184 .SH NAME
2185 memcached_user_data \- libmemcached Documentation
2186 .
2187
2188=== modified file 'docs/man/memcached_verbosity.3'
2189--- docs/man/memcached_verbosity.3 2012-05-22 19:57:15 +0000
2190+++ docs/man/memcached_verbosity.3 2012-08-14 00:00:29 +0000
2191@@ -1,4 +1,4 @@
2192-.TH "MEMCACHED_VERBOSITY" "3" "May 22, 2012" "1.0.8" "libmemcached"
2193+.TH "MEMCACHED_VERBOSITY" "3" "August 02, 2012" "1.0.10" "libmemcached"
2194 .SH NAME
2195 memcached_verbosity \- libmemcached Documentation
2196 .
2197
2198=== modified file 'docs/man/memcached_version.3'
2199--- docs/man/memcached_version.3 2012-05-22 19:57:15 +0000
2200+++ docs/man/memcached_version.3 2012-08-14 00:00:29 +0000
2201@@ -1,4 +1,4 @@
2202-.TH "MEMCACHED_VERSION" "3" "May 22, 2012" "1.0.8" "libmemcached"
2203+.TH "MEMCACHED_VERSION" "3" "August 02, 2012" "1.0.10" "libmemcached"
2204 .SH NAME
2205 memcached_version \- libmemcached Documentation
2206 .
2207
2208=== modified file 'docs/man/memcapable.1'
2209--- docs/man/memcapable.1 2012-05-22 19:57:15 +0000
2210+++ docs/man/memcapable.1 2012-08-14 00:00:29 +0000
2211@@ -1,4 +1,4 @@
2212-.TH "MEMCAPABLE" "1" "May 22, 2012" "1.0.8" "libmemcached"
2213+.TH "MEMCAPABLE" "1" "August 02, 2012" "1.0.10" "libmemcached"
2214 .SH NAME
2215 memcapable \- libmemcached Documentation
2216 .
2217
2218=== modified file 'docs/man/memcat.1'
2219--- docs/man/memcat.1 2012-05-22 19:57:15 +0000
2220+++ docs/man/memcat.1 2012-08-14 00:00:29 +0000
2221@@ -1,4 +1,4 @@
2222-.TH "MEMCAT" "1" "May 22, 2012" "1.0.8" "libmemcached"
2223+.TH "MEMCAT" "1" "August 02, 2012" "1.0.10" "libmemcached"
2224 .SH NAME
2225 memcat \- libmemcached Documentation
2226 .
2227
2228=== modified file 'docs/man/memcp.1'
2229--- docs/man/memcp.1 2012-05-22 19:57:15 +0000
2230+++ docs/man/memcp.1 2012-08-14 00:00:29 +0000
2231@@ -1,4 +1,4 @@
2232-.TH "MEMCP" "1" "May 22, 2012" "1.0.8" "libmemcached"
2233+.TH "MEMCP" "1" "August 02, 2012" "1.0.10" "libmemcached"
2234 .SH NAME
2235 memcp \- libmemcached Documentation
2236 .
2237
2238=== modified file 'docs/man/memdump.1'
2239--- docs/man/memdump.1 2012-05-22 19:57:15 +0000
2240+++ docs/man/memdump.1 2012-08-14 00:00:29 +0000
2241@@ -1,4 +1,4 @@
2242-.TH "MEMDUMP" "1" "May 22, 2012" "1.0.8" "libmemcached"
2243+.TH "MEMDUMP" "1" "August 02, 2012" "1.0.10" "libmemcached"
2244 .SH NAME
2245 memdump \- libmemcached Documentation
2246 .
2247
2248=== modified file 'docs/man/memerror.1'
2249--- docs/man/memerror.1 2012-05-22 19:57:15 +0000
2250+++ docs/man/memerror.1 2012-08-14 00:00:29 +0000
2251@@ -1,4 +1,4 @@
2252-.TH "MEMERROR" "1" "May 22, 2012" "1.0.8" "libmemcached"
2253+.TH "MEMERROR" "1" "August 02, 2012" "1.0.10" "libmemcached"
2254 .SH NAME
2255 memerror \- libmemcached Documentation
2256 .
2257
2258=== modified file 'docs/man/memexist.1'
2259--- docs/man/memexist.1 2012-05-22 19:57:15 +0000
2260+++ docs/man/memexist.1 2012-08-14 00:00:29 +0000
2261@@ -1,4 +1,4 @@
2262-.TH "MEMEXIST" "1" "May 22, 2012" "1.0.8" "libmemcached"
2263+.TH "MEMEXIST" "1" "August 02, 2012" "1.0.10" "libmemcached"
2264 .SH NAME
2265 memexist \- libmemcached Documentation
2266 .
2267
2268=== modified file 'docs/man/memflush.1'
2269--- docs/man/memflush.1 2012-05-22 19:57:15 +0000
2270+++ docs/man/memflush.1 2012-08-14 00:00:29 +0000
2271@@ -1,4 +1,4 @@
2272-.TH "MEMFLUSH" "1" "May 22, 2012" "1.0.8" "libmemcached"
2273+.TH "MEMFLUSH" "1" "August 02, 2012" "1.0.10" "libmemcached"
2274 .SH NAME
2275 memflush \- libmemcached Documentation
2276 .
2277
2278=== modified file 'docs/man/memparse.1'
2279--- docs/man/memparse.1 2012-05-22 19:57:15 +0000
2280+++ docs/man/memparse.1 2012-08-14 00:00:29 +0000
2281@@ -1,4 +1,4 @@
2282-.TH "MEMPARSE" "1" "May 22, 2012" "1.0.8" "libmemcached"
2283+.TH "MEMPARSE" "1" "August 02, 2012" "1.0.10" "libmemcached"
2284 .SH NAME
2285 memparse \- libmemcached Documentation
2286 .
2287
2288=== modified file 'docs/man/memping.1'
2289--- docs/man/memping.1 2012-05-22 19:57:15 +0000
2290+++ docs/man/memping.1 2012-08-14 00:00:29 +0000
2291@@ -1,4 +1,4 @@
2292-.TH "MEMPING" "1" "May 22, 2012" "1.0.8" "libmemcached"
2293+.TH "MEMPING" "1" "August 02, 2012" "1.0.10" "libmemcached"
2294 .SH NAME
2295 memping \- libmemcached Documentation
2296 .
2297
2298=== modified file 'docs/man/memrm.1'
2299--- docs/man/memrm.1 2012-05-22 19:57:15 +0000
2300+++ docs/man/memrm.1 2012-08-14 00:00:29 +0000
2301@@ -1,4 +1,4 @@
2302-.TH "MEMRM" "1" "May 22, 2012" "1.0.8" "libmemcached"
2303+.TH "MEMRM" "1" "August 02, 2012" "1.0.10" "libmemcached"
2304 .SH NAME
2305 memrm \- libmemcached Documentation
2306 .
2307
2308=== modified file 'docs/man/memslap.1'
2309--- docs/man/memslap.1 2012-05-22 19:57:15 +0000
2310+++ docs/man/memslap.1 2012-08-14 00:00:29 +0000
2311@@ -1,4 +1,4 @@
2312-.TH "MEMSLAP" "1" "May 22, 2012" "1.0.8" "libmemcached"
2313+.TH "MEMSLAP" "1" "August 02, 2012" "1.0.10" "libmemcached"
2314 .SH NAME
2315 memslap \- libmemcached Documentation
2316 .
2317
2318=== modified file 'docs/man/memstat.1'
2319--- docs/man/memstat.1 2012-05-22 19:57:15 +0000
2320+++ docs/man/memstat.1 2012-08-14 00:00:29 +0000
2321@@ -1,4 +1,4 @@
2322-.TH "MEMSTAT" "1" "May 22, 2012" "1.0.8" "libmemcached"
2323+.TH "MEMSTAT" "1" "August 02, 2012" "1.0.10" "libmemcached"
2324 .SH NAME
2325 memstat \- libmemcached Documentation
2326 .
2327
2328=== modified file 'docs/man/memtouch.1'
2329--- docs/man/memtouch.1 2012-05-22 19:57:15 +0000
2330+++ docs/man/memtouch.1 2012-08-14 00:00:29 +0000
2331@@ -1,4 +1,4 @@
2332-.TH "MEMTOUCH" "1" "May 22, 2012" "1.0.8" "libmemcached"
2333+.TH "MEMTOUCH" "1" "August 02, 2012" "1.0.10" "libmemcached"
2334 .SH NAME
2335 memtouch \- libmemcached Documentation
2336 .
2337
2338=== modified file 'docs/memcached_behavior.rst'
2339--- docs/memcached_behavior.rst 2012-04-27 02:09:29 +0000
2340+++ docs/memcached_behavior.rst 2012-08-14 00:00:29 +0000
2341@@ -164,11 +164,9 @@
2342 Enabling this will cause hosts that are added to be placed in the host list in sorted order. This will defeat consisten hashing.
2343
2344
2345-
2346 .. c:type:: MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT
2347
2348-In non-blocking mode this changes the value of the timeout during socket connection.
2349-
2350+In non-blocking mode this changes the value of the timeout during socket connection in milliseconds. Specifying -1 means an infinite time‐out.
2351
2352
2353 .. c:type:: MEMCACHED_BEHAVIOR_BINARY_PROTOCOL
2354
2355=== modified file 'example/include.am'
2356--- example/include.am 2012-03-02 07:05:55 +0000
2357+++ example/include.am 2012-08-14 00:00:29 +0000
2358@@ -3,25 +3,25 @@
2359 # All paths should be given relative to the root
2360
2361 if HAVE_LIBEVENT
2362-noinst_PROGRAMS += example/memcached_light
2363+noinst_PROGRAMS+= example/memcached_light
2364 endif
2365
2366-noinst_HEADERS+= \
2367- example/byteorder.h \
2368- example/memcached_light.h \
2369- example/storage.h
2370-
2371-example_memcached_light_SOURCES= \
2372- example/byteorder.cc \
2373- example/interface_v0.cc \
2374- example/interface_v1.cc \
2375- example/memcached_light.cc \
2376- util/daemon.cc \
2377- util/pidfile.cc
2378-
2379-example_memcached_light_LDADD= libmemcached/libmemcachedprotocol.la \
2380- $(LIBEVENT_LDFLAGS)
2381-
2382+noinst_HEADERS+= example/byteorder.h
2383+noinst_HEADERS+= example/memcached_light.h
2384+noinst_HEADERS+= example/storage.h
2385+
2386+example_memcached_light_SOURCES=
2387+example_memcached_light_LDADD=
2388+
2389+example_memcached_light_SOURCES+= example/byteorder.cc
2390+example_memcached_light_SOURCES+= example/interface_v0.cc
2391+example_memcached_light_SOURCES+= example/interface_v1.cc
2392+example_memcached_light_SOURCES+= example/memcached_light.cc
2393 example_memcached_light_SOURCES+= example/storage.cc
2394+example_memcached_light_SOURCES+= util/daemon.cc
2395+example_memcached_light_SOURCES+= util/pidfile.cc
2396+
2397+example_memcached_light_LDADD+= libmemcached/libmemcachedprotocol.la
2398+example_memcached_light_LDADD+= $(LIBEVENT_LDFLAGS)
2399
2400 include example/t/include.am
2401
2402=== modified file 'example/memcached_light.cc'
2403--- example/memcached_light.cc 2012-03-08 07:13:01 +0000
2404+++ example/memcached_light.cc 2012-08-14 00:00:29 +0000
2405@@ -77,7 +77,8 @@
2406
2407 options_st() :
2408 service("9999"),
2409- is_verbose(false)
2410+ is_verbose(false),
2411+ opt_daemon(false)
2412 {
2413 }
2414 };
2415
2416=== modified file 'example/t/include.am'
2417--- example/t/include.am 2012-04-24 16:13:12 +0000
2418+++ example/t/include.am 2012-08-14 00:00:29 +0000
2419@@ -13,15 +13,18 @@
2420 libmemcached/libmemcachedutil.la \
2421 libtest/libtest.la
2422
2423+example_t_memcached_light_CXXFLAGS=
2424+example_t_memcached_light_DEPENDENCIES=
2425+example_t_memcached_light_LDADD=
2426 example_t_memcached_light_SOURCES=
2427-example_t_memcached_light_LDADD=
2428
2429 example_t_memcached_light_SOURCES+= example/t/memcached_light.cc
2430 example_t_memcached_light_SOURCES+= tests/libmemcached-1.0/memcached_get.cc
2431 example_t_memcached_light_SOURCES+= tests/libmemcached-1.0/print.cc
2432 example_t_memcached_light_SOURCES+= tests/libmemcached-1.0/setup_and_teardowns.cc
2433-example_t_memcached_light_CXXFLAGS = $(AM_CXXFLAGS)
2434-example_t_memcached_light_DEPENDENCIES= $(MEMCACHED_LIGHT_TESTS_LDADDS) example/memcached_light
2435+example_t_memcached_light_CXXFLAGS+= $(AM_CXXFLAGS)
2436+example_t_memcached_light_DEPENDENCIES+= $(MEMCACHED_LIGHT_TESTS_LDADDS)
2437+example_t_memcached_light_DEPENDENCIES+= example/memcached_light
2438 example_t_memcached_light_LDADD+= $(MEMCACHED_LIGHT_TESTS_LDADDS)
2439 example_t_memcached_light_LDADD+= $(LIBUUID_LDFLAGS)
2440 check_PROGRAMS+= example/t/memcached_light
2441
2442=== modified file 'example/t/memcached_light.cc'
2443--- example/t/memcached_light.cc 2012-05-13 02:05:10 +0000
2444+++ example/t/memcached_light.cc 2012-08-14 00:00:29 +0000
2445@@ -199,6 +199,12 @@
2446
2447 static void *world_create(server_startup_st& servers, test_return_t& error)
2448 {
2449+ if (access(executable.c_str(), X_OK) != 0)
2450+ {
2451+ error= TEST_SKIPPED;
2452+ return NULL;
2453+ }
2454+
2455 if (HAVE_MEMCACHED_LIGHT_BINARY == 0)
2456 {
2457 error= TEST_SKIPPED;
2458@@ -208,6 +214,7 @@
2459 if (server_startup(servers, "memcached-light", libtest::default_port(), 0, NULL) == 0)
2460 {
2461 error= TEST_FAILURE;
2462+ return NULL;
2463 }
2464
2465
2466@@ -231,7 +238,7 @@
2467 }
2468
2469
2470-void get_world(Framework *world)
2471+void get_world(libtest::Framework* world)
2472 {
2473 world->create(world_create);
2474 world->destroy(world_destroy);
2475
2476=== modified file 'libhashkit-1.0/include.am'
2477--- libhashkit-1.0/include.am 2012-04-09 06:35:25 +0000
2478+++ libhashkit-1.0/include.am 2012-08-14 00:00:29 +0000
2479@@ -3,8 +3,8 @@
2480 # All paths should be given relative to the root
2481 #
2482
2483-EXTRA_DIST+= \
2484- libhashkit-1.0/configure.h.in
2485+EXTRA_DIST+= libhashkit-1.0/configure.h.in
2486+BUILT_SOURCES+= libhashkit-1.0/configure.h
2487
2488 nobase_include_HEADERS+= \
2489 libhashkit-1.0/algorithm.h \
2490
2491=== modified file 'libmemcached-1.0/error.h'
2492--- libmemcached-1.0/error.h 2011-10-02 18:02:19 +0000
2493+++ libmemcached-1.0/error.h 2012-08-14 00:00:29 +0000
2494@@ -42,22 +42,22 @@
2495 #endif
2496
2497 LIBMEMCACHED_API
2498- const char *memcached_last_error_message(memcached_st *);
2499+ const char *memcached_last_error_message(const memcached_st *);
2500
2501 LIBMEMCACHED_API
2502 void memcached_error_print(const memcached_st *);
2503
2504 LIBMEMCACHED_API
2505- memcached_return_t memcached_last_error(memcached_st *);
2506-
2507-LIBMEMCACHED_API
2508- int memcached_last_error_errno(memcached_st *);
2509-
2510-LIBMEMCACHED_API
2511- const char *memcached_server_error(memcached_server_instance_st ptr);
2512-
2513-LIBMEMCACHED_API
2514- memcached_return_t memcached_server_error_return(memcached_server_instance_st ptr);
2515+ memcached_return_t memcached_last_error(const memcached_st *);
2516+
2517+LIBMEMCACHED_API
2518+ int memcached_last_error_errno(const memcached_st *);
2519+
2520+LIBMEMCACHED_API
2521+ const char *memcached_server_error(const memcached_server_instance_st ptr);
2522+
2523+LIBMEMCACHED_API
2524+ memcached_return_t memcached_server_error_return(const memcached_server_instance_st ptr);
2525
2526 #ifdef __cplusplus
2527 } // extern "C"
2528
2529=== modified file 'libmemcached-1.0/exist.h'
2530--- libmemcached-1.0/exist.h 2012-04-26 20:25:18 +0000
2531+++ libmemcached-1.0/exist.h 2012-08-14 00:00:29 +0000
2532@@ -36,6 +36,10 @@
2533
2534 #pragma once
2535
2536+#ifdef __cplusplus
2537+extern "C" {
2538+#endif
2539+
2540 LIBMEMCACHED_API
2541 memcached_return_t memcached_exist(memcached_st *memc, const char *key, size_t key_length);
2542
2543@@ -43,3 +47,6 @@
2544 memcached_return_t memcached_exist_by_key(memcached_st *memc,
2545 const char *group_key, size_t group_key_length,
2546 const char *key, size_t key_length);
2547+#ifdef __cplusplus
2548+}
2549+#endif
2550
2551=== modified file 'libmemcached-1.0/include.am'
2552--- libmemcached-1.0/include.am 2012-04-09 06:28:51 +0000
2553+++ libmemcached-1.0/include.am 2012-08-14 00:00:29 +0000
2554@@ -2,8 +2,8 @@
2555 # included from Top Level Makefile.am
2556 # All paths should be given relative to the root
2557
2558-EXTRA_DIST+= \
2559- libmemcached-1.0/configure.h.in
2560+EXTRA_DIST+= libmemcached-1.0/configure.h.in
2561+BUILT_SOURCES+= libmemcached-1.0/configure.h
2562
2563 include libmemcached-1.0/struct/include.am
2564 include libmemcached-1.0/types/include.am
2565
2566=== modified file 'libmemcached-1.0/memcached.hpp'
2567--- libmemcached-1.0/memcached.hpp 2012-05-19 17:31:36 +0000
2568+++ libmemcached-1.0/memcached.hpp 2012-08-14 00:00:29 +0000
2569@@ -75,39 +75,39 @@
2570
2571 Memcache()
2572 {
2573- memc= memcached("", 0);
2574+ memc_= memcached(NULL, 0);
2575 }
2576
2577 Memcache(const std::string &config)
2578 {
2579- memc= memcached(config.c_str(), config.size());
2580+ memc_= memcached(config.c_str(), config.size());
2581 }
2582
2583 Memcache(const std::string &hostname, in_port_t port)
2584 {
2585- memc= memcached("", 0);
2586- if (memc)
2587+ memc_= memcached(NULL, 0);
2588+ if (memc_)
2589 {
2590- memcached_server_add(memc, hostname.c_str(), port);
2591+ memcached_server_add(memc_, hostname.c_str(), port);
2592 }
2593 }
2594
2595 Memcache(memcached_st *clone)
2596 {
2597- memc= memcached_clone(NULL, clone);
2598+ memc_= memcached_clone(NULL, clone);
2599 }
2600
2601 Memcache(const Memcache &rhs)
2602 {
2603- memc= memcached_clone(NULL, rhs.getImpl());
2604+ memc_= memcached_clone(NULL, rhs.getImpl());
2605 }
2606
2607 Memcache &operator=(const Memcache &rhs)
2608 {
2609 if (this != &rhs)
2610 {
2611- memcached_free(memc);
2612- memc= memcached_clone(NULL, rhs.getImpl());
2613+ memcached_free(memc_);
2614+ memc_= memcached_clone(NULL, rhs.getImpl());
2615 }
2616
2617 return *this;
2618@@ -115,7 +115,7 @@
2619
2620 ~Memcache()
2621 {
2622- memcached_free(memc);
2623+ memcached_free(memc_);
2624 }
2625
2626 /**
2627@@ -123,7 +123,7 @@
2628 */
2629 const memcached_st *getImpl() const
2630 {
2631- return memc;
2632+ return memc_;
2633 }
2634
2635 /**
2636@@ -140,9 +140,9 @@
2637
2638 bool error(std::string& error_message) const
2639 {
2640- if (memcached_failed(memcached_last_error(memc)))
2641+ if (memcached_failed(memcached_last_error(memc_)))
2642 {
2643- error_message+= memcached_last_error_message(memc);
2644+ error_message+= memcached_last_error_message(memc_);
2645 return true;
2646 }
2647
2648@@ -151,7 +151,7 @@
2649
2650 bool error() const
2651 {
2652- if (memcached_failed(memcached_last_error(memc)))
2653+ if (memcached_failed(memcached_last_error(memc_)))
2654 {
2655 return true;
2656 }
2657@@ -161,18 +161,18 @@
2658
2659 bool error(memcached_return_t& arg) const
2660 {
2661- arg= memcached_last_error(memc);
2662+ arg= memcached_last_error(memc_);
2663 return memcached_failed(arg);
2664 }
2665
2666 bool setBehavior(memcached_behavior_t flag, uint64_t data)
2667 {
2668- return (memcached_success(memcached_behavior_set(memc, flag, data)));
2669+ return (memcached_success(memcached_behavior_set(memc_, flag, data)));
2670 }
2671
2672 uint64_t getBehavior(memcached_behavior_t flag)
2673 {
2674- return memcached_behavior_get(memc, flag);
2675+ return memcached_behavior_get(memc_, flag);
2676 }
2677
2678 /**
2679@@ -187,8 +187,8 @@
2680
2681 if (new_memc)
2682 {
2683- memcached_free(memc);
2684- memc= new_memc;
2685+ memcached_free(memc_);
2686+ memc_= new_memc;
2687
2688 return true;
2689 }
2690@@ -205,7 +205,7 @@
2691 */
2692 bool addServer(const std::string &server_name, in_port_t port)
2693 {
2694- return memcached_success(memcached_server_add(memc, server_name.c_str(), port));
2695+ return memcached_success(memcached_server_add(memc_, server_name.c_str(), port));
2696 }
2697
2698 /**
2699@@ -246,7 +246,7 @@
2700 memcached_return_t rc;
2701
2702 memcached_result_st *result;
2703- if ((result= memcached_fetch_result(memc, NULL, &rc)))
2704+ if ((result= memcached_fetch_result(memc_, NULL, &rc)))
2705 {
2706 // Key
2707 key.assign(memcached_result_key_value(result), memcached_result_key_length(result));
2708@@ -254,7 +254,8 @@
2709 // Actual value, null terminated
2710 ret_val.reserve(memcached_result_length(result) +1);
2711 ret_val.assign(memcached_result_value(result),
2712- memcached_result_value(result) +memcached_result_length(result));
2713+ memcached_result_value(result) +memcached_result_length(result) +1);
2714+ ret_val.resize(memcached_result_length(result));
2715
2716 // Misc
2717 flags= memcached_result_flags(result);
2718@@ -288,13 +289,15 @@
2719 memcached_return_t rc;
2720 size_t value_length= 0;
2721
2722- char *value= memcached_get(memc, key.c_str(), key.length(),
2723+ char *value= memcached_get(memc_, key.c_str(), key.length(),
2724 &value_length, &flags, &rc);
2725 if (value != NULL && ret_val.empty())
2726 {
2727- ret_val.reserve(value_length);
2728- ret_val.assign(value, value +value_length);
2729+ ret_val.reserve(value_length +1); // Always provide null
2730+ ret_val.assign(value, value +value_length +1);
2731+ ret_val.resize(value_length);
2732 free(value);
2733+
2734 return true;
2735 }
2736
2737@@ -321,15 +324,17 @@
2738 memcached_return_t rc;
2739 size_t value_length= 0;
2740
2741- char *value= memcached_get_by_key(memc,
2742+ char *value= memcached_get_by_key(memc_,
2743 master_key.c_str(), master_key.length(),
2744 key.c_str(), key.length(),
2745 &value_length, &flags, &rc);
2746 if (value)
2747 {
2748- ret_val.reserve(value_length);
2749- ret_val.assign(value, value +value_length);
2750+ ret_val.reserve(value_length +1); // Always provide null
2751+ ret_val.assign(value, value +value_length +1);
2752+ ret_val.resize(value_length);
2753 free(value);
2754+
2755 return true;
2756 }
2757 return false;
2758@@ -370,7 +375,7 @@
2759 */
2760 if (not real_keys.empty())
2761 {
2762- return memcached_success(memcached_mget(memc, &real_keys[0], &key_len[0], real_keys.size()));
2763+ return memcached_success(memcached_mget(memc_, &real_keys[0], &key_len[0], real_keys.size()));
2764 }
2765
2766 return false;
2767@@ -392,13 +397,25 @@
2768 time_t expiration,
2769 uint32_t flags)
2770 {
2771- memcached_return_t rc= memcached_set(memc,
2772+ memcached_return_t rc= memcached_set(memc_,
2773 key.c_str(), key.length(),
2774 &value[0], value.size(),
2775 expiration, flags);
2776 return memcached_success(rc);
2777 }
2778
2779+ bool set(const std::string &key,
2780+ const char* value, const size_t value_length,
2781+ time_t expiration,
2782+ uint32_t flags)
2783+ {
2784+ memcached_return_t rc= memcached_set(memc_,
2785+ key.c_str(), key.length(),
2786+ value, value_length,
2787+ expiration, flags);
2788+ return memcached_success(rc);
2789+ }
2790+
2791 /**
2792 * Writes an object to a server specified by the master_key parameter.
2793 * If the object already exists, it will overwrite the existing object.
2794@@ -416,7 +433,7 @@
2795 time_t expiration,
2796 uint32_t flags)
2797 {
2798- return memcached_success(memcached_set_by_key(memc, master_key.c_str(),
2799+ return memcached_success(memcached_set_by_key(memc_, master_key.c_str(),
2800 master_key.length(),
2801 key.c_str(), key.length(),
2802 &value[0], value.size(),
2803@@ -497,7 +514,7 @@
2804 */
2805 bool increment(const std::string& key, uint32_t offset, uint64_t *value)
2806 {
2807- return memcached_success(memcached_increment(memc, key.c_str(), key.length(), offset, value));
2808+ return memcached_success(memcached_increment(memc_, key.c_str(), key.length(), offset, value));
2809 }
2810
2811 /**
2812@@ -512,7 +529,7 @@
2813 */
2814 bool decrement(const std::string& key, uint32_t offset, uint64_t *value)
2815 {
2816- return memcached_success(memcached_decrement(memc, key.c_str(),
2817+ return memcached_success(memcached_decrement(memc_, key.c_str(),
2818 key.length(),
2819 offset, value));
2820 }
2821@@ -528,7 +545,7 @@
2822 */
2823 bool add(const std::string& key, const std::vector<char>& value)
2824 {
2825- return memcached_success(memcached_add(memc, key.c_str(), key.length(),
2826+ return memcached_success(memcached_add(memc_, key.c_str(), key.length(),
2827 &value[0], value.size(), 0, 0));
2828 }
2829
2830@@ -546,7 +563,7 @@
2831 const std::string& key,
2832 const std::vector<char>& value)
2833 {
2834- return memcached_success(memcached_add_by_key(memc,
2835+ return memcached_success(memcached_add_by_key(memc_,
2836 master_key.c_str(),
2837 master_key.length(),
2838 key.c_str(),
2839@@ -566,7 +583,7 @@
2840 */
2841 bool replace(const std::string& key, const std::vector<char>& value)
2842 {
2843- return memcached_success(memcached_replace(memc, key.c_str(), key.length(),
2844+ return memcached_success(memcached_replace(memc_, key.c_str(), key.length(),
2845 &value[0], value.size(),
2846 0, 0));
2847 }
2848@@ -585,7 +602,7 @@
2849 const std::string& key,
2850 const std::vector<char>& value)
2851 {
2852- return memcached_success(memcached_replace_by_key(memc,
2853+ return memcached_success(memcached_replace_by_key(memc_,
2854 master_key.c_str(),
2855 master_key.length(),
2856 key.c_str(),
2857@@ -604,7 +621,7 @@
2858 */
2859 bool prepend(const std::string& key, const std::vector<char>& value)
2860 {
2861- return memcached_success(memcached_prepend(memc, key.c_str(), key.length(),
2862+ return memcached_success(memcached_prepend(memc_, key.c_str(), key.length(),
2863 &value[0], value.size(), 0, 0));
2864 }
2865
2866@@ -622,7 +639,7 @@
2867 const std::string& key,
2868 const std::vector<char>& value)
2869 {
2870- return memcached_success(memcached_prepend_by_key(memc,
2871+ return memcached_success(memcached_prepend_by_key(memc_,
2872 master_key.c_str(),
2873 master_key.length(),
2874 key.c_str(),
2875@@ -642,7 +659,7 @@
2876 */
2877 bool append(const std::string& key, const std::vector<char>& value)
2878 {
2879- return memcached_success(memcached_append(memc,
2880+ return memcached_success(memcached_append(memc_,
2881 key.c_str(),
2882 key.length(),
2883 &value[0],
2884@@ -664,7 +681,7 @@
2885 const std::string& key,
2886 const std::vector<char> &value)
2887 {
2888- return memcached_success(memcached_append_by_key(memc,
2889+ return memcached_success(memcached_append_by_key(memc_,
2890 master_key.c_str(),
2891 master_key.length(),
2892 key.c_str(),
2893@@ -686,7 +703,7 @@
2894 const std::vector<char>& value,
2895 uint64_t cas_arg)
2896 {
2897- return memcached_success(memcached_cas(memc, key.c_str(), key.length(),
2898+ return memcached_success(memcached_cas(memc_, key.c_str(), key.length(),
2899 &value[0], value.size(),
2900 0, 0, cas_arg));
2901 }
2902@@ -706,7 +723,7 @@
2903 const std::vector<char> &value,
2904 uint64_t cas_arg)
2905 {
2906- return memcached_success(memcached_cas_by_key(memc,
2907+ return memcached_success(memcached_cas_by_key(memc_,
2908 master_key.c_str(),
2909 master_key.length(),
2910 key.c_str(),
2911@@ -724,7 +741,7 @@
2912 */
2913 bool remove(const std::string& key)
2914 {
2915- return memcached_success(memcached_delete(memc, key.c_str(), key.length(), 0));
2916+ return memcached_success(memcached_delete(memc_, key.c_str(), key.length(), 0));
2917 }
2918
2919 /**
2920@@ -736,7 +753,7 @@
2921 */
2922 bool remove(const std::string& key, time_t expiration)
2923 {
2924- return memcached_success(memcached_delete(memc,
2925+ return memcached_success(memcached_delete(memc_,
2926 key.c_str(),
2927 key.length(),
2928 expiration));
2929@@ -752,7 +769,7 @@
2930 bool removeByKey(const std::string& master_key,
2931 const std::string& key)
2932 {
2933- return memcached_success(memcached_delete_by_key(memc,
2934+ return memcached_success(memcached_delete_by_key(memc_,
2935 master_key.c_str(),
2936 master_key.length(),
2937 key.c_str(),
2938@@ -772,7 +789,7 @@
2939 const std::string& key,
2940 time_t expiration)
2941 {
2942- return memcached_success(memcached_delete_by_key(memc,
2943+ return memcached_success(memcached_delete_by_key(memc_,
2944 master_key.c_str(),
2945 master_key.length(),
2946 key.c_str(),
2947@@ -789,7 +806,7 @@
2948 */
2949 bool flush(time_t expiration= 0)
2950 {
2951- return memcached_success(memcached_flush(memc, expiration));
2952+ return memcached_success(memcached_flush(memc_, expiration));
2953 }
2954
2955 /**
2956@@ -814,7 +831,7 @@
2957 bool getStats(std::map< std::string, std::map<std::string, std::string> >& stats_map)
2958 {
2959 memcached_return_t rc;
2960- memcached_stat_st *stats= memcached_stat(memc, NULL, &rc);
2961+ memcached_stat_st *stats= memcached_stat(memc_, NULL, &rc);
2962
2963 if (rc != MEMCACHED_SUCCESS &&
2964 rc != MEMCACHED_SOME_ERRORS)
2965@@ -822,7 +839,7 @@
2966 return false;
2967 }
2968
2969- uint32_t server_count= memcached_server_count(memc);
2970+ uint32_t server_count= memcached_server_count(memc_);
2971
2972 /*
2973 * For each memcached server, construct a std::map for its stats and add
2974@@ -830,7 +847,7 @@
2975 */
2976 for (uint32_t x= 0; x < server_count; x++)
2977 {
2978- memcached_server_instance_st instance= memcached_server_instance_by_position(memc, x);
2979+ memcached_server_instance_st instance= memcached_server_instance_by_position(memc_, x);
2980 std::ostringstream strstm;
2981 std::string server_name(memcached_server_name(instance));
2982 server_name.append(":");
2983@@ -838,10 +855,10 @@
2984 server_name.append(strstm.str());
2985
2986 std::map<std::string, std::string> server_stats;
2987- char **list= memcached_stat_get_keys(memc, &stats[x], &rc);
2988+ char **list= memcached_stat_get_keys(memc_, &stats[x], &rc);
2989 for (char** ptr= list; *ptr; ptr++)
2990 {
2991- char *value= memcached_stat_get_value(memc, &stats[x], *ptr, &rc);
2992+ char *value= memcached_stat_get_value(memc_, &stats[x], *ptr, &rc);
2993 server_stats[*ptr]= value;
2994 free(value);
2995 }
2996@@ -850,12 +867,12 @@
2997 free(list);
2998 }
2999
3000- memcached_stat_free(memc, stats);
3001+ memcached_stat_free(memc_, stats);
3002 return true;
3003 }
3004
3005 private:
3006- memcached_st *memc;
3007+ memcached_st *memc_;
3008 };
3009
3010 }
3011
3012=== modified file 'libmemcached-1.0/server.h'
3013--- libmemcached-1.0/server.h 2011-12-12 19:01:06 +0000
3014+++ libmemcached-1.0/server.h 2012-08-14 00:00:29 +0000
3015@@ -104,8 +104,20 @@
3016 in_port_t memcached_server_port(const memcached_server_instance_st self);
3017
3018 LIBMEMCACHED_API
3019+void memcached_instance_next_retry(memcached_server_instance_st self, const time_t absolute_time);
3020+
3021+LIBMEMCACHED_API
3022 const char *memcached_server_type(const memcached_server_instance_st ptr);
3023
3024+LIBMEMCACHED_API
3025+uint8_t memcached_server_major_version(const memcached_server_instance_st ptr);
3026+
3027+LIBMEMCACHED_API
3028+uint8_t memcached_server_minor_version(const memcached_server_instance_st ptr);
3029+
3030+LIBMEMCACHED_API
3031+uint8_t memcached_server_micro_version(const memcached_server_instance_st ptr);
3032+
3033 #ifdef __cplusplus
3034 } // extern "C"
3035 #endif
3036
3037=== modified file 'libmemcached-1.0/strerror.h'
3038--- libmemcached-1.0/strerror.h 2011-10-02 18:02:19 +0000
3039+++ libmemcached-1.0/strerror.h 2012-08-14 00:00:29 +0000
3040@@ -2,7 +2,7 @@
3041 *
3042 * Libmemcached library
3043 *
3044- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
3045+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
3046 * Copyright (C) 2010 Brian Aker All rights reserved.
3047 *
3048 * Redistribution and use in source and binary forms, with or without
3049@@ -43,7 +43,7 @@
3050 #endif
3051
3052 LIBMEMCACHED_API
3053-const char *memcached_strerror(memcached_st *ptr, memcached_return_t rc);
3054+const char *memcached_strerror(const memcached_st *ptr, memcached_return_t rc);
3055
3056 #ifdef __cplusplus
3057 }
3058
3059=== modified file 'libmemcached-1.0/struct/memcached.h'
3060--- libmemcached-1.0/struct/memcached.h 2012-04-09 06:28:51 +0000
3061+++ libmemcached-1.0/struct/memcached.h 2012-08-14 00:00:29 +0000
3062@@ -45,6 +45,7 @@
3063 bool is_purging:1;
3064 bool is_processing_input:1;
3065 bool is_time_for_rebuild:1;
3066+ bool is_parsing:1;
3067 } state;
3068
3069 struct {
3070@@ -63,6 +64,8 @@
3071 bool verify_key:1;
3072 bool tcp_keepalive:1;
3073 bool is_aes:1;
3074+ bool is_fetching_version:1;
3075+ bool not_used:1;
3076 } flags;
3077
3078 memcached_server_distribution_t distribution;
3079@@ -71,8 +74,13 @@
3080 unsigned int version;
3081 } server_info;
3082 uint32_t number_of_hosts;
3083- memcached_server_st *servers;
3084- memcached_server_st *last_disconnected_server;
3085+#ifdef __cplusplus
3086+ org::libmemcached::Instance* servers;
3087+ org::libmemcached::Instance* last_disconnected_server;
3088+#else
3089+ void *servers;
3090+ void *last_disconnected_server;
3091+#endif
3092 int32_t snd_timeout;
3093 int32_t rcv_timeout;
3094 uint32_t server_failure_limit;
3095@@ -92,11 +100,11 @@
3096 memcached_result_st result;
3097
3098 struct {
3099- bool weighted;
3100+ bool weighted_;
3101 uint32_t continuum_count; // Ketama
3102 uint32_t continuum_points_counter; // Ketama
3103 time_t next_distribution_rebuild; // Ketama
3104- memcached_continuum_item_st *continuum; // Ketama
3105+ struct memcached_continuum_item_st *continuum; // Ketama
3106 } ketama;
3107
3108 struct memcached_virtual_bucket_t *virtual_bucket;
3109
3110=== modified file 'libmemcached-1.0/struct/server.h'
3111--- libmemcached-1.0/struct/server.h 2012-04-24 16:13:12 +0000
3112+++ libmemcached-1.0/struct/server.h 2012-08-14 00:00:29 +0000
3113@@ -59,7 +59,8 @@
3114 MEMCACHED_SERVER_STATE_ADDRINFO, // ADDRRESS information has been gathered
3115 MEMCACHED_SERVER_STATE_IN_PROGRESS,
3116 MEMCACHED_SERVER_STATE_CONNECTED,
3117- MEMCACHED_SERVER_STATE_IN_TIMEOUT
3118+ MEMCACHED_SERVER_STATE_IN_TIMEOUT,
3119+ MEMCACHED_SERVER_STATE_DISABLED
3120 };
3121
3122 struct memcached_server_st {
3123@@ -72,8 +73,8 @@
3124 uint32_t number_of_hosts;
3125 uint32_t cursor_active;
3126 in_port_t port;
3127- memcached_socket_t fd;
3128 uint32_t io_bytes_sent; /* # bytes sent since last read */
3129+ uint32_t request_id;
3130 uint32_t server_failure_counter;
3131 uint64_t server_failure_counter_query_id;
3132 uint32_t weight;
3133@@ -83,22 +84,15 @@
3134 uint32_t read;
3135 uint32_t write;
3136 uint32_t timeouts;
3137+ size_t _bytes_read;
3138 } io_wait_count;
3139 uint8_t major_version; // Default definition of UINT8_MAX means that it has not been set.
3140 uint8_t micro_version; // ditto, and note that this is the third, not second version bit
3141 uint8_t minor_version; // ditto
3142 memcached_connection_t type;
3143- char *read_ptr;
3144- size_t read_buffer_length;
3145- size_t read_data_length;
3146- size_t write_buffer_offset;
3147- struct addrinfo *address_info;
3148- struct addrinfo *address_info_next;
3149 time_t next_retry;
3150 struct memcached_st *root;
3151 uint64_t limit_maxbytes;
3152 struct memcached_error_t *error_messages;
3153- char read_buffer[MEMCACHED_MAX_BUFFER];
3154- char write_buffer[MEMCACHED_MAX_BUFFER];
3155 char hostname[MEMCACHED_NI_MAXHOST];
3156 };
3157
3158=== modified file 'libmemcached-1.0/types.h'
3159--- libmemcached-1.0/types.h 2011-12-12 16:59:07 +0000
3160+++ libmemcached-1.0/types.h 2012-08-14 00:00:29 +0000
3161@@ -39,6 +39,9 @@
3162 #pragma once
3163
3164 #ifdef __cplusplus
3165+
3166+namespace org { namespace libmemcached { struct Instance; } }
3167+
3168 struct memcached_st;
3169 struct memcached_stat_st;
3170 struct memcached_analysis_st;
3171@@ -48,7 +51,8 @@
3172
3173 // All of the flavors of memcache_server_st
3174 struct memcached_server_st;
3175-typedef const struct memcached_server_st *memcached_server_instance_st;
3176+struct memcached_instance_st;
3177+typedef const org::libmemcached::Instance* memcached_server_instance_st;
3178 typedef struct memcached_server_st *memcached_server_list_st;
3179
3180 struct memcached_callback_st;
3181@@ -69,7 +73,7 @@
3182
3183 // All of the flavors of memcache_server_st
3184 typedef struct memcached_server_st memcached_server_st;
3185-typedef const struct memcached_server_st *memcached_server_instance_st;
3186+typedef const void *memcached_server_instance_st;
3187 typedef struct memcached_server_st *memcached_server_list_st;
3188
3189 typedef struct memcached_callback_st memcached_callback_st;
3190@@ -77,6 +81,5 @@
3191 // The following two structures are internal, and never exposed to users.
3192 typedef struct memcached_string_st memcached_string_st;
3193 typedef struct memcached_string_t memcached_string_t;
3194-typedef struct memcached_continuum_item_st memcached_continuum_item_st;
3195
3196 #endif
3197
3198=== modified file 'libmemcached-1.2/include.am'
3199--- libmemcached-1.2/include.am 2011-12-12 16:59:07 +0000
3200+++ libmemcached-1.2/include.am 2012-08-14 00:00:29 +0000
3201@@ -5,8 +5,8 @@
3202
3203 include libmemcached-1.2/t/include.am
3204
3205-EXTRA_DIST+= \
3206- libmemcached-1.2/configure.h.in
3207+BUILT_SOURCES+= libmemcached-1.2/configure.h
3208+EXTRA_DIST+= libmemcached-1.2/configure.h.in
3209
3210 nobase_include_HEADERS+= \
3211 libmemcached-1.2/allocators.h \
3212
3213=== modified file 'libmemcached-2.0/include.am'
3214--- libmemcached-2.0/include.am 2011-12-06 05:44:43 +0000
3215+++ libmemcached-2.0/include.am 2012-08-14 00:00:29 +0000
3216@@ -4,9 +4,9 @@
3217
3218 # This is not a public interface yet.
3219
3220-EXTRA_DIST+= \
3221- libmemcached-1.2/configure.h.in
3222-
3223-noinst_HEADERS+= \
3224- libmemcached-1.2/memcached.h
3225+BUILT_SOURCES+= libmemcached-2.0/configure.h
3226+
3227+EXTRA_DIST+= libmemcached-1.2/configure.h.in
3228+
3229+noinst_HEADERS+= libmemcached-1.2/memcached.h
3230
3231
3232=== modified file 'libmemcached/allocators.cc'
3233--- libmemcached/allocators.cc 2012-04-27 02:09:29 +0000
3234+++ libmemcached/allocators.cc 2012-08-14 00:00:29 +0000
3235@@ -59,8 +59,8 @@
3236 {
3237 if (self->allocators.malloc != _libmemcached_malloc)
3238 {
3239- void *ret = _libmemcached_malloc(self, nelem * size, context);
3240- if (ret == NULL)
3241+ void *ret= _libmemcached_malloc(self, nelem * size, context);
3242+ if (ret)
3243 {
3244 memset(ret, 0, nelem * size);
3245 }
3246
3247=== modified file 'libmemcached/array.c'
3248--- libmemcached/array.c 2011-05-24 20:43:14 +0000
3249+++ libmemcached/array.c 2012-08-14 00:00:29 +0000
3250@@ -49,10 +49,12 @@
3251
3252 memcached_array_st *memcached_array_clone(struct memcached_st *memc, const memcached_array_st *original)
3253 {
3254- if (not original)
3255- return NULL;
3256+ if (original)
3257+ {
3258+ return memcached_strcpy(memc, original->c_str, original->size);
3259+ }
3260
3261- return memcached_strcpy(memc, original->c_str, original->size);
3262+ return NULL;
3263 }
3264
3265 memcached_array_st *memcached_strcpy(struct memcached_st *memc, const char *str, size_t str_length)
3266@@ -63,29 +65,23 @@
3267
3268 memcached_array_st *array= (struct memcached_array_st *)libmemcached_malloc(memc, sizeof(struct memcached_array_st) +str_length +1);
3269
3270- if (not array)
3271- return NULL;
3272-
3273- array->root= memc;
3274- array->size= str_length; // We don't count the NULL ending
3275- memcpy(array->c_str, str, str_length);
3276- array->c_str[str_length]= 0;
3277+ if (array)
3278+ {
3279+ array->root= memc;
3280+ array->size= str_length; // We don't count the NULL ending
3281+ memcpy(array->c_str, str, str_length);
3282+ array->c_str[str_length]= 0;
3283+ }
3284
3285 return array;
3286 }
3287
3288 bool memcached_array_is_null(memcached_array_st *array)
3289 {
3290- assert(array);
3291- assert(array->root);
3292-
3293- if (not array)
3294- return false;
3295-
3296- if (array->size and array->c_str)
3297- return false;
3298-
3299- assert(not array->size and not array->c_str);
3300+ if (array)
3301+ {
3302+ return false;
3303+ }
3304
3305 return true;
3306 }
3307@@ -104,25 +100,29 @@
3308
3309 void memcached_array_free(memcached_array_st *array)
3310 {
3311- if (not array)
3312- return;
3313-
3314- WATCHPOINT_ASSERT(array->root);
3315- libmemcached_free(array->root, array);
3316+ if (array)
3317+ {
3318+ WATCHPOINT_ASSERT(array->root);
3319+ libmemcached_free(array->root, array);
3320+ }
3321 }
3322
3323 size_t memcached_array_size(memcached_array_st *array)
3324 {
3325- if (not array)
3326- return 0;
3327+ if (array)
3328+ {
3329+ return array->size;
3330+ }
3331
3332- return array->size;
3333+ return 0;
3334 }
3335
3336 const char *memcached_array_string(memcached_array_st *array)
3337 {
3338- if (not array)
3339- return NULL;
3340+ if (array)
3341+ {
3342+ return array->c_str;
3343+ }
3344
3345- return array->c_str;
3346+ return NULL;
3347 }
3348
3349=== modified file 'libmemcached/auto.cc'
3350--- libmemcached/auto.cc 2012-04-09 06:51:42 +0000
3351+++ libmemcached/auto.cc 2012-08-14 00:00:29 +0000
3352@@ -37,7 +37,7 @@
3353
3354 #include <libmemcached/common.h>
3355
3356-static void auto_response(memcached_server_write_instance_st instance, const bool reply, memcached_return_t& rc, uint64_t* value)
3357+static void auto_response(org::libmemcached::Instance* instance, const bool reply, memcached_return_t& rc, uint64_t* value)
3358 {
3359 // If the message was successfully sent, then get the response, otherwise
3360 // fail.
3361@@ -62,7 +62,7 @@
3362 }
3363 }
3364
3365-static memcached_return_t text_incr_decr(memcached_server_write_instance_st instance,
3366+static memcached_return_t text_incr_decr(org::libmemcached::Instance* instance,
3367 const bool is_incr,
3368 const char *key, size_t key_length,
3369 const uint64_t offset,
3370@@ -83,7 +83,7 @@
3371 { memcached_literal_param("incr ") },
3372 { memcached_array_string(instance->root->_namespace), memcached_array_size(instance->root->_namespace) },
3373 { key, key_length },
3374- { buffer, send_length },
3375+ { buffer, size_t(send_length) },
3376 { " noreply", reply ? 0 : memcached_literal_param_size(" noreply") },
3377 { memcached_literal_param("\r\n") }
3378 };
3379@@ -96,7 +96,7 @@
3380 return memcached_vdo(instance, vector, 7, true);
3381 }
3382
3383-static memcached_return_t binary_incr_decr(memcached_server_write_instance_st instance,
3384+static memcached_return_t binary_incr_decr(org::libmemcached::Instance* instance,
3385 protocol_binary_command cmd,
3386 const char *key, const size_t key_length,
3387 const uint64_t offset,
3388@@ -118,7 +118,8 @@
3389 }
3390 protocol_binary_request_incr request= {}; // = {.bytes= {0}};
3391
3392- request.message.header.request.magic= PROTOCOL_BINARY_REQ;
3393+ initialize_binary_request(instance, request.message.header);
3394+
3395 request.message.header.request.opcode= cmd;
3396 request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(instance->root->_namespace)));
3397 request.message.header.request.extlen= 20;
3398@@ -178,7 +179,7 @@
3399 }
3400
3401 uint32_t server_key= memcached_generate_hash_with_redistribution(memc, group_key, group_key_length);
3402- memcached_server_write_instance_st instance= memcached_server_instance_fetch(memc, server_key);
3403+ org::libmemcached::Instance* instance= memcached_instance_fetch(memc, server_key);
3404
3405 bool reply= memcached_is_replying(instance->root);
3406
3407@@ -237,7 +238,7 @@
3408 }
3409
3410 uint32_t server_key= memcached_generate_hash_with_redistribution(memc, group_key, group_key_length);
3411- memcached_server_write_instance_st instance= memcached_server_instance_fetch(memc, server_key);
3412+ org::libmemcached::Instance* instance= memcached_instance_fetch(memc, server_key);
3413
3414 bool reply= memcached_is_replying(instance->root);
3415
3416
3417=== modified file 'libmemcached/behavior.cc'
3418--- libmemcached/behavior.cc 2012-05-10 06:30:56 +0000
3419+++ libmemcached/behavior.cc 2012-08-14 00:00:29 +0000
3420@@ -42,6 +42,26 @@
3421 #include <ctime>
3422 #include <sys/types.h>
3423
3424+bool memcached_is_consistent_distribution(const memcached_st* memc)
3425+{
3426+ switch (memc->distribution)
3427+ {
3428+ case MEMCACHED_DISTRIBUTION_CONSISTENT:
3429+ case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA:
3430+ case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY:
3431+ case MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED:
3432+ return true;
3433+
3434+ case MEMCACHED_DISTRIBUTION_MODULA:
3435+ case MEMCACHED_DISTRIBUTION_RANDOM:
3436+ case MEMCACHED_DISTRIBUTION_VIRTUAL_BUCKET:
3437+ case MEMCACHED_DISTRIBUTION_CONSISTENT_MAX:
3438+ break;
3439+ }
3440+
3441+ return false;
3442+}
3443+
3444 /*
3445 This function is used to modify the behavior of running client.
3446
3447@@ -162,13 +182,17 @@
3448
3449 case MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED:
3450 {
3451+ if (bool(data) == false)
3452+ {
3453+ return memcached_behavior_set(ptr, MEMCACHED_BEHAVIOR_KETAMA, true);
3454+ }
3455+
3456 (void)memcached_behavior_set_key_hash(ptr, MEMCACHED_HASH_MD5);
3457 (void)memcached_behavior_set_distribution_hash(ptr, MEMCACHED_HASH_MD5);
3458- ptr->ketama.weighted= bool(data);
3459 /**
3460 @note We try to keep the same distribution going. This should be deprecated and rewritten.
3461 */
3462- return memcached_behavior_set_distribution(ptr, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA);
3463+ return memcached_behavior_set_distribution(ptr, MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED);
3464 }
3465
3466 case MEMCACHED_BEHAVIOR_HASH:
3467@@ -331,13 +355,17 @@
3468 return ptr->flags.verify_key;
3469
3470 case MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED:
3471- return ptr->ketama.weighted;
3472+ if (memcached_is_consistent_distribution(ptr))
3473+ {
3474+ return memcached_is_weighted_ketama(ptr);
3475+ }
3476+ return false;
3477
3478 case MEMCACHED_BEHAVIOR_DISTRIBUTION:
3479 return ptr->distribution;
3480
3481 case MEMCACHED_BEHAVIOR_KETAMA:
3482- return (ptr->distribution == MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA) ? (uint64_t) 1 : 0;
3483+ return memcached_is_consistent_distribution(ptr);
3484
3485 case MEMCACHED_BEHAVIOR_HASH:
3486 return hashkit_get_function(&ptr->hashkit);
3487@@ -383,7 +411,7 @@
3488 return (uint64_t) ptr->send_size;
3489 }
3490
3491- memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, 0);
3492+ org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, 0);
3493
3494 if (instance) // If we have an instance we test, otherwise we just set and pray
3495 {
3496@@ -417,7 +445,7 @@
3497 if (ptr->recv_size != -1) // If value is -1 then we are using the default
3498 return (uint64_t) ptr->recv_size;
3499
3500- memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, 0);
3501+ org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, 0);
3502
3503 /**
3504 @note REFACTOR
3505@@ -487,23 +515,37 @@
3506
3507 memcached_return_t memcached_behavior_set_distribution(memcached_st *ptr, memcached_server_distribution_t type)
3508 {
3509- if (type < MEMCACHED_DISTRIBUTION_CONSISTENT_MAX)
3510+ switch (type)
3511 {
3512- if (MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED)
3513- {
3514- ptr->ketama.weighted= true;
3515- }
3516- else
3517- {
3518- ptr->ketama.weighted= false;
3519- }
3520-
3521- ptr->distribution= type;
3522- return run_distribution(ptr);
3523+ case MEMCACHED_DISTRIBUTION_MODULA:
3524+ break;
3525+
3526+ case MEMCACHED_DISTRIBUTION_CONSISTENT:
3527+ case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA:
3528+ memcached_set_weighted_ketama(ptr, false);
3529+ break;
3530+
3531+ case MEMCACHED_DISTRIBUTION_RANDOM:
3532+ break;
3533+
3534+ case MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY:
3535+ break;
3536+
3537+ case MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED:
3538+ memcached_set_weighted_ketama(ptr, true);
3539+ break;
3540+
3541+ case MEMCACHED_DISTRIBUTION_VIRTUAL_BUCKET:
3542+ break;
3543+
3544+ default:
3545+ case MEMCACHED_DISTRIBUTION_CONSISTENT_MAX:
3546+ return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT,
3547+ memcached_literal_param("Invalid memcached_server_distribution_t"));
3548 }
3549+ ptr->distribution= type;
3550
3551- return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT,
3552- memcached_literal_param("Invalid memcached_server_distribution_t"));
3553+ return run_distribution(ptr);
3554 }
3555
3556
3557@@ -531,7 +573,9 @@
3558 memcached_return_t memcached_behavior_set_distribution_hash(memcached_st *ptr, memcached_hash_t type)
3559 {
3560 if (hashkit_success(hashkit_set_distribution_function(&ptr->hashkit, (hashkit_hash_algorithm_t)type)))
3561+ {
3562 return MEMCACHED_SUCCESS;
3563+ }
3564
3565 return memcached_set_error(*ptr, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT,
3566 memcached_literal_param("Invalid memcached_hash_t()"));
3567
3568=== modified file 'libmemcached/behavior.hpp'
3569--- libmemcached/behavior.hpp 2011-11-29 23:20:06 +0000
3570+++ libmemcached/behavior.hpp 2012-08-14 00:00:29 +0000
3571@@ -36,4 +36,5 @@
3572
3573 #pragma once
3574
3575+bool memcached_is_consistent_distribution(const memcached_st*);
3576 bool _is_auto_eject_host(const memcached_st *ptr);
3577
3578=== modified file 'libmemcached/common.h'
3579--- libmemcached/common.h 2012-05-21 05:08:39 +0000
3580+++ libmemcached/common.h 2012-08-14 00:00:29 +0000
3581@@ -73,6 +73,7 @@
3582 #include <libmemcached/watchpoint.h>
3583 #include <libmemcached/is.h>
3584
3585+#include <libmemcached/instance.h>
3586 #include <libmemcached/server_instance.h>
3587
3588 #ifdef HAVE_POLL_H
3589@@ -81,31 +82,31 @@
3590 #include "poll/poll.h"
3591 #endif
3592
3593-
3594 #ifdef __cplusplus
3595 extern "C" {
3596 #endif
3597
3598 typedef memcached_return_t (*memcached_server_execute_fn)(memcached_st *ptr, memcached_server_write_instance_st server, void *context);
3599
3600-LIBMEMCACHED_LOCAL
3601-memcached_server_write_instance_st memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key);
3602-
3603-LIBMEMCACHED_LOCAL
3604+#ifdef __cplusplus
3605+} // extern "C"
3606+#endif
3607+
3608+
3609+#ifdef __cplusplus
3610+org::libmemcached::Instance* memcached_instance_fetch(memcached_st *ptr, uint32_t server_key);
3611+#endif
3612+
3613 memcached_return_t memcached_server_execute(memcached_st *ptr,
3614 memcached_server_execute_fn callback,
3615 void *context);
3616-#ifdef __cplusplus
3617-} // extern "C"
3618-#endif
3619-
3620-
3621 /* These are private not to be installed headers */
3622 #include <libmemcached/error.hpp>
3623 #include <libmemcached/memory.h>
3624 #include <libmemcached/io.h>
3625 #ifdef __cplusplus
3626 #include <libmemcached/string.hpp>
3627+#include <libmemcached/memcached/protocol_binary.h>
3628 #include <libmemcached/io.hpp>
3629 #include <libmemcached/udp.hpp>
3630 #include <libmemcached/do.hpp>
3631@@ -114,7 +115,9 @@
3632 #include <libmemcached/allocators.hpp>
3633 #include <libmemcached/hash.hpp>
3634 #include <libmemcached/quit.hpp>
3635+#include <libmemcached/instance.hpp>
3636 #include <libmemcached/server.hpp>
3637+#include <libmemcached/flag.hpp>
3638 #include <libmemcached/behavior.hpp>
3639 #include <libmemcached/sasl.hpp>
3640 #include <libmemcached/server_list.hpp>
3641@@ -122,7 +125,6 @@
3642 #include <libmemcached/internal.h>
3643 #include <libmemcached/array.h>
3644 #include <libmemcached/libmemcached_probes.h>
3645-#include <libmemcached/memcached/protocol_binary.h>
3646 #include <libmemcached/byteorder.h>
3647 #include <libmemcached/initialize_query.h>
3648 #ifdef __cplusplus
3649@@ -138,6 +140,7 @@
3650 #include <libmemcached/key.hpp>
3651 #include <libmemcached/encoding_key.h>
3652 #include <libmemcached/result.h>
3653+#include <libmemcached/version.hpp>
3654 #endif
3655
3656 #include <libmemcached/continuum.hpp>
3657@@ -162,15 +165,21 @@
3658 extern "C" {
3659 #endif
3660
3661-LIBMEMCACHED_LOCAL
3662 memcached_return_t run_distribution(memcached_st *ptr);
3663
3664-#define memcached_server_response_increment(A) (A)->cursor_active++
3665-#define memcached_server_response_decrement(A) (A)->cursor_active--
3666-#define memcached_server_response_reset(A) (A)->cursor_active=0
3667+#define memcached_server_response_increment(A) (A)->cursor_active_++
3668+#define memcached_server_response_decrement(A) (A)->cursor_active_--
3669+#define memcached_server_response_reset(A) (A)->cursor_active_=0
3670
3671-bool memcached_purge(memcached_server_write_instance_st ptr);
3672+#define memcached_instance_response_increment(A) (A)->cursor_active_++
3673+#define memcached_instance_response_decrement(A) (A)->cursor_active_--
3674+#define memcached_instance_response_reset(A) (A)->cursor_active_=0
3675
3676 #ifdef __cplusplus
3677 }
3678 #endif
3679+
3680+#ifdef __cplusplus
3681+bool memcached_purge(org::libmemcached::Instance*);
3682+org::libmemcached::Instance* memcached_instance_by_position(const memcached_st *ptr, uint32_t server_key);
3683+#endif
3684
3685=== modified file 'libmemcached/connect.cc'
3686--- libmemcached/connect.cc 2012-05-21 09:34:18 +0000
3687+++ libmemcached/connect.cc 2012-08-14 00:00:29 +0000
3688@@ -42,7 +42,11 @@
3689 #include <ctime>
3690 #include <sys/time.h>
3691
3692-static memcached_return_t connect_poll(memcached_server_st *server)
3693+#ifndef SOCK_CLOEXEC
3694+#define SOCK_CLOEXEC 0
3695+#endif
3696+
3697+static memcached_return_t connect_poll(org::libmemcached::Instance* server)
3698 {
3699 struct pollfd fds[1];
3700 fds[0].fd= server->fd;
3701@@ -135,7 +139,7 @@
3702 return memcached_set_errno(*server, get_socket_errno(), MEMCACHED_AT);
3703 }
3704
3705-static memcached_return_t set_hostinfo(memcached_server_st *server)
3706+static memcached_return_t set_hostinfo(org::libmemcached::Instance* server)
3707 {
3708 assert(server->type != MEMCACHED_CONNECTION_UNIX_SOCKET);
3709 if (server->address_info)
3710@@ -146,8 +150,8 @@
3711 }
3712
3713 char str_port[NI_MAXSERV];
3714- int length= snprintf(str_port, NI_MAXSERV, "%u", (uint32_t)server->port);
3715- if (length >= NI_MAXSERV or length < 0)
3716+ int length= snprintf(str_port, NI_MAXSERV, "%u", uint32_t(server->port()));
3717+ if (length >= NI_MAXSERV or length <= 0)
3718 {
3719 return MEMCACHED_FAILURE;
3720 }
3721@@ -199,7 +203,7 @@
3722 return MEMCACHED_SUCCESS;
3723 }
3724
3725-static inline void set_socket_nonblocking(memcached_server_st *server)
3726+static inline void set_socket_nonblocking(org::libmemcached::Instance* server)
3727 {
3728 #ifdef WIN32
3729 u_long arg= 1;
3730@@ -236,7 +240,7 @@
3731 #endif
3732 }
3733
3734-static void set_socket_options(memcached_server_st *server)
3735+static void set_socket_options(org::libmemcached::Instance* server)
3736 {
3737 assert_msg(server->fd != INVALID_SOCKET, "invalid socket was passed to set_socket_options()");
3738
3739@@ -246,29 +250,31 @@
3740 }
3741
3742 #ifdef HAVE_SNDTIMEO
3743- if (server->root->snd_timeout)
3744+ if (server->root->snd_timeout > 0)
3745 {
3746 struct timeval waittime;
3747
3748- waittime.tv_sec= 0;
3749- waittime.tv_usec= server->root->snd_timeout;
3750+ waittime.tv_sec= server->root->snd_timeout / 1000000;
3751+ waittime.tv_usec= server->root->snd_timeout % 1000000;
3752
3753 int error= setsockopt(server->fd, SOL_SOCKET, SO_SNDTIMEO,
3754- &waittime, (socklen_t)sizeof(struct timeval));
3755+ &waittime, (socklen_t)sizeof(struct timeval));
3756+ (void)error;
3757 assert(error == 0);
3758 }
3759 #endif
3760
3761 #ifdef HAVE_RCVTIMEO
3762- if (server->root->rcv_timeout)
3763+ if (server->root->rcv_timeout > 0)
3764 {
3765 struct timeval waittime;
3766
3767- waittime.tv_sec= 0;
3768- waittime.tv_usec= server->root->rcv_timeout;
3769+ waittime.tv_sec= server->root->rcv_timeout / 1000000;
3770+ waittime.tv_usec= server->root->rcv_timeout % 1000000;
3771
3772 int error= setsockopt(server->fd, SOL_SOCKET, SO_RCVTIMEO,
3773 &waittime, (socklen_t)sizeof(struct timeval));
3774+ (void)(error);
3775 assert(error == 0);
3776 }
3777 #endif
3778@@ -279,11 +285,14 @@
3779 int set= 1;
3780 int error= setsockopt(server->fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&set, sizeof(int));
3781
3782+ assert(error == 0);
3783+
3784 // This is not considered a fatal error
3785 if (error == -1)
3786 {
3787- WATCHPOINT_ERRNO(get_socket_errno());
3788+#if 0
3789 perror("setsockopt(SO_NOSIGPIPE)");
3790+#endif
3791 }
3792 }
3793 #endif
3794@@ -296,6 +305,7 @@
3795 linger.l_linger= 0; /* By default on close() just drop the socket */
3796 int error= setsockopt(server->fd, SOL_SOCKET, SO_LINGER,
3797 &linger, (socklen_t)sizeof(struct linger));
3798+ (void)(error);
3799 assert(error == 0);
3800 }
3801
3802@@ -305,6 +315,7 @@
3803
3804 int error= setsockopt(server->fd, IPPROTO_TCP, TCP_NODELAY,
3805 &flag, (socklen_t)sizeof(int));
3806+ (void)(error);
3807 assert(error == 0);
3808 }
3809
3810@@ -314,6 +325,7 @@
3811
3812 int error= setsockopt(server->fd, SOL_SOCKET, SO_KEEPALIVE,
3813 &flag, (socklen_t)sizeof(int));
3814+ (void)(error);
3815 assert(error == 0);
3816 }
3817
3818@@ -322,6 +334,7 @@
3819 {
3820 int error= setsockopt(server->fd, IPPROTO_TCP, TCP_KEEPIDLE,
3821 &server->root->tcp_keepidle, (socklen_t)sizeof(int));
3822+ (void)(error);
3823 assert(error == 0);
3824 }
3825 #endif
3826@@ -330,6 +343,7 @@
3827 {
3828 int error= setsockopt(server->fd, SOL_SOCKET, SO_SNDBUF,
3829 &server->root->send_size, (socklen_t)sizeof(int));
3830+ (void)(error);
3831 assert(error == 0);
3832 }
3833
3834@@ -337,6 +351,7 @@
3835 {
3836 int error= setsockopt(server->fd, SOL_SOCKET, SO_RCVBUF,
3837 &server->root->recv_size, (socklen_t)sizeof(int));
3838+ (void)(error);
3839 assert(error == 0);
3840 }
3841
3842@@ -345,7 +360,7 @@
3843 set_socket_nonblocking(server);
3844 }
3845
3846-static memcached_return_t unix_socket_connect(memcached_server_st *server)
3847+static memcached_return_t unix_socket_connect(org::libmemcached::Instance* server)
3848 {
3849 #ifndef WIN32
3850 WATCHPOINT_ASSERT(server->fd == INVALID_SOCKET);
3851@@ -396,12 +411,12 @@
3852 #endif
3853 }
3854
3855-static memcached_return_t network_connect(memcached_server_st *server)
3856+static memcached_return_t network_connect(org::libmemcached::Instance* server)
3857 {
3858 bool timeout_error_occured= false;
3859
3860 WATCHPOINT_ASSERT(server->fd == INVALID_SOCKET);
3861- WATCHPOINT_ASSERT(server->cursor_active == 0);
3862+ WATCHPOINT_ASSERT(server->cursor_active_ == 0);
3863
3864 /*
3865 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.
3866@@ -451,13 +466,30 @@
3867 continue;
3868 }
3869
3870+ int type= server->address_info_next->ai_socktype;
3871+ if (HAVE_SOCK_CLOEXEC)
3872+ {
3873+ type|= SOCK_CLOEXEC;
3874+ }
3875+
3876 if ((server->fd= socket(server->address_info_next->ai_family,
3877- server->address_info_next->ai_socktype,
3878+ type,
3879 server->address_info_next->ai_protocol)) < 0)
3880 {
3881 return memcached_set_errno(*server, get_socket_errno(), NULL);
3882 }
3883
3884+ if (HAVE_SOCK_CLOEXEC == 0)
3885+ {
3886+#ifdef FD_CLOEXEC
3887+ int rval;
3888+ do
3889+ {
3890+ rval= fcntl (server->fd, F_SETFD, FD_CLOEXEC);
3891+ } while (rval == -1 && (errno == EINTR or errno == EAGAIN));
3892+#endif
3893+ }
3894+
3895 set_socket_options(server);
3896
3897 /* connect to server */
3898@@ -533,7 +565,7 @@
3899
3900 if (memcached_has_current_error(*server))
3901 {
3902- return memcached_server_error_return(server);
3903+ return memcached_instance_error_return(server);
3904 }
3905
3906 if (timeout_error_occured and server->state < MEMCACHED_SERVER_STATE_IN_PROGRESS)
3907@@ -551,7 +583,7 @@
3908 Based on time/failure count fail the connect without trying. This prevents waiting in a state where
3909 we get caught spending cycles just waiting.
3910 */
3911-static memcached_return_t backoff_handling(memcached_server_write_instance_st server, bool& in_timeout)
3912+static memcached_return_t backoff_handling(org::libmemcached::Instance* server, bool& in_timeout)
3913 {
3914 struct timeval curr_time;
3915 bool _gettime_success= (gettimeofday(&curr_time, NULL) == 0);
3916@@ -618,8 +650,9 @@
3917 return MEMCACHED_SUCCESS;
3918 }
3919
3920-static memcached_return_t _memcached_connect(memcached_server_write_instance_st server, const bool set_last_disconnected)
3921+static memcached_return_t _memcached_connect(org::libmemcached::Instance* server, const bool set_last_disconnected)
3922 {
3923+ assert(server);
3924 if (server->fd != INVALID_SOCKET)
3925 {
3926 return MEMCACHED_SUCCESS;
3927@@ -674,7 +707,8 @@
3928
3929 if (memcached_success(rc))
3930 {
3931- memcached_mark_server_as_clean(server);
3932+ server->mark_server_as_clean();
3933+ memcached_version_instance(server);
3934 return rc;
3935 }
3936 else if (set_last_disconnected)
3937@@ -683,7 +717,7 @@
3938 if (memcached_has_current_error(*server))
3939 {
3940 memcached_mark_server_for_timeout(server);
3941- assert(memcached_failed(memcached_server_error_return(server)));
3942+ assert(memcached_failed(memcached_instance_error_return(server)));
3943 }
3944 else
3945 {
3946@@ -696,7 +730,7 @@
3947 if (in_timeout)
3948 {
3949 char buffer[1024];
3950- int snprintf_length= snprintf(buffer, sizeof(buffer), "%s:%d", server->hostname, int(server->port));
3951+ int snprintf_length= snprintf(buffer, sizeof(buffer), "%s:%d", server->hostname, int(server->port()));
3952 return memcached_set_error(*server, MEMCACHED_SERVER_TEMPORARILY_DISABLED, MEMCACHED_AT, buffer, snprintf_length);
3953 }
3954 }
3955@@ -704,12 +738,17 @@
3956 return rc;
3957 }
3958
3959-memcached_return_t memcached_connect_try(memcached_server_write_instance_st server)
3960+memcached_return_t memcached_connect_try(org::libmemcached::Instance* server)
3961 {
3962+ if (server and server->root and server->root->state.is_parsing)
3963+ {
3964+ return MEMCACHED_SUCCESS;
3965+ }
3966+
3967 return _memcached_connect(server, false);
3968 }
3969
3970-memcached_return_t memcached_connect(memcached_server_write_instance_st server)
3971+memcached_return_t memcached_connect(org::libmemcached::Instance* server)
3972 {
3973 return _memcached_connect(server, true);
3974 }
3975
3976=== modified file 'libmemcached/connect.hpp'
3977--- libmemcached/connect.hpp 2012-01-23 07:21:54 +0000
3978+++ libmemcached/connect.hpp 2012-08-14 00:00:29 +0000
3979@@ -37,6 +37,6 @@
3980
3981 #pragma once
3982
3983-memcached_return_t memcached_connect_try(memcached_server_write_instance_st ptr);
3984-memcached_return_t memcached_connect(memcached_server_write_instance_st ptr);
3985+memcached_return_t memcached_connect_try(org::libmemcached::Instance*);
3986+memcached_return_t memcached_connect(org::libmemcached::Instance*);
3987
3988
3989=== modified file 'libmemcached/csl/context.h'
3990--- libmemcached/csl/context.h 2011-11-27 04:07:26 +0000
3991+++ libmemcached/csl/context.h 2012-08-14 00:00:29 +0000
3992@@ -61,6 +61,8 @@
3993 memc= memc_arg;
3994 init_scanner();
3995 rc= MEMCACHED_SUCCESS;
3996+
3997+ memc->state.is_parsing= true;
3998 }
3999
4000 bool end()
4001@@ -106,6 +108,7 @@
4002 ~Context()
4003 {
4004 destroy_scanner();
4005+ memc->state.is_parsing= false;
4006 }
4007
4008 yytokentype previous_token;
4009
4010=== modified file 'libmemcached/csl/parser.cc'
4011--- libmemcached/csl/parser.cc 2012-04-28 05:31:58 +0000
4012+++ libmemcached/csl/parser.cc 2012-08-14 00:00:29 +0000
4013@@ -185,32 +185,33 @@
4014 _TCP_KEEPALIVE = 298,
4015 _TCP_KEEPIDLE = 299,
4016 _TCP_NODELAY = 300,
4017- NAMESPACE = 301,
4018- POOL_MIN = 302,
4019- POOL_MAX = 303,
4020- MD5 = 304,
4021- CRC = 305,
4022- FNV1_64 = 306,
4023- FNV1A_64 = 307,
4024- FNV1_32 = 308,
4025- FNV1A_32 = 309,
4026- HSIEH = 310,
4027- MURMUR = 311,
4028- JENKINS = 312,
4029- CONSISTENT = 313,
4030- MODULA = 314,
4031- RANDOM = 315,
4032- TRUE = 316,
4033- FALSE = 317,
4034- FLOAT = 318,
4035- NUMBER = 319,
4036- PORT = 320,
4037- WEIGHT_START = 321,
4038- IPADDRESS = 322,
4039- HOSTNAME = 323,
4040- STRING = 324,
4041- QUOTED_STRING = 325,
4042- FILE_PATH = 326
4043+ FETCH_VERSION = 301,
4044+ NAMESPACE = 302,
4045+ POOL_MIN = 303,
4046+ POOL_MAX = 304,
4047+ MD5 = 305,
4048+ CRC = 306,
4049+ FNV1_64 = 307,
4050+ FNV1A_64 = 308,
4051+ FNV1_32 = 309,
4052+ FNV1A_32 = 310,
4053+ HSIEH = 311,
4054+ MURMUR = 312,
4055+ JENKINS = 313,
4056+ CONSISTENT = 314,
4057+ MODULA = 315,
4058+ RANDOM = 316,
4059+ TRUE = 317,
4060+ FALSE = 318,
4061+ FLOAT = 319,
4062+ NUMBER = 320,
4063+ PORT = 321,
4064+ WEIGHT_START = 322,
4065+ IPADDRESS = 323,
4066+ HOSTNAME = 324,
4067+ STRING = 325,
4068+ QUOTED_STRING = 326,
4069+ FILE_PATH = 327
4070 };
4071 #endif
4072
4073@@ -227,7 +228,7 @@
4074
4075
4076 /* Line 343 of yacc.c */
4077-#line 231 "libmemcached/csl/parser.cc"
4078+#line 232 "libmemcached/csl/parser.cc"
4079
4080 #ifdef short
4081 # undef short
4082@@ -444,22 +445,22 @@
4083 #endif /* !YYCOPY_NEEDED */
4084
4085 /* YYFINAL -- State number of the termination state. */
4086-#define YYFINAL 71
4087+#define YYFINAL 72
4088 /* YYLAST -- Last index in YYTABLE. */
4089-#define YYLAST 74
4090+#define YYLAST 75
4091
4092 /* YYNTOKENS -- Number of terminals. */
4093-#define YYNTOKENS 75
4094+#define YYNTOKENS 76
4095 /* YYNNTS -- Number of nonterminals. */
4096 #define YYNNTS 12
4097 /* YYNRULES -- Number of rules. */
4098-#define YYNRULES 67
4099+#define YYNRULES 68
4100 /* YYNRULES -- Number of states. */
4101-#define YYNSTATES 85
4102+#define YYNSTATES 86
4103
4104 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
4105 #define YYUNDEFTOK 2
4106-#define YYMAXUTOK 326
4107+#define YYMAXUTOK 327
4108
4109 #define YYTRANSLATE(YYX) \
4110 ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
4111@@ -470,10 +471,10 @@
4112 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
4113 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
4114 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
4115- 2, 2, 74, 2, 2, 2, 2, 2, 2, 2,
4116- 2, 2, 2, 2, 63, 2, 2, 2, 2, 2,
4117+ 2, 2, 75, 2, 2, 2, 2, 2, 2, 2,
4118+ 2, 2, 2, 2, 64, 2, 2, 2, 2, 2,
4119 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
4120- 2, 64, 2, 2, 2, 2, 2, 2, 2, 2,
4121+ 2, 65, 2, 2, 2, 2, 2, 2, 2, 2,
4122 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
4123 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
4124 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
4125@@ -498,8 +499,8 @@
4126 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
4127 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
4128 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
4129- 55, 56, 57, 58, 59, 60, 61, 62, 65, 66,
4130- 67, 68, 69, 70, 71, 72, 73
4131+ 55, 56, 57, 58, 59, 60, 61, 62, 63, 66,
4132+ 67, 68, 69, 70, 71, 72, 73, 74
4133 };
4134
4135 #if YYDEBUG
4136@@ -509,44 +510,44 @@
4137 {
4138 0, 0, 3, 5, 9, 11, 13, 15, 17, 19,
4139 21, 23, 27, 32, 37, 41, 44, 47, 50, 52,
4140- 55, 58, 63, 66, 69, 71, 73, 75, 77, 79,
4141+ 55, 57, 60, 65, 68, 71, 73, 75, 77, 79,
4142 81, 83, 85, 87, 89, 91, 93, 95, 97, 99,
4143 101, 103, 105, 107, 109, 111, 113, 115, 117, 119,
4144- 121, 122, 124, 125, 127, 129, 131, 133, 135, 137,
4145- 139, 141, 143, 145, 147, 149, 151, 153
4146+ 121, 123, 124, 126, 127, 129, 131, 133, 135, 137,
4147+ 139, 141, 143, 145, 147, 149, 151, 153, 155
4148 };
4149
4150 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
4151 static const yytype_int8 yyrhs[] =
4152 {
4153- 76, 0, -1, 77, -1, 76, 74, 77, -1, 78,
4154+ 77, 0, -1, 78, -1, 77, 75, 78, -1, 79,
4155 -1, 3, -1, 10, -1, 4, -1, 5, -1, 6,
4156- -1, 7, -1, 8, 74, 85, -1, 11, 70, 82,
4157- 83, -1, 11, 69, 82, 83, -1, 12, 85, 83,
4158- -1, 9, 85, -1, 47, 66, -1, 48, 66, -1,
4159- 79, -1, 46, 85, -1, 20, 86, -1, 20, 86,
4160- 63, 84, -1, 21, 84, -1, 80, 66, -1, 81,
4161- -1, 40, -1, 33, -1, 19, -1, 25, -1, 23,
4162- -1, 24, -1, 29, -1, 30, -1, 32, -1, 34,
4163- -1, 35, -1, 36, -1, 37, -1, 17, -1, 18,
4164- -1, 22, -1, 28, -1, 31, -1, 38, -1, 39,
4165- -1, 45, -1, 43, -1, 44, -1, 41, -1, 42,
4166- -1, -1, 67, -1, -1, 68, -1, 49, -1, 50,
4167+ -1, 7, -1, 8, 75, 86, -1, 11, 71, 83,
4168+ 84, -1, 11, 70, 83, 84, -1, 12, 86, 84,
4169+ -1, 9, 86, -1, 48, 67, -1, 49, 67, -1,
4170+ 80, -1, 47, 86, -1, 46, -1, 20, 87, -1,
4171+ 20, 87, 64, 85, -1, 21, 85, -1, 81, 67,
4172+ -1, 82, -1, 40, -1, 33, -1, 19, -1, 25,
4173+ -1, 23, -1, 24, -1, 29, -1, 30, -1, 32,
4174+ -1, 34, -1, 35, -1, 36, -1, 37, -1, 17,
4175+ -1, 18, -1, 22, -1, 28, -1, 31, -1, 38,
4176+ -1, 39, -1, 45, -1, 43, -1, 44, -1, 41,
4177+ -1, 42, -1, -1, 68, -1, -1, 69, -1, 50,
4178 -1, 51, -1, 52, -1, 53, -1, 54, -1, 55,
4179- -1, 56, -1, 57, -1, 71, -1, 72, -1, 58,
4180- -1, 59, -1, 60, -1
4181+ -1, 56, -1, 57, -1, 58, -1, 72, -1, 73,
4182+ -1, 59, -1, 60, -1, 61, -1
4183 };
4184
4185 /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
4186 static const yytype_uint16 yyrline[] =
4187 {
4188- 0, 188, 188, 189, 193, 195, 197, 199, 204, 209,
4189- 213, 217, 228, 238, 248, 257, 261, 265, 269, 273,
4190- 285, 298, 311, 318, 325, 334, 340, 344, 348, 352,
4191- 356, 360, 364, 368, 372, 376, 380, 384, 391, 395,
4192- 399, 403, 407, 411, 415, 419, 423, 427, 431, 435,
4193- 442, 443, 448, 449, 454, 458, 462, 466, 470, 474,
4194- 478, 482, 486, 493, 497, 504, 508, 512
4195+ 0, 189, 189, 190, 194, 196, 198, 200, 205, 210,
4196+ 214, 218, 229, 239, 249, 258, 262, 266, 270, 274,
4197+ 286, 290, 303, 316, 323, 330, 339, 345, 349, 353,
4198+ 357, 361, 365, 369, 373, 377, 381, 385, 389, 396,
4199+ 400, 404, 408, 412, 416, 420, 424, 428, 432, 436,
4200+ 440, 447, 448, 453, 454, 459, 463, 467, 471, 475,
4201+ 479, 483, 487, 491, 498, 502, 509, 513, 517
4202 };
4203 #endif
4204
4205@@ -565,10 +566,10 @@
4206 "RCV_TIMEOUT", "REMOVE_FAILED_SERVERS", "RETRY_TIMEOUT", "SND_TIMEOUT",
4207 "SOCKET_RECV_SIZE", "SOCKET_SEND_SIZE", "SORT_HOSTS", "SUPPORT_CAS",
4208 "USER_DATA", "USE_UDP", "VERIFY_KEY", "_TCP_KEEPALIVE", "_TCP_KEEPIDLE",
4209- "_TCP_NODELAY", "NAMESPACE", "POOL_MIN", "POOL_MAX", "MD5", "CRC",
4210- "FNV1_64", "FNV1A_64", "FNV1_32", "FNV1A_32", "HSIEH", "MURMUR",
4211- "JENKINS", "CONSISTENT", "MODULA", "RANDOM", "TRUE", "FALSE", "','",
4212- "'='", "FLOAT", "NUMBER", "PORT", "WEIGHT_START", "IPADDRESS",
4213+ "_TCP_NODELAY", "FETCH_VERSION", "NAMESPACE", "POOL_MIN", "POOL_MAX",
4214+ "MD5", "CRC", "FNV1_64", "FNV1A_64", "FNV1_32", "FNV1A_32", "HSIEH",
4215+ "MURMUR", "JENKINS", "CONSISTENT", "MODULA", "RANDOM", "TRUE", "FALSE",
4216+ "','", "'='", "FLOAT", "NUMBER", "PORT", "WEIGHT_START", "IPADDRESS",
4217 "HOSTNAME", "STRING", "QUOTED_STRING", "FILE_PATH", "' '", "$accept",
4218 "begin", "statement", "expression", "behaviors", "behavior_number",
4219 "behavior_boolean", "optional_port", "optional_weight", "hash", "string",
4220@@ -587,21 +588,21 @@
4221 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
4222 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
4223 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
4224- 315, 316, 317, 44, 61, 318, 319, 320, 321, 322,
4225- 323, 324, 325, 326, 32
4226+ 315, 316, 317, 318, 44, 61, 319, 320, 321, 322,
4227+ 323, 324, 325, 326, 327, 32
4228 };
4229 # endif
4230
4231 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
4232 static const yytype_uint8 yyr1[] =
4233 {
4234- 0, 75, 76, 76, 77, 77, 77, 77, 77, 77,
4235- 77, 77, 78, 78, 78, 78, 78, 78, 78, 79,
4236- 79, 79, 79, 79, 79, 79, 80, 80, 80, 80,
4237- 80, 80, 80, 80, 80, 80, 80, 80, 81, 81,
4238- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
4239- 82, 82, 83, 83, 84, 84, 84, 84, 84, 84,
4240- 84, 84, 84, 85, 85, 86, 86, 86
4241+ 0, 76, 77, 77, 78, 78, 78, 78, 78, 78,
4242+ 78, 78, 79, 79, 79, 79, 79, 79, 79, 80,
4243+ 80, 80, 80, 80, 80, 80, 80, 81, 81, 81,
4244+ 81, 81, 81, 81, 81, 81, 81, 81, 81, 82,
4245+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
4246+ 82, 83, 83, 84, 84, 85, 85, 85, 85, 85,
4247+ 85, 85, 85, 85, 86, 86, 87, 87, 87
4248 };
4249
4250 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
4251@@ -609,11 +610,11 @@
4252 {
4253 0, 2, 1, 3, 1, 1, 1, 1, 1, 1,
4254 1, 3, 4, 4, 3, 2, 2, 2, 1, 2,
4255- 2, 4, 2, 2, 1, 1, 1, 1, 1, 1,
4256- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
4257- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
4258- 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
4259- 1, 1, 1, 1, 1, 1, 1, 1
4260+ 1, 2, 4, 2, 2, 1, 1, 1, 1, 1,
4261+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
4262+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
4263+ 1, 0, 1, 0, 1, 1, 1, 1, 1, 1,
4264+ 1, 1, 1, 1, 1, 1, 1, 1, 1
4265 };
4266
4267 /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
4268@@ -622,44 +623,44 @@
4269 static const yytype_uint8 yydefact[] =
4270 {
4271 0, 5, 7, 8, 9, 10, 0, 0, 6, 0,
4272- 0, 38, 39, 27, 0, 0, 40, 29, 30, 28,
4273- 41, 31, 32, 42, 33, 26, 34, 35, 36, 37,
4274- 43, 44, 25, 48, 49, 46, 47, 45, 0, 0,
4275- 0, 0, 2, 4, 18, 0, 24, 0, 63, 64,
4276- 15, 50, 50, 52, 65, 66, 67, 20, 54, 55,
4277- 56, 57, 58, 59, 60, 61, 62, 22, 19, 16,
4278- 17, 1, 0, 23, 11, 51, 52, 52, 53, 14,
4279- 0, 3, 13, 12, 21
4280+ 0, 39, 40, 28, 0, 0, 41, 30, 31, 29,
4281+ 42, 32, 33, 43, 34, 27, 35, 36, 37, 38,
4282+ 44, 45, 26, 49, 50, 47, 48, 46, 20, 0,
4283+ 0, 0, 0, 2, 4, 18, 0, 25, 0, 64,
4284+ 65, 15, 51, 51, 53, 66, 67, 68, 21, 55,
4285+ 56, 57, 58, 59, 60, 61, 62, 63, 23, 19,
4286+ 16, 17, 1, 0, 24, 11, 52, 53, 53, 54,
4287+ 14, 0, 3, 13, 12, 22
4288 };
4289
4290 /* YYDEFGOTO[NTERM-NUM]. */
4291 static const yytype_int8 yydefgoto[] =
4292 {
4293- -1, 41, 42, 43, 44, 45, 46, 76, 79, 67,
4294- 50, 57
4295+ -1, 42, 43, 44, 45, 46, 47, 77, 80, 68,
4296+ 51, 58
4297 };
4298
4299 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
4300 STATE-NUM. */
4301-#define YYPACT_NINF -61
4302+#define YYPACT_NINF -62
4303 static const yytype_int8 yypact[] =
4304 {
4305- -2, -61, -61, -61, -61, -61, -60, -24, -61, -20,
4306- -24, -61, -61, -61, -47, 13, -61, -61, -61, -61,
4307- -61, -61, -61, -61, -61, -61, -61, -61, -61, -61,
4308- -61, -61, -61, -61, -61, -61, -61, -61, -24, -41,
4309- -15, 0, -61, -61, -61, -11, -61, -24, -61, -61,
4310- -61, -10, -10, -12, -61, -61, -61, -5, -61, -61,
4311- -61, -61, -61, -61, -61, -61, -61, -61, -61, -61,
4312- -61, -61, -2, -61, -61, -61, -12, -12, -61, -61,
4313- 13, -61, -61, -61, -61
4314+ -2, -62, -62, -62, -62, -62, -61, -24, -62, -20,
4315+ -24, -62, -62, -62, -48, 13, -62, -62, -62, -62,
4316+ -62, -62, -62, -62, -62, -62, -62, -62, -62, -62,
4317+ -62, -62, -62, -62, -62, -62, -62, -62, -62, -24,
4318+ -42, -15, 0, -62, -62, -62, -11, -62, -24, -62,
4319+ -62, -62, -10, -10, -12, -62, -62, -62, -5, -62,
4320+ -62, -62, -62, -62, -62, -62, -62, -62, -62, -62,
4321+ -62, -62, -62, -2, -62, -62, -62, -12, -12, -62,
4322+ -62, 13, -62, -62, -62, -62
4323 };
4324
4325 /* YYPGOTO[NTERM-NUM]. */
4326 static const yytype_int8 yypgoto[] =
4327 {
4328- -61, -61, -13, -61, -61, -61, -61, 8, -23, -9,
4329- 14, -61
4330+ -62, -62, -13, -62, -62, -62, -62, 8, -23, -9,
4331+ 14, -62
4332 };
4333
4334 /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
4335@@ -668,18 +669,18 @@
4336 #define YYTABLE_NINF -1
4337 static const yytype_uint8 yytable[] =
4338 {
4339- 71, 1, 2, 3, 4, 5, 6, 7, 8, 9,
4340- 10, 54, 55, 56, 47, 11, 12, 13, 14, 15,
4341- 16, 17, 18, 19, 53, 69, 20, 21, 22, 23,
4342+ 72, 1, 2, 3, 4, 5, 6, 7, 8, 9,
4343+ 10, 55, 56, 57, 48, 11, 12, 13, 14, 15,
4344+ 16, 17, 18, 19, 54, 70, 20, 21, 22, 23,
4345 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
4346- 34, 35, 36, 37, 38, 39, 40, 48, 49, 51,
4347- 52, 70, 68, 82, 83, 73, 78, 75, 80, 81,
4348- 77, 74, 58, 59, 60, 61, 62, 63, 64, 65,
4349- 66, 84, 0, 0, 72
4350+ 34, 35, 36, 37, 38, 39, 40, 41, 49, 50,
4351+ 52, 53, 71, 69, 83, 84, 74, 79, 76, 81,
4352+ 82, 78, 75, 59, 60, 61, 62, 63, 64, 65,
4353+ 66, 67, 85, 0, 0, 73
4354 };
4355
4356 #define yypact_value_is_default(yystate) \
4357- ((yystate) == (-61))
4358+ ((yystate) == (-62))
4359
4360 #define yytable_value_is_error(yytable_value) \
4361 YYID (0)
4362@@ -687,13 +688,13 @@
4363 static const yytype_int8 yycheck[] =
4364 {
4365 0, 3, 4, 5, 6, 7, 8, 9, 10, 11,
4366- 12, 58, 59, 60, 74, 17, 18, 19, 20, 21,
4367- 22, 23, 24, 25, 10, 66, 28, 29, 30, 31,
4368+ 12, 59, 60, 61, 75, 17, 18, 19, 20, 21,
4369+ 22, 23, 24, 25, 10, 67, 28, 29, 30, 31,
4370 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
4371- 42, 43, 44, 45, 46, 47, 48, 71, 72, 69,
4372- 70, 66, 38, 76, 77, 66, 68, 67, 63, 72,
4373- 52, 47, 49, 50, 51, 52, 53, 54, 55, 56,
4374- 57, 80, -1, -1, 74
4375+ 42, 43, 44, 45, 46, 47, 48, 49, 72, 73,
4376+ 70, 71, 67, 39, 77, 78, 67, 69, 68, 64,
4377+ 73, 53, 48, 50, 51, 52, 53, 54, 55, 56,
4378+ 57, 58, 81, -1, -1, 75
4379 };
4380
4381 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
4382@@ -704,11 +705,11 @@
4383 12, 17, 18, 19, 20, 21, 22, 23, 24, 25,
4384 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
4385 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
4386- 48, 76, 77, 78, 79, 80, 81, 74, 71, 72,
4387- 85, 69, 70, 85, 58, 59, 60, 86, 49, 50,
4388- 51, 52, 53, 54, 55, 56, 57, 84, 85, 66,
4389- 66, 0, 74, 66, 85, 67, 82, 82, 68, 83,
4390- 63, 77, 83, 83, 84
4391+ 48, 49, 77, 78, 79, 80, 81, 82, 75, 72,
4392+ 73, 86, 70, 71, 86, 59, 60, 61, 87, 50,
4393+ 51, 52, 53, 54, 55, 56, 57, 58, 85, 86,
4394+ 67, 67, 0, 75, 67, 86, 68, 83, 83, 69,
4395+ 84, 64, 78, 84, 84, 85
4396 };
4397
4398 #define yyerrok (yyerrstatus = 0)
4399@@ -1557,28 +1558,28 @@
4400 case 4:
4401
4402 /* Line 1806 of yacc.c */
4403-#line 194 "libmemcached/csl/parser.yy"
4404+#line 195 "libmemcached/csl/parser.yy"
4405 { }
4406 break;
4407
4408 case 5:
4409
4410 /* Line 1806 of yacc.c */
4411-#line 196 "libmemcached/csl/parser.yy"
4412+#line 197 "libmemcached/csl/parser.yy"
4413 { }
4414 break;
4415
4416 case 6:
4417
4418 /* Line 1806 of yacc.c */
4419-#line 198 "libmemcached/csl/parser.yy"
4420+#line 199 "libmemcached/csl/parser.yy"
4421 { }
4422 break;
4423
4424 case 7:
4425
4426 /* Line 1806 of yacc.c */
4427-#line 200 "libmemcached/csl/parser.yy"
4428+#line 201 "libmemcached/csl/parser.yy"
4429 {
4430 context->set_end();
4431 YYACCEPT;
4432@@ -1588,7 +1589,7 @@
4433 case 8:
4434
4435 /* Line 1806 of yacc.c */
4436-#line 205 "libmemcached/csl/parser.yy"
4437+#line 206 "libmemcached/csl/parser.yy"
4438 {
4439 context->rc= MEMCACHED_PARSE_USER_ERROR;
4440 parser_abort(context, "ERROR called directly");
4441@@ -1598,7 +1599,7 @@
4442 case 9:
4443
4444 /* Line 1806 of yacc.c */
4445-#line 210 "libmemcached/csl/parser.yy"
4446+#line 211 "libmemcached/csl/parser.yy"
4447 {
4448 memcached_reset(context->memc);
4449 }
4450@@ -1607,7 +1608,7 @@
4451 case 10:
4452
4453 /* Line 1806 of yacc.c */
4454-#line 214 "libmemcached/csl/parser.yy"
4455+#line 215 "libmemcached/csl/parser.yy"
4456 {
4457 yydebug= 1;
4458 }
4459@@ -1616,7 +1617,7 @@
4460 case 11:
4461
4462 /* Line 1806 of yacc.c */
4463-#line 218 "libmemcached/csl/parser.yy"
4464+#line 219 "libmemcached/csl/parser.yy"
4465 {
4466 if ((context->rc= memcached_parse_configure_file(*context->memc, (yyvsp[(3) - (3)].string).c_str, (yyvsp[(3) - (3)].string).size)) != MEMCACHED_SUCCESS)
4467 {
4468@@ -1628,7 +1629,7 @@
4469 case 12:
4470
4471 /* Line 1806 of yacc.c */
4472-#line 229 "libmemcached/csl/parser.yy"
4473+#line 230 "libmemcached/csl/parser.yy"
4474 {
4475 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))))
4476 {
4477@@ -1643,7 +1644,7 @@
4478 case 13:
4479
4480 /* Line 1806 of yacc.c */
4481-#line 239 "libmemcached/csl/parser.yy"
4482+#line 240 "libmemcached/csl/parser.yy"
4483 {
4484 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))))
4485 {
4486@@ -1658,7 +1659,7 @@
4487 case 14:
4488
4489 /* Line 1806 of yacc.c */
4490-#line 249 "libmemcached/csl/parser.yy"
4491+#line 250 "libmemcached/csl/parser.yy"
4492 {
4493 if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, (yyvsp[(2) - (3)].string).c_str, (yyvsp[(3) - (3)].number))))
4494 {
4495@@ -1672,7 +1673,7 @@
4496 case 15:
4497
4498 /* Line 1806 of yacc.c */
4499-#line 258 "libmemcached/csl/parser.yy"
4500+#line 259 "libmemcached/csl/parser.yy"
4501 {
4502 memcached_set_configuration_file(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).size);
4503 }
4504@@ -1681,7 +1682,7 @@
4505 case 16:
4506
4507 /* Line 1806 of yacc.c */
4508-#line 262 "libmemcached/csl/parser.yy"
4509+#line 263 "libmemcached/csl/parser.yy"
4510 {
4511 context->memc->configure.initial_pool_size= (yyvsp[(2) - (2)].number);
4512 }
4513@@ -1690,7 +1691,7 @@
4514 case 17:
4515
4516 /* Line 1806 of yacc.c */
4517-#line 266 "libmemcached/csl/parser.yy"
4518+#line 267 "libmemcached/csl/parser.yy"
4519 {
4520 context->memc->configure.max_pool_size= (yyvsp[(2) - (2)].number);
4521 }
4522@@ -1699,7 +1700,7 @@
4523 case 19:
4524
4525 /* Line 1806 of yacc.c */
4526-#line 274 "libmemcached/csl/parser.yy"
4527+#line 275 "libmemcached/csl/parser.yy"
4528 {
4529 if (memcached_callback_get(context->memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL))
4530 {
4531@@ -1716,7 +1717,16 @@
4532 case 20:
4533
4534 /* Line 1806 of yacc.c */
4535-#line 286 "libmemcached/csl/parser.yy"
4536+#line 287 "libmemcached/csl/parser.yy"
4537+ {
4538+ memcached_flag(*context->memc, MEMCACHED_FLAG_IS_FETCHING_VERSION, true);
4539+ }
4540+ break;
4541+
4542+ case 21:
4543+
4544+/* Line 1806 of yacc.c */
4545+#line 291 "libmemcached/csl/parser.yy"
4546 {
4547 // Check to see if DISTRIBUTION has already been set
4548 if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (2)].distribution))) != MEMCACHED_SUCCESS)
4549@@ -1731,10 +1741,10 @@
4550 }
4551 break;
4552
4553- case 21:
4554+ case 22:
4555
4556 /* Line 1806 of yacc.c */
4557-#line 299 "libmemcached/csl/parser.yy"
4558+#line 304 "libmemcached/csl/parser.yy"
4559 {
4560 // Check to see if DISTRIBUTION has already been set
4561 if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (4)].distribution))) != MEMCACHED_SUCCESS)
4562@@ -1749,10 +1759,10 @@
4563 }
4564 break;
4565
4566- case 22:
4567+ case 23:
4568
4569 /* Line 1806 of yacc.c */
4570-#line 312 "libmemcached/csl/parser.yy"
4571+#line 317 "libmemcached/csl/parser.yy"
4572 {
4573 if (context->set_hash((yyvsp[(2) - (2)].hash)) == false)
4574 {
4575@@ -1761,10 +1771,10 @@
4576 }
4577 break;
4578
4579- case 23:
4580+ case 24:
4581
4582 /* Line 1806 of yacc.c */
4583-#line 319 "libmemcached/csl/parser.yy"
4584+#line 324 "libmemcached/csl/parser.yy"
4585 {
4586 if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (2)].behavior), (yyvsp[(2) - (2)].number))) != MEMCACHED_SUCCESS)
4587 {
4588@@ -1773,10 +1783,10 @@
4589 }
4590 break;
4591
4592- case 24:
4593+ case 25:
4594
4595 /* Line 1806 of yacc.c */
4596-#line 326 "libmemcached/csl/parser.yy"
4597+#line 331 "libmemcached/csl/parser.yy"
4598 {
4599 if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (1)].behavior), true)) != MEMCACHED_SUCCESS)
4600 {
4601@@ -1787,352 +1797,343 @@
4602 }
4603 break;
4604
4605- case 25:
4606-
4607-/* Line 1806 of yacc.c */
4608-#line 335 "libmemcached/csl/parser.yy"
4609- {
4610- }
4611- break;
4612-
4613 case 26:
4614
4615 /* Line 1806 of yacc.c */
4616-#line 341 "libmemcached/csl/parser.yy"
4617+#line 340 "libmemcached/csl/parser.yy"
4618+ {
4619+ }
4620+ break;
4621+
4622+ case 27:
4623+
4624+/* Line 1806 of yacc.c */
4625+#line 346 "libmemcached/csl/parser.yy"
4626 {
4627 (yyval.behavior)= MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS;
4628 }
4629 break;
4630
4631- case 27:
4632+ case 28:
4633
4634 /* Line 1806 of yacc.c */
4635-#line 345 "libmemcached/csl/parser.yy"
4636+#line 350 "libmemcached/csl/parser.yy"
4637 {
4638 (yyval.behavior)= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT;
4639 }
4640 break;
4641
4642- case 28:
4643+ case 29:
4644
4645 /* Line 1806 of yacc.c */
4646-#line 349 "libmemcached/csl/parser.yy"
4647+#line 354 "libmemcached/csl/parser.yy"
4648 {
4649 (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK;
4650 }
4651 break;
4652
4653- case 29:
4654+ case 30:
4655
4656 /* Line 1806 of yacc.c */
4657-#line 353 "libmemcached/csl/parser.yy"
4658+#line 358 "libmemcached/csl/parser.yy"
4659 {
4660 (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK;
4661 }
4662 break;
4663
4664- case 30:
4665+ case 31:
4666
4667 /* Line 1806 of yacc.c */
4668-#line 357 "libmemcached/csl/parser.yy"
4669+#line 362 "libmemcached/csl/parser.yy"
4670 {
4671 (yyval.behavior)= MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH;
4672 }
4673 break;
4674
4675- case 31:
4676+ case 32:
4677
4678 /* Line 1806 of yacc.c */
4679-#line 361 "libmemcached/csl/parser.yy"
4680+#line 366 "libmemcached/csl/parser.yy"
4681 {
4682 (yyval.behavior)= MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS;
4683 }
4684 break;
4685
4686- case 32:
4687+ case 33:
4688
4689 /* Line 1806 of yacc.c */
4690-#line 365 "libmemcached/csl/parser.yy"
4691+#line 370 "libmemcached/csl/parser.yy"
4692 {
4693 (yyval.behavior)= MEMCACHED_BEHAVIOR_POLL_TIMEOUT;
4694 }
4695 break;
4696
4697- case 33:
4698+ case 34:
4699
4700 /* Line 1806 of yacc.c */
4701-#line 369 "libmemcached/csl/parser.yy"
4702+#line 374 "libmemcached/csl/parser.yy"
4703 {
4704 (yyval.behavior)= MEMCACHED_BEHAVIOR_RCV_TIMEOUT;
4705 }
4706 break;
4707
4708- case 34:
4709+ case 35:
4710
4711 /* Line 1806 of yacc.c */
4712-#line 373 "libmemcached/csl/parser.yy"
4713+#line 378 "libmemcached/csl/parser.yy"
4714 {
4715 (yyval.behavior)= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT;
4716 }
4717 break;
4718
4719- case 35:
4720+ case 36:
4721
4722 /* Line 1806 of yacc.c */
4723-#line 377 "libmemcached/csl/parser.yy"
4724+#line 382 "libmemcached/csl/parser.yy"
4725 {
4726 (yyval.behavior)= MEMCACHED_BEHAVIOR_SND_TIMEOUT;
4727 }
4728 break;
4729
4730- case 36:
4731+ case 37:
4732
4733 /* Line 1806 of yacc.c */
4734-#line 381 "libmemcached/csl/parser.yy"
4735+#line 386 "libmemcached/csl/parser.yy"
4736 {
4737 (yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE;
4738 }
4739 break;
4740
4741- case 37:
4742+ case 38:
4743
4744 /* Line 1806 of yacc.c */
4745-#line 385 "libmemcached/csl/parser.yy"
4746+#line 390 "libmemcached/csl/parser.yy"
4747 {
4748 (yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE;
4749 }
4750 break;
4751
4752- case 38:
4753+ case 39:
4754
4755 /* Line 1806 of yacc.c */
4756-#line 392 "libmemcached/csl/parser.yy"
4757+#line 397 "libmemcached/csl/parser.yy"
4758 {
4759 (yyval.behavior)= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL;
4760 }
4761 break;
4762
4763- case 39:
4764+ case 40:
4765
4766 /* Line 1806 of yacc.c */
4767-#line 396 "libmemcached/csl/parser.yy"
4768+#line 401 "libmemcached/csl/parser.yy"
4769 {
4770 (yyval.behavior)= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
4771 }
4772 break;
4773
4774- case 40:
4775+ case 41:
4776
4777 /* Line 1806 of yacc.c */
4778-#line 400 "libmemcached/csl/parser.yy"
4779+#line 405 "libmemcached/csl/parser.yy"
4780 {
4781 (yyval.behavior)= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
4782 }
4783 break;
4784
4785- case 41:
4786+ case 42:
4787
4788 /* Line 1806 of yacc.c */
4789-#line 404 "libmemcached/csl/parser.yy"
4790+#line 409 "libmemcached/csl/parser.yy"
4791 {
4792 (yyval.behavior)= MEMCACHED_BEHAVIOR_NOREPLY;
4793 }
4794 break;
4795
4796- case 42:
4797+ case 43:
4798
4799 /* Line 1806 of yacc.c */
4800-#line 408 "libmemcached/csl/parser.yy"
4801+#line 413 "libmemcached/csl/parser.yy"
4802 {
4803 (yyval.behavior)= MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ;
4804 }
4805 break;
4806
4807- case 43:
4808+ case 44:
4809
4810 /* Line 1806 of yacc.c */
4811-#line 412 "libmemcached/csl/parser.yy"
4812+#line 417 "libmemcached/csl/parser.yy"
4813 {
4814 (yyval.behavior)= MEMCACHED_BEHAVIOR_SORT_HOSTS;
4815 }
4816 break;
4817
4818- case 44:
4819+ case 45:
4820
4821 /* Line 1806 of yacc.c */
4822-#line 416 "libmemcached/csl/parser.yy"
4823+#line 421 "libmemcached/csl/parser.yy"
4824 {
4825 (yyval.behavior)= MEMCACHED_BEHAVIOR_SUPPORT_CAS;
4826 }
4827 break;
4828
4829- case 45:
4830+ case 46:
4831
4832 /* Line 1806 of yacc.c */
4833-#line 420 "libmemcached/csl/parser.yy"
4834+#line 425 "libmemcached/csl/parser.yy"
4835 {
4836 (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_NODELAY;
4837 }
4838 break;
4839
4840- case 46:
4841+ case 47:
4842
4843 /* Line 1806 of yacc.c */
4844-#line 424 "libmemcached/csl/parser.yy"
4845+#line 429 "libmemcached/csl/parser.yy"
4846 {
4847 (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPALIVE;
4848 }
4849 break;
4850
4851- case 47:
4852+ case 48:
4853
4854 /* Line 1806 of yacc.c */
4855-#line 428 "libmemcached/csl/parser.yy"
4856+#line 433 "libmemcached/csl/parser.yy"
4857 {
4858 (yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPIDLE;
4859 }
4860 break;
4861
4862- case 48:
4863+ case 49:
4864
4865 /* Line 1806 of yacc.c */
4866-#line 432 "libmemcached/csl/parser.yy"
4867+#line 437 "libmemcached/csl/parser.yy"
4868 {
4869 (yyval.behavior)= MEMCACHED_BEHAVIOR_USE_UDP;
4870 }
4871 break;
4872
4873- case 49:
4874+ case 50:
4875
4876 /* Line 1806 of yacc.c */
4877-#line 436 "libmemcached/csl/parser.yy"
4878+#line 441 "libmemcached/csl/parser.yy"
4879 {
4880 (yyval.behavior)= MEMCACHED_BEHAVIOR_VERIFY_KEY;
4881 }
4882 break;
4883
4884- case 50:
4885+ case 51:
4886
4887 /* Line 1806 of yacc.c */
4888-#line 442 "libmemcached/csl/parser.yy"
4889+#line 447 "libmemcached/csl/parser.yy"
4890 { (yyval.number)= MEMCACHED_DEFAULT_PORT;}
4891 break;
4892
4893- case 51:
4894-
4895-/* Line 1806 of yacc.c */
4896-#line 444 "libmemcached/csl/parser.yy"
4897- { }
4898- break;
4899-
4900 case 52:
4901
4902 /* Line 1806 of yacc.c */
4903-#line 448 "libmemcached/csl/parser.yy"
4904+#line 449 "libmemcached/csl/parser.yy"
4905+ { }
4906+ break;
4907+
4908+ case 53:
4909+
4910+/* Line 1806 of yacc.c */
4911+#line 453 "libmemcached/csl/parser.yy"
4912 { (yyval.number)= 1; }
4913 break;
4914
4915- case 53:
4916-
4917-/* Line 1806 of yacc.c */
4918-#line 450 "libmemcached/csl/parser.yy"
4919- { }
4920- break;
4921-
4922 case 54:
4923
4924 /* Line 1806 of yacc.c */
4925 #line 455 "libmemcached/csl/parser.yy"
4926+ { }
4927+ break;
4928+
4929+ case 55:
4930+
4931+/* Line 1806 of yacc.c */
4932+#line 460 "libmemcached/csl/parser.yy"
4933 {
4934 (yyval.hash)= MEMCACHED_HASH_MD5;
4935 }
4936 break;
4937
4938- case 55:
4939+ case 56:
4940
4941 /* Line 1806 of yacc.c */
4942-#line 459 "libmemcached/csl/parser.yy"
4943+#line 464 "libmemcached/csl/parser.yy"
4944 {
4945 (yyval.hash)= MEMCACHED_HASH_CRC;
4946 }
4947 break;
4948
4949- case 56:
4950+ case 57:
4951
4952 /* Line 1806 of yacc.c */
4953-#line 463 "libmemcached/csl/parser.yy"
4954+#line 468 "libmemcached/csl/parser.yy"
4955 {
4956 (yyval.hash)= MEMCACHED_HASH_FNV1_64;
4957 }
4958 break;
4959
4960- case 57:
4961+ case 58:
4962
4963 /* Line 1806 of yacc.c */
4964-#line 467 "libmemcached/csl/parser.yy"
4965+#line 472 "libmemcached/csl/parser.yy"
4966 {
4967 (yyval.hash)= MEMCACHED_HASH_FNV1A_64;
4968 }
4969 break;
4970
4971- case 58:
4972+ case 59:
4973
4974 /* Line 1806 of yacc.c */
4975-#line 471 "libmemcached/csl/parser.yy"
4976+#line 476 "libmemcached/csl/parser.yy"
4977 {
4978 (yyval.hash)= MEMCACHED_HASH_FNV1_32;
4979 }
4980 break;
4981
4982- case 59:
4983+ case 60:
4984
4985 /* Line 1806 of yacc.c */
4986-#line 475 "libmemcached/csl/parser.yy"
4987+#line 480 "libmemcached/csl/parser.yy"
4988 {
4989 (yyval.hash)= MEMCACHED_HASH_FNV1A_32;
4990 }
4991 break;
4992
4993- case 60:
4994+ case 61:
4995
4996 /* Line 1806 of yacc.c */
4997-#line 479 "libmemcached/csl/parser.yy"
4998+#line 484 "libmemcached/csl/parser.yy"
4999 {
5000 (yyval.hash)= MEMCACHED_HASH_HSIEH;
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches