Add change of expiration time in cache callback.

Preliminary support for changing of the item expiration
in the cache callback. Function signture is now:
 user_info_cb($memc, $key, &$value[, &$expiration = 0])

Author: tricky

php_memcached.c

@@ -2622,38 +2622,51 @@ static memcached_return php_memc_do_cache_callback(zval *zmemc_obj, zend_fcall_i
 {
 	char *payload = NULL;
 	size_t payload_len = 0;
-	zval **params[3];
+	zval **params[4];
 	zval *retval;
 	zval *z_key;
+	zval *z_expiration;
+
 	uint32_t flags = 0;
 	memcached_return rc;
 	php_memc_t* i_obj;
 	memcached_return status = MEMCACHED_SUCCESS;
 	int result;
 
 	MAKE_STD_ZVAL(z_key);
+	MAKE_STD_ZVAL(z_expiration);
 	ZVAL_STRINGL(z_key, key, key_len, 1);
 	ZVAL_NULL(value);
+	ZVAL_LONG(z_expiration, 0);
 
 	params[0] = &zmemc_obj;
 	params[1] = &z_key;
 	params[2] = &value;
+	params[3] = &z_expiration;
 
 	fci->retval_ptr_ptr = &retval;
 	fci->params = params;
-	fci->param_count = 3;
+	fci->param_count = sizeof(params) / sizeof(params[0]);
 
 	result = zend_call_function(fci, fcc TSRMLS_CC);
 	if (result == SUCCESS && retval) {
 		i_obj = (php_memc_t *) zend_object_store_get_object(zmemc_obj TSRMLS_CC);
 		struct memc_obj *m_obj = i_obj->obj;
 
 		if (zend_is_true(retval)) {
+			time_t expiration;
+
+			if (Z_TYPE_P(z_expiration) != IS_LONG) {
+				convert_to_long(z_expiration);
+			}
+
+			expiration = Z_LVAL_P(z_expiration);
+
 			payload = php_memc_zval_to_payload(value, &payload_len, &flags, m_obj->serializer TSRMLS_CC);
 			if (payload == NULL) {
 				status = (memcached_return)MEMC_RES_PAYLOAD_FAILURE;
 			} else {
-				rc = memcached_set(m_obj->memc, key, key_len, payload, payload_len, 0, flags);
+				rc = memcached_set(m_obj->memc, key, key_len, payload, payload_len, expiration, flags);
 				if (rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED) {
 					status = rc;
 				}
@@ -2679,6 +2692,7 @@ static memcached_return php_memc_do_cache_callback(zval *zmemc_obj, zend_fcall_i
 	}
 
 	zval_ptr_dtor(&z_key);
+	zval_ptr_dtor(&z_expiration);
 
 	return status;
 }

tests/experimental/cachecallback.phpt

@@ -8,13 +8,15 @@ global $runs;
 
 $runs = 0;
 
-function the_callback(Memcached $memc, $key, &$value) {
+function the_callback(Memcached $memc, $key, &$value, &$expiration) {
 	global $runs;
 
 	echo "Miss\n";
 	var_dump($key);
 	var_dump($value);
 
+	$expiration = "10";
+
 	$runs++;
 	if ($runs == 1) {
 		$value = "giving exception";
@@ -40,6 +42,7 @@ try {
 	echo $php_errormsg, "\n";
 	echo $e->getMessage(), "\n";
 }
+error_reporting(E_ALL);
 $v = $m->get('foo', 'the_callback');
 var_dump($v);
 $v = $m->get('foo', 'the_callback');