memcached 1.5.0 → 1.5.1

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v1.5.1. Fix segfault on Ruby 1.9.3-p429 (plerohellec).
+
 v1.5.0. Fix unknown return code errors (tmm1).
 
 v1.4.6. Correctly report key in error message instead of erroring again (jason-o-matic, timhaines).

data/ext/extconf.rb

@@ -1,6 +1,10 @@
 require 'mkmf'
 require 'rbconfig'
 
+unless find_header('sasl/sasl.h')
+    abort 'Please install SASL to continue. The package is called libsasl2-dev on Ubuntu and cyrus-sasl on Gentoo.'
+end
+
 HERE = File.expand_path(File.dirname(__FILE__))
 BUNDLE_PATH = Dir.glob("libmemcached-*").first
 
@@ -48,7 +52,8 @@ def check_libmemcached
 
   Dir.chdir(HERE) do
     Dir.chdir(BUNDLE_PATH) do
-      run("find . | xargs touch", "Touching all files so autoconf doesn't run.")
+      ts_now=Time.now.strftime("%Y%m%d%H%M.%S")
+      run("find . | xargs touch -t #{ts_now}", "Touching all files so autoconf doesn't run.")
       run("env CFLAGS='-fPIC #{LIBM_CFLAGS}' LDFLAGS='-fPIC #{LIBM_LDFLAGS}' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-utils --disable-dependency-tracking #{$CC} #{$EXTRA_CONF} 2>&1", "Configuring libmemcached.")
     end
 

data/ext/rlibmemcached_wrap.c

@@ -9016,12 +9016,11 @@ _wrap_memcached_fetch(int argc, VALUE *argv, VALUE self) {
   char *result = 0 ;
   VALUE vresult = Qnil;
 
-  {
-    char string[256];
-    size_t length = 0;
-    arg2 = string;
-    arg3 = &length;
-  }
+  char string[256];
+  size_t length = 0;
+  arg2 = string;
+  arg3 = &length;
+    
   arg4 = &temp4;
   arg5 = &temp5;
   arg6 = &temp6;
@@ -12764,12 +12763,11 @@ _wrap_memcached_fetch_rvalue(int argc, VALUE *argv, VALUE self) {
   VALUE result;
   VALUE vresult = Qnil;
 
-  {
-    char string[256];
-    size_t length = 0;
-    arg2 = string;
-    arg3 = &length;
-  }
+  char string[256];
+  size_t length = 0;
+  arg2 = string;
+  arg3 = &length;
+
   arg4 = &temp4;
   arg5 = &temp5;
   if ((argc < 1) || (argc > 1)) {

data/lib/memcached/memcached.rb

@@ -15,11 +15,11 @@ class Memcached
     :support_cas => false,
     :tcp_nodelay => false,
     :show_backtraces => false,
-    :retry_timeout => 30,
+    :retry_timeout => 60,
     :timeout => 0.25,
     :rcv_timeout => nil,
     :poll_timeout => nil,
-    :connect_timeout => 4,
+    :connect_timeout => 0.25,
     :prefix_key => '',
     :prefix_delimiter => '',
     :hash_with_prefix_key => true,

data/memcached.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = "memcached"
-  s.version = "1.5.0"
+  s.version = "1.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/cloudburst/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = "2012-12-07"
+  s.date = "2013-05-28"
   s.description = "An interface to the libmemcached C client."
   s.email = ""
   s.extensions = ["ext/extconf.rb"]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Memcached", "--main", "README.rdoc", "--exclude=ext/bin", "--exclude=ext/libmemcached-.*/(clients|tests)"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = "evan"
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.signing_key = "/Users/eweaver/cloudburst/configuration/gem_certificates/evan_weaver-original-private_key.pem"
   s.summary = "An interface to the libmemcached C client."
   s.test_files = ["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"]

data/test/profile/benchmark.rb

@@ -259,7 +259,7 @@ class Bench
       c.get @k3, true
     end
 
-    if defined?(Memcached) && ENV['TEST'].empty? && ENV['CLIENT'].empty?
+    if defined?(Memcached) && !ENV['TEST'] && !ENV['CLIENT']
       benchmark_hashes(Memcached::HASH_VALUES, "hash") do |i|
         Rlibmemcached.memcached_generate_hash_rvalue(@k1, i)
         Rlibmemcached.memcached_generate_hash_rvalue(@k2, i)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memcached
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   QUMzSFJXWnhJUzFzZm4vU3NxYTdFN29RTWt2NUZBWHIKeDVyS2VQZlhJTmY4
   WFRKY3prbDlPQkVZZEU5YU5kSnNKcFhEMGFzTGdHVndCSUNTNUJqb2hwNm1p
   ekpjREMxKwp5WjA9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -395,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: evan
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An interface to the libmemcached C client.