Added a warning regarding binary proto and touch

mkoppanen · mkoppanen · commit 79af37192618 · 2013-10-19T17:41:01.000+08:00
diff --git a/php_memcached.c b/php_memcached.c
@@ -1392,10 +1392,9 @@ static void php_memc_store_impl(INTERNAL_FUNCTION_PARAMETERS, int op, zend_bool
 	}
 
 	if (op == MEMC_OP_TOUCH) {
-#ifdef mikko_0
-		if (!memcached_behavior_get(m_obj->memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "touch is only supported with binary protocol");
-			RETURN_FALSE;
+#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX < 0x01000015
+		if (memcached_behavior_get(m_obj->memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "using touch command with binary protocol is not recommended with libmemcached versions below 1.0.15");
 		}
 #endif
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -1392,10 +1392,9 @@ static void php_memc_store_impl(INTERNAL_FUNCTION_PARAMETERS, int op, zend_bool`
`1392`	`1392`	`}`
`1393`	`1393`
`1394`	`1394`	`if (op == MEMC_OP_TOUCH) {`
`1395`		`-#ifdef mikko_0`
`1396`		`- if (!memcached_behavior_get(m_obj->memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)) {`
`1397`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "touch is only supported with binary protocol");`
`1398`		`- RETURN_FALSE;`
	`1395`	`+#if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX < 0x01000015`
	`1396`	`+ if (memcached_behavior_get(m_obj->memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)) {`
	`1397`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "using touch command with binary protocol is not recommended with libmemcached versions below 1.0.15");`
`1399`	`1398`	`}`
`1400`	`1399`	`#endif`
`1401`	`1400`	`} else {`