Check for MEMCACHED_DATA_EXISTS also when setting lock.

andreiz · andreiz · commit 0b3765a7aa73 · 2011-12-29T13:47:22.000-08:00
diff --git a/php_memcached_session.c b/php_memcached_session.c
@@ -73,7 +73,7 @@ static int php_memc_sess_lock(memcached_st *memc, const char *key TSRMLS_DC)
 			MEMC_G(sess_lock_key) = lock_key;
 			MEMC_G(sess_lock_key_len) = lock_key_len;
 			return 0;
-		} else if (status != MEMCACHED_NOTSTORED) {
+		} else if (status != MEMCACHED_NOTSTORED && status != MEMCACHED_DATA_EXISTS) {
 			break;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ static int php_memc_sess_lock(memcached_st memc, const char key TSRMLS_DC)`
`73`	`73`	`MEMC_G(sess_lock_key) = lock_key;`
`74`	`74`	`MEMC_G(sess_lock_key_len) = lock_key_len;`
`75`	`75`	`return 0;`
`76`		`- } else if (status != MEMCACHED_NOTSTORED) {`
	`76`	`+ } else if (status != MEMCACHED_NOTSTORED && status != MEMCACHED_DATA_EXISTS) {`
`77`	`77`	`break;`
`78`	`78`	`}`
`79`	`79`