memcached 1.2.6.pre → 1.2.6.pre2

data/CHANGELOG

@@ -1,4 +1,4 @@
-v1.2.6.pre. Fix build issue on FreeBSD. Fix errno mangling on timeouts during memcached_connect().
+v1.2.6.pre2. Fix build issue on FreeBSD. Fix errno mangling on timeouts during memcached_connect().
 
 v1.2.5. Compile properly on JRuby (but doesn't run yet). Do zero-copy Ruby string allocations to improve performance.
 

data/Manifest

@@ -10,6 +10,7 @@ ext/extconf.rb
 ext/libmemcached-0.32.tar.gz
 ext/libmemcached-1.patch
 ext/libmemcached-10.patch
+ext/libmemcached-11.patch
 ext/libmemcached-2.patch
 ext/libmemcached-3.patch
 ext/libmemcached-4.patch

data/ext/libmemcached-10.patch

@@ -5,7 +5,7 @@ diff -uwr a/libmemcached-0.32/libmemcached/memcached_connect.c b/libmemcached-0.
  
            if (error != 1 || fds[0].revents & POLLERR)
            {
-+            ptr->cached_errno = errno;
++            ptr->cached_errno = 0;
 +
              if (fds[0].revents & POLLERR)
              {

data/ext/libmemcached-11.patch

@@ -0,0 +1,32 @@
+diff -urw a/libmemcached-0.32/libmemcached/memcached_connect.c b/libmemcached-0.32/libmemcached/memcached_connect.c
+--- a/libmemcached-0.32/libmemcached/memcached_connect.c	2011-04-25 15:45:35.000000000 -0700
++++ b/libmemcached-0.32/libmemcached/memcached_connect.c	2011-04-25 15:45:49.000000000 -0700
+@@ -235,6 +235,7 @@
+         if (errno == EINPROGRESS || /* nonblocking mode - first return, */
+             errno == EALREADY) /* nonblocking mode - subsequent returns */
+         {
++          fprintf(stderr, "entering poll. errno is %d\n", errno);
+           struct pollfd fds[1];
+           fds[0].fd = ptr->fd;
+           fds[0].events = POLLOUT;
+@@ -242,6 +243,7 @@
+ 
+           if (error != 1 || fds[0].revents & POLLERR)
+           {
++            fprintf(stderr, "poll return %d. errno is %d.\n", error, errno);
+             ptr->cached_errno = 0;
+ 
+             if (fds[0].revents & POLLERR)
+@@ -258,10 +260,12 @@
+         } 
+         else if (errno == EISCONN) /* we are connected :-) */
+         {
++          fprintf(stderr, "connect successful. errno is %d\n", errno);
+           break;
+         } 
+         else if (errno != EINTR)
+         {
++          fprintf(stderr, "unknown errno %d.\n", errno);
+           (void)close(ptr->fd);
+           ptr->fd= -1;
+           break;

data/memcached.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "1.2.6.pre"
+  s.version = "1.2.6.pre2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
-  s.date = %q{2011-04-25}
+  s.date = %q{2011-04-26}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "README", "TODO", "lib/memcached.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb"]
-  s.files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "ext/extconf-make.rb", "ext/extconf.rb", "ext/libmemcached-0.32.tar.gz", "ext/libmemcached-1.patch", "ext/libmemcached-10.patch", "ext/libmemcached-2.patch", "ext/libmemcached-3.patch", "ext/libmemcached-4.patch", "ext/libmemcached-5.patch", "ext/libmemcached-6.patch", "ext/libmemcached-7.patch", "ext/libmemcached-8.patch", "ext/libmemcached-9.patch", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "ext/sasl.patch", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "test/profile/benchmark.rb", "test/profile/c_profiler.rb", "test/profile/exercise.rb", "test/profile/rb_profiler.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "memcached.gemspec"]
+  s.files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "ext/extconf-make.rb", "ext/extconf.rb", "ext/libmemcached-0.32.tar.gz", "ext/libmemcached-1.patch", "ext/libmemcached-10.patch", "ext/libmemcached-11.patch", "ext/libmemcached-2.patch", "ext/libmemcached-3.patch", "ext/libmemcached-4.patch", "ext/libmemcached-5.patch", "ext/libmemcached-6.patch", "ext/libmemcached-7.patch", "ext/libmemcached-8.patch", "ext/libmemcached-9.patch", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "ext/sasl.patch", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "test/profile/benchmark.rb", "test/profile/c_profiler.rb", "test/profile/exercise.rb", "test/profile/rb_profiler.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "memcached.gemspec"]
   s.homepage = %q{http://fauna.github.com/fauna/memcached/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Memcached", "--main", "README"]
   s.require_paths = ["lib", "ext"]

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
-  hash: 961915996
+  hash: 1923831965
   prerelease: 6
   segments: 
   - 1
   - 2
   - 6
   - pre
-  version: 1.2.6.pre
+  - 2
+  version: 1.2.6.pre2
 platform: ruby
 authors: 
 - Evan Weaver
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 Z
+date: 2011-04-26 00:00:00 Z
 dependencies: []
 
 description: An interface to the libmemcached C client.
@@ -50,6 +51,7 @@ files:
 - ext/libmemcached-0.32.tar.gz
 - ext/libmemcached-1.patch
 - ext/libmemcached-10.patch
+- ext/libmemcached-11.patch
 - ext/libmemcached-2.patch
 - ext/libmemcached-3.patch
 - ext/libmemcached-4.patch