memcached 1.3.3 → 1.3.4

data/ext/libmemcached-0.32/docs/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

data/ext/libmemcached-0.32/libmemcached/Makefile.am

@@ -15,7 +15,6 @@ pkginclude_HEADERS= memcached.h \
                     memcached_configure.h \
 		    memcached_constants.h \
 		    memcached_get.h \
-		    memcached_touch.h \
 		    memcached_result.h \
                     memcached_sasl.h \
 		    memcached_server.h \
@@ -85,7 +84,7 @@ libmemcached_la_LIBADD= $(LIBM) libmemcachedcallbacks.la
 libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION) $(LD_VERSION_SCRIPT) $(LIBM)
 
 if HAVE_SASL
-libmemcached_la_LDFLAGS+= $(LIBSASL)
+libmemcached_la_LDFLAGS+= $(LTLIBSASL)
 libmemcached_la_SOURCES += memcached_sasl.c
 endif
 

data/ext/libmemcached-0.32/libmemcached/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39,7 +39,7 @@ target_triplet = @target@
 @BUILD_LIBMEMCACHEDUTIL_TRUE@am__append_1 = memcached_util.h memcached_pool.h
 @INCLUDE_HSIEH_SRC_TRUE@am__append_2 = hsieh_hash.c
 @BUILD_BYTEORDER_TRUE@am__append_3 = byteorder.c
-@HAVE_SASL_TRUE@am__append_4 = $(LIBSASL)
+@HAVE_SASL_TRUE@am__append_4 = $(LTLIBSASL)
 @HAVE_SASL_TRUE@am__append_5 = memcached_sasl.c
 @HAVE_DTRACE_TRUE@am__append_6 = dtrace_probes.h
 @HAVE_DTRACE_TRUE@am__append_7 = libmemcached_probes.d
@@ -169,7 +169,7 @@ libmemcachedcallbacks_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libmemcachedcallbacks_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = 
+DEFAULT_INCLUDES =
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -188,10 +188,11 @@ DIST_SOURCES = $(am__libmemcached_la_SOURCES_DIST) \
 	$(libmemcachedcallbacks_la_SOURCES)
 am__pkginclude_HEADERS_DIST = memcached.h memcached.hpp \
 	memcached_configure.h memcached_constants.h memcached_get.h \
