Fixed bug #17566 3.0.4 cache delete bug. Does not need to be merged to head.

This commit is contained in:
Herman Radtke
2010-06-14 17:11:50 +00:00
parent c87e84c197
commit 3b5f4db711
2 changed files with 25 additions and 2 deletions

View File

@@ -638,7 +638,7 @@ static void php_mmc_numeric(INTERNAL_FUNCTION_PARAMETERS, int deleted, int inver
}
if (deleted) {
pool->protocol->delete(request, request->key, request->key_len, value);
pool->protocol->delete(request, request->key, request->key_len, exptime);
}
else {
pool->protocol->mutate(request, *key, request->key, request->key_len, invert ? -value : value, defval, defval_used, exptime);
@@ -672,7 +672,7 @@ static void php_mmc_numeric(INTERNAL_FUNCTION_PARAMETERS, int deleted, int inver
}
if (deleted) {
pool->protocol->delete(request, request->key, request->key_len, value);
pool->protocol->delete(request, request->key, request->key_len, exptime);
}
else {
pool->protocol->mutate(request, keys, request->key, request->key_len, invert ? -value : value, defval, defval_used, exptime);

23
tests/pecl17566.phpt Normal file
View File

@@ -0,0 +1,23 @@
--TEST--
PECL bug #17566 (3.0.4 cache delete bug)
--SKIPIF--
<?php include 'connect.inc'; ?>
--FILE--
<?php
include 'connect.inc';
$m1 = new Memcache;
$m1->connect($host, $port);
$m1->set("test", "123");
$m1->delete("test");
$m2 = new Memcache;
$m2->connect($host, $port);
var_dump($m2->get("test"));
echo "Done\n";
?>
--EXPECTF--
bool(false)
Done