memcache 1.2.4 → 1.2.5

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
 :minor: 2
-:patch: 4
+:patch: 5
 :major: 1

data/ext/native_server.c

@@ -311,7 +311,8 @@ static VALUE mc_cas(int argc, VALUE *argv, VALUE self) {
   Data_Get_Struct(self, memcached_st, mc);
   rb_scan_args(argc, argv, "32", &key, &value, &cas, &expiry, &flags);
 
-  key   = StringValue(key);
+  key = StringValue(key);
+  if (!use_binary(mc)) key = escape_key(key, NULL);
   value = StringValue(value);
 
   result = memcached_cas(mc, RSTRING_PTR(key), RSTRING_LEN(key), RSTRING_PTR(value), RSTRING_LEN(value),
@@ -337,7 +338,8 @@ VALUE mc_incr(int argc, VALUE *argv, VALUE self) {
   Data_Get_Struct(self, memcached_st, mc);
   rb_scan_args(argc, argv, "11", &key, &amount);
 
-  key    = StringValue(key);
+  key = StringValue(key);
+  if (!use_binary(mc)) key = escape_key(key, NULL);
   amount = RTEST(amount) ? NUM2INT(amount) : 1;
 
   result = memcached_increment(mc, RSTRING_PTR(key), RSTRING_LEN(key), amount, value);
@@ -360,7 +362,8 @@ VALUE mc_decr(int argc, VALUE *argv, VALUE self) {
   Data_Get_Struct(self, memcached_st, mc);
   rb_scan_args(argc, argv, "11", &key, &amount);
 
-  key    = StringValue(key);
+  key = StringValue(key);
+  if (!use_binary(mc)) key = escape_key(key, NULL);
   amount = RTEST(amount) ? NUM2INT(amount) : 1;
 
   result = memcached_decrement(mc, RSTRING_PTR(key), RSTRING_LEN(key), amount, value);
@@ -380,6 +383,8 @@ VALUE mc_delete(VALUE self, VALUE key) {
 
   Data_Get_Struct(self, memcached_st, mc);
 
+  key = StringValue(key);
+  if (!use_binary(mc)) key = escape_key(key, NULL);
   result = memcached_delete(mc, RSTRING_PTR(key), RSTRING_LEN(key), 0);
 
   if (result == MEMCACHED_SUCCESS) {
@@ -399,7 +404,8 @@ VALUE mc_add(int argc, VALUE *argv, VALUE self) {
   Data_Get_Struct(self, memcached_st, mc);
   rb_scan_args(argc, argv, "22", &key, &value, &expiry, &flags);
 
-  key   = StringValue(key);
+  key = StringValue(key);
+  if (!use_binary(mc)) key = escape_key(key, NULL);
   value = StringValue(value);
 
   result = memcached_add(mc, RSTRING_PTR(key), RSTRING_LEN(key), RSTRING_PTR(value), RSTRING_LEN(value),
@@ -423,7 +429,8 @@ VALUE mc_replace(int argc, VALUE *argv, VALUE self) {
   Data_Get_Struct(self, memcached_st, mc);
   rb_scan_args(argc, argv, "22", &key, &value, &expiry, &flags);
 
-  key   = StringValue(key);
+  key = StringValue(key);
+  if (!use_binary(mc)) key = escape_key(key, NULL);
   value = StringValue(value);
 
   result = memcached_replace(mc, RSTRING_PTR(key), RSTRING_LEN(key), RSTRING_PTR(value), RSTRING_LEN(value),
@@ -445,6 +452,10 @@ VALUE mc_append(VALUE self, VALUE key, VALUE value) {
 
   Data_Get_Struct(self, memcached_st, mc);
 
+  key = StringValue(key);
+  if (!use_binary(mc)) key = escape_key(key, NULL);
+  value = StringValue(value);
+
   result = memcached_append(mc, RSTRING_PTR(key), RSTRING_LEN(key), RSTRING_PTR(value), RSTRING_LEN(value), 0, 0);
 
   if (result == MEMCACHED_SUCCESS) {
@@ -462,6 +473,10 @@ VALUE mc_prepend(VALUE self, VALUE key, VALUE value) {
 
   Data_Get_Struct(self, memcached_st, mc);
 
+  key = StringValue(key);
+  if (!use_binary(mc)) key = escape_key(key, NULL);
+  value = StringValue(value);
+
   result = memcached_prepend(mc, RSTRING_PTR(key), RSTRING_LEN(key), RSTRING_PTR(value), RSTRING_LEN(value), 0, 0);
 
   if (result == MEMCACHED_SUCCESS) {

data/memcache.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcache}
-  s.version = "1.2.4"
+  s.version = "1.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Balthrop"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcache
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors: 
 - Justin Balthrop