-	memcached_touch.h memcached_result.h memcached_sasl.h \
-	memcached_server.h memcached_storage.h memcached_string.h \
-	memcached_types.h memcached_watchpoint.h visibility.h \
-	memcached_util.h memcached_pool.h
+  memcached_touch.h \
+	memcached_result.h memcached_sasl.h memcached_server.h \
+	memcached_storage.h memcached_string.h memcached_types.h \
+	memcached_watchpoint.h visibility.h memcached_util.h \
+	memcached_pool.h
 HEADERS = $(noinst_HEADERS) $(pkginclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -360,7 +361,7 @@ top_srcdir = @top_srcdir@
 EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver \
              memcached_configure.h.in
 
-EXTRA_HEADERS = 
+EXTRA_HEADERS =
 BUILT_SOURCES = $(am__append_6)
 noinst_HEADERS = libmemcached_probes.h \
                  memcached_io.h \
@@ -369,10 +370,10 @@ noinst_HEADERS = libmemcached_probes.h \
                  memcached/protocol_binary.h
 
 pkginclude_HEADERS = memcached.h memcached.hpp memcached_configure.h \
-	memcached_constants.h memcached_get.h memcached_touch.h \
-	memcached_result.h memcached_sasl.h memcached_server.h \
-	memcached_storage.h memcached_string.h memcached_types.h \
-	memcached_watchpoint.h visibility.h $(am__append_1)
+	memcached_constants.h memcached_get.h memcached_touch.h memcached_result.h \
+	memcached_sasl.h memcached_server.h memcached_storage.h \
+	memcached_string.h memcached_types.h memcached_watchpoint.h \
+	visibility.h $(am__append_1)
 lib_LTLIBRARIES = libmemcached.la
 noinst_LTLIBRARIES = libmemcachedcallbacks.la
 libmemcachedcallbacks_la_CFLAGS = ${AM_CFLAGS} ${NO_STRICT_ALIASING}
@@ -474,9 +475,9 @@ clean-noinstLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libmemcached.la: $(libmemcached_la_OBJECTS) $(libmemcached_la_DEPENDENCIES) 
+libmemcached.la: $(libmemcached_la_OBJECTS) $(libmemcached_la_DEPENDENCIES)
 	$(libmemcached_la_LINK) -rpath $(libdir) $(libmemcached_la_OBJECTS) $(libmemcached_la_LIBADD) $(LIBS)
-libmemcachedcallbacks.la: $(libmemcachedcallbacks_la_OBJECTS) $(libmemcachedcallbacks_la_DEPENDENCIES) 
+libmemcachedcallbacks.la: $(libmemcachedcallbacks_la_OBJECTS) $(libmemcachedcallbacks_la_DEPENDENCIES)
 	$(libmemcachedcallbacks_la_LINK)  $(libmemcachedcallbacks_la_OBJECTS) $(libmemcachedcallbacks_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:

data/ext/libmemcached-0.32/libmemcached/memcached_connect.c

@@ -57,8 +57,13 @@ static memcached_return set_socket_options(memcached_server_st *ptr)
     int error;
     struct timeval waittime;
 
-    waittime.tv_sec= 0;
-    waittime.tv_usec= ptr->root->snd_timeout;
+    if (ptr->root->snd_timeout >= (1000 * 1000)) {
+        waittime.tv_sec= ptr->root->snd_timeout / (1000 * 1000);
+        waittime.tv_usec= ptr->root->snd_timeout % (1000 * 1000);
+    } else {
+        waittime.tv_sec= 0;
+        waittime.tv_usec= ptr->root->snd_timeout;
+    }
 
     error= setsockopt(ptr->fd, SOL_SOCKET, SO_SNDTIMEO, 
                       &waittime, (socklen_t)sizeof(struct timeval));
@@ -72,8 +77,13 @@ static memcached_return set_socket_options(memcached_server_st *ptr)
     int error;
     struct timeval waittime;
 
-    waittime.tv_sec= 0;
-    waittime.tv_usec= ptr->root->rcv_timeout;
+    if (ptr->root->rcv_timeout >= (1000 * 1000)) {
+        waittime.tv_sec= ptr->root->rcv_timeout / (1000 * 1000);
+        waittime.tv_usec= ptr->root->rcv_timeout % (1000 * 1000);
+    } else {
+        waittime.tv_sec= 0;
+        waittime.tv_usec= ptr->root->rcv_timeout;
+    }
 
     error= setsockopt(ptr->fd, SOL_SOCKET, SO_RCVTIMEO, 
                       &waittime, (socklen_t)sizeof(struct timeval));

data/ext/libmemcached-0.32/libmemcachedutil/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

data/ext/libmemcached-0.32/m4/pandora_have_sasl.m4

@@ -35,7 +35,7 @@ AC_DEFUN([_PANDORA_SEARCH_SASL],[
               HAVE_LIBSASL="$HAVE_LIBSASL2"
               LIBSASL="$LIBSASL2"
               LIBSASL_PREFIX="$LIBSASL2_PREFIX"
-	      LTLIBSASL="$LT_LIBSASL2"
+              LTLIBSASL="$LTLIBSASL2"
             ])
     ])
 

data/ext/libmemcached-0.32/support/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

data/ext/libmemcached-0.32/tests/Makefile.am

@@ -41,6 +41,14 @@ atomsmasher_LDADD = $(top_builddir)/clients/libgenexec.la libtest.la libserver.l
 startservers_SOURCES = start.c
 startservers_LDADD = libserver.la $(LDADDS)
 
+if HAVE_SASL
+testapp_LDADD+= $(LTLIBSASL)
+testplus_LDADD+= $(LTLIBSASL)
+udptest_LDADD+= $(LTLIBSASL)
+atomsmasher_LDADD+= $(LTLIBSASL)
+startservers_LDADD+= $(LTLIBSASL)
+endif
+
 record:
 	./testapp > output.res
 	./testplus > output_plus.res

data/ext/libmemcached-0.32/tests/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40,6 +40,11 @@ target_triplet = @target@
 @BUILD_LIBMEMCACHEDUTIL_TRUE@am__append_1 = $(top_builddir)/libmemcachedutil/libmemcachedutil.la
 noinst_PROGRAMS = testapp$(EXEEXT) testplus$(EXEEXT) udptest$(EXEEXT) \
 	atomsmasher$(EXEEXT) startservers$(EXEEXT)
