Attachment 947099 Details for Bug 1152738 – xcache.patch

xcache.patch

xcache.patch (text/plain), 1.18 KB, created by Remi Collet on 2014-10-15 06:26:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Remi Collet

Created: 2014-10-15 06:26:10 UTC

Size: 1.18 KB

patch

obsolete

>diff -up mod_cacher/xc_cacher.c.old mod_cacher/xc_cacher.c
>--- mod_cacher/xc_cacher.c.old	2014-10-15 08:19:37.037374339 +0200
>+++ mod_cacher/xc_cacher.c	2014-10-15 08:15:58.906476009 +0200
>@@ -3216,6 +3216,27 @@ PHP_FUNCTION(xcache_get)
> 	VAR_BUFFER_FREE(name);
> }
> /* }}} */
>+
>+static zend_bool can_be_cached (zval *value TSRMLS_DC) {
>+	zend_bool ret = 1;
>+
>+	if (Z_TYPE_P(value) == IS_OBJECT) {
>+		ret = 0;
>+
>+	} else if (Z_TYPE_P(value) == IS_ARRAY) {
>+		zval **entry;
>+		HashPosition pos;
>+
>+		for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(value), &pos);
>+			zend_hash_get_current_data_ex(Z_ARRVAL_P(value), (void **)&entry, &pos) == SUCCESS;
>+			zend_hash_move_forward_ex(Z_ARRVAL_P(value), &pos)
>+		) {
>+			ret &= can_be_cached(*entry);
>+		}
>+	}
>+	return ret;
>+}
>+
> /* {{{ proto bool  xcache_set(string name, mixed value [, int ttl])
>    Store data to cache by specified name */
> PHP_FUNCTION(xcache_set)
>@@ -3237,7 +3258,7 @@ PHP_FUNCTION(xcache_set)
> 		return;
> 	}
> 
>-	if (Z_TYPE_P(value) == IS_OBJECT) {
>+	if (!can_be_cached(value TSRMLS_CC)) {
> 		php_error_docref(NULL TSRMLS_CC, E_ERROR, "Objects cannot be stored in the variable cache. Use serialize before xcache_set");
> 		RETURN_NULL();
> 	}

Actions: View

Attachments on bug 1152738: 947022 | 947023 | 947024 | 947025 | 947026 | 947027 | 947028 | 947029 | 947030 | 947031 | 947032 | 947099 | 947116