+@HAVE_SASL_TRUE@am__append_2 = $(LTLIBSASL)
+@HAVE_SASL_TRUE@am__append_3 = $(LTLIBSASL)
+@HAVE_SASL_TRUE@am__append_4 = $(LTLIBSASL)
+@HAVE_SASL_TRUE@am__append_5 = $(LTLIBSASL)
+@HAVE_SASL_TRUE@am__append_6 = $(LTLIBSASL)
 subdir = tests
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -88,24 +93,29 @@ libtest_la_OBJECTS = $(am_libtest_la_OBJECTS)
 PROGRAMS = $(noinst_PROGRAMS)
 am_atomsmasher_OBJECTS = atomsmasher.$(OBJEXT)
 atomsmasher_OBJECTS = $(am_atomsmasher_OBJECTS)
+am__DEPENDENCIES_1 =
+@HAVE_SASL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 atomsmasher_DEPENDENCIES = $(top_builddir)/clients/libgenexec.la \
-	libtest.la libserver.la $(LDADDS)
+	libtest.la libserver.la $(LDADDS) $(am__DEPENDENCIES_2)
 am_startservers_OBJECTS = start.$(OBJEXT)
 startservers_OBJECTS = $(am_startservers_OBJECTS)
-startservers_DEPENDENCIES = libserver.la $(LDADDS)
+startservers_DEPENDENCIES = libserver.la $(LDADDS) \
+	$(am__DEPENDENCIES_2)
 am_testapp_OBJECTS = testapp-function.$(OBJEXT)
 testapp_OBJECTS = $(am_testapp_OBJECTS)
 testapp_DEPENDENCIES = $(top_builddir)/clients/libgenexec.la \
-	libtest.la libserver.la $(LDADDS)
+	libtest.la libserver.la $(LDADDS) $(am__DEPENDENCIES_2)
 testapp_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(testapp_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am_testplus_OBJECTS = plus.$(OBJEXT)
 testplus_OBJECTS = $(am_testplus_OBJECTS)
-testplus_DEPENDENCIES = libtest.la libserver.la $(LDADDS)
+testplus_DEPENDENCIES = libtest.la libserver.la $(LDADDS) \
+	$(am__DEPENDENCIES_2)
 am_udptest_OBJECTS = udp.$(OBJEXT)
 udptest_OBJECTS = $(am_udptest_OBJECTS)
-udptest_DEPENDENCIES = libtest.la libserver.la $(LDADDS)
+udptest_DEPENDENCIES = libtest.la libserver.la $(LDADDS) \
+	$(am__DEPENDENCIES_2)
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -318,15 +328,17 @@ libserver_la_SOURCES = server.c
 libtest_la_SOURCES = test.c
 testapp_CFLAGS = $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 testapp_SOURCES = function.c
-testapp_LDADD = $(top_builddir)/clients/libgenexec.la libtest.la libserver.la $(LDADDS)
+testapp_LDADD = $(top_builddir)/clients/libgenexec.la libtest.la \
+	libserver.la $(LDADDS) $(am__append_2)
 testplus_SOURCES = plus.cpp
-testplus_LDADD = libtest.la libserver.la $(LDADDS)
+testplus_LDADD = libtest.la libserver.la $(LDADDS) $(am__append_3)
 udptest_SOURCES = udp.c
-udptest_LDADD = libtest.la libserver.la $(LDADDS)
+udptest_LDADD = libtest.la libserver.la $(LDADDS) $(am__append_4)
 atomsmasher_SOURCES = atomsmasher.c
-atomsmasher_LDADD = $(top_builddir)/clients/libgenexec.la libtest.la libserver.la $(LDADDS)
+atomsmasher_LDADD = $(top_builddir)/clients/libgenexec.la libtest.la \
+	libserver.la $(LDADDS) $(am__append_5)
 startservers_SOURCES = start.c
-startservers_LDADD = libserver.la $(LDADDS)
+startservers_LDADD = libserver.la $(LDADDS) $(am__append_6)
 all: all-am
 
 .SUFFIXES:

data/memcached.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "1.3.3"
+  s.version = "1.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Evan Weaver}]
   s.cert_chain = [%q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem}]
-  s.date = %q{2011-09-25}
+  s.date = %q{2011-10-08}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = [%q{ext/extconf.rb}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memcached
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -50,7 +50,7 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-09-25 00:00:00.000000000Z
+date: 2011-10-08 00:00:00.000000000Z
 dependencies: []
 description: An interface to the libmemcached C client.
 email: ''