X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_property_proxy.c;h=5be7ebbc0ab2de91254cfadf9b8912ec4ca493af;hp=fc75f6daeb511298c156eabe2c7b2a92b4e265b0;hb=bfa5d473bdfb59fd39f04c2b8fb77ea4a7e9421b;hpb=aacbe6aa75ca07853bf88d5b3647f67f107d1af7

diff --git a/php_http_property_proxy.c b/php_http_property_proxy.c
index fc75f6d..5be7ebb 100644
--- a/php_http_property_proxy.c
+++ b/php_http_property_proxy.c
@@ -12,7 +12,11 @@
 
 #include "php_http_api.h"
 
-php_http_property_proxy_t *php_http_property_proxy_init(php_http_property_proxy_t *proxy, zval *object, zval *member TSRMLS_DC)
+#ifndef PHP_HTTP_PPDBG
+#	define PHP_HTTP_PPDBG 0
+#endif
+
+PHP_HTTP_API php_http_property_proxy_t *php_http_property_proxy_init(php_http_property_proxy_t *proxy, zval *object, zval *member, zval *parent TSRMLS_DC)
 {
 	if (!proxy) {
 		proxy = emalloc(sizeof(*proxy));
@@ -20,22 +24,32 @@ php_http_property_proxy_t *php_http_property_proxy_init(php_http_property_proxy_
 	memset(proxy, 0, sizeof(*proxy));
 
 	MAKE_STD_ZVAL(proxy->myself);
-	ZVAL_OBJVAL(proxy->myself, php_http_property_proxy_object_new_ex(php_http_property_proxy_class_entry, proxy, NULL TSRMLS_CC), 0);
+	ZVAL_OBJVAL(proxy->myself, php_http_property_proxy_object_new_ex(php_http_property_proxy_get_class_entry(), proxy, NULL TSRMLS_CC), 0);
 	Z_ADDREF_P(object);
 	proxy->object = object;
 	proxy->member = php_http_ztyp(IS_STRING, member);
+	if (parent) {
+		Z_ADDREF_P(parent);
+		proxy->parent = parent;
+	}
 
+#if PHP_HTTP_PPDBG
+	fprintf(stderr, "proxy_init: %s\n", Z_STRVAL_P(proxy->member));
+#endif
 	return proxy;
 }
 
-void php_http_property_proxy_dtor(php_http_property_proxy_t *proxy)
+PHP_HTTP_API void php_http_property_proxy_dtor(php_http_property_proxy_t *proxy)
 {
 	zval_ptr_dtor(&proxy->object);
 	zval_ptr_dtor(&proxy->member);
 	zval_ptr_dtor(&proxy->myself);
+	if (proxy->parent) {
+		zval_ptr_dtor(&proxy->parent);
+	}
 }
 
-void php_http_property_proxy_free(php_http_property_proxy_t **proxy)
+PHP_HTTP_API void php_http_property_proxy_free(php_http_property_proxy_t **proxy)
 {
 	if (*proxy) {
 		php_http_property_proxy_dtor(*proxy);
@@ -51,11 +65,18 @@ void php_http_property_proxy_free(php_http_property_proxy_t **proxy)
 
 PHP_HTTP_EMPTY_ARGS(__construct);
 
-zend_class_entry *php_http_property_proxy_class_entry;
-zend_function_entry php_http_property_proxy_method_entry[] = {
+static zend_class_entry *php_http_property_proxy_class_entry;
+
+zend_class_entry *php_http_property_proxy_get_class_entry(void)
+{
+	return php_http_property_proxy_class_entry;
+}
+
+static zend_function_entry php_http_property_proxy_method_entry[] = {
 	PHP_HTTP_PP_ME(__construct, ZEND_ACC_FINAL|ZEND_ACC_PRIVATE)
 	EMPTY_FUNCTION_ENTRY
 };
+
 static zend_object_handlers php_http_property_proxy_object_handlers;
 
 zend_object_value php_http_property_proxy_object_new(zend_class_entry *ce TSRMLS_DC)
@@ -94,18 +115,54 @@ void php_http_property_proxy_object_free(void *object TSRMLS_DC)
 	efree(o);
 }
 
-static void php_http_property_proxy_object_set(zval **object, zval *value TSRMLS_DC)
+static zval *php_http_property_proxy_object_get(zval *object TSRMLS_DC)
 {
-	php_http_property_proxy_object_t *obj = zend_object_store_get_object(*object TSRMLS_CC);
+	php_http_property_proxy_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+
+#if PHP_HTTP_PPDBG
+	fprintf(stderr, "proxy_get: %s\n", Z_STRVAL_P(obj->proxy->member));
+#endif
+	if (Z_TYPE_P(obj->proxy->object) == IS_OBJECT) {
+		return zend_read_property(Z_OBJCE_P(obj->proxy->object), obj->proxy->object, Z_STRVAL_P(obj->proxy->member), Z_STRLEN_P(obj->proxy->member), 0 TSRMLS_CC);
+	} else {
+		zval **data = NULL;
+
+		if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(obj->proxy->object), Z_STRVAL_P(obj->proxy->member), Z_STRLEN_P(obj->proxy->member)+1, (void *) &data)) {
+			Z_ADDREF_PP(data);
+		} else {
+			zval *unset;
 
-	zend_update_property(Z_OBJCE_P(obj->proxy->object), obj->proxy->object, Z_STRVAL_P(obj->proxy->member), Z_STRLEN_P(obj->proxy->member), value TSRMLS_CC);
+			MAKE_STD_ZVAL(unset);
+			ZVAL_NULL(unset);
+			zend_symtable_update(Z_ARRVAL_P(obj->proxy->object), Z_STRVAL_P(obj->proxy->member), Z_STRLEN_P(obj->proxy->member)+1, (void *) &unset, sizeof(zval *), (void *) &data);
+			Z_ADDREF_PP(data);
+		}
+
+		return *data;
+	}
+
+	return NULL;
 }
 
-static zval *php_http_property_proxy_object_get(zval *object TSRMLS_DC)
+static void php_http_property_proxy_object_set(zval **object, zval *value TSRMLS_DC)
 {
-	php_http_property_proxy_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
-
-	return zend_read_property(Z_OBJCE_P(obj->proxy->object), obj->proxy->object, Z_STRVAL_P(obj->proxy->member), Z_STRLEN_P(obj->proxy->member), 0 TSRMLS_CC);
+	php_http_property_proxy_object_t *obj = zend_object_store_get_object(*object TSRMLS_CC);
+	zval *target = obj->proxy->parent ? php_http_property_proxy_object_get(obj->proxy->parent TSRMLS_CC) : obj->proxy->object;
+
+#if PHP_HTTP_PPDBG
+	fprintf(stderr, "proxy_set: %s\n", Z_STRVAL_P(obj->proxy->member));
+#endif
+	Z_ADDREF_P(value);
+	if (Z_TYPE_P(target) == IS_OBJECT) {
+		zend_update_property(Z_OBJCE_P(target), target, Z_STRVAL_P(obj->proxy->member), Z_STRLEN_P(obj->proxy->member), value TSRMLS_CC);
+	} else {
+		zend_symtable_update(Z_ARRVAL_P(target), Z_STRVAL_P(obj->proxy->member), Z_STRLEN_P(obj->proxy->member)+1, (void *) &value, sizeof(zval *), NULL);
+	}
+	/* propagate */
+	if (obj->proxy->parent) {
+		php_http_property_proxy_object_set(&obj->proxy->parent, target TSRMLS_CC);
+		zval_ptr_dtor(&target);
+	}
 }
 
 static STATUS php_http_property_proxy_object_cast(zval *object, zval *return_value, int type TSRMLS_DC)
@@ -126,9 +183,20 @@ static STATUS php_http_property_proxy_object_cast(zval *object, zval *return_val
 
 static zval *php_http_property_proxy_object_read_dimension(zval *object, zval *offset, int type TSRMLS_DC)
 {
-	zval *retval = NULL, *property = php_http_property_proxy_object_get(object TSRMLS_CC);
-
-	if (Z_TYPE_P(property) == IS_ARRAY) {
+	php_http_property_proxy_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+	zval *retval = NULL, *property;
+
+#if PHP_HTTP_PPDBG
+	zval *ocpy = php_http_ztyp(IS_STRING, offset);
+	fprintf(stderr, "read_dimension: %s.%s (%d)\n", Z_STRVAL_P(obj->proxy->member), Z_STRVAL_P(ocpy), type);
+	zval_ptr_dtor(&ocpy);
+#endif
+
+	property = php_http_property_proxy_object_get(object TSRMLS_CC);
+	if (type != BP_VAR_R) {
+		Z_ADDREF_P(property);
+		retval = php_http_property_proxy_init(NULL, property, offset, obj->proxy->myself TSRMLS_CC)->myself;
+	} else if (Z_TYPE_P(property) == IS_ARRAY) {
 		zval **data = NULL;
 
 		if (Z_TYPE_P(offset) == IS_LONG) {
@@ -156,6 +224,12 @@ static void php_http_property_proxy_object_write_dimension(zval *object, zval *o
 {
 	zval *property = php_http_property_proxy_object_get(object TSRMLS_CC);
 
+#if PHP_HTTP_PPDBG
+	php_http_property_proxy_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+	zval *ocpy = offset ? php_http_ztyp(IS_STRING, offset) : offset;
+	fprintf(stderr, "write_dimension: %s.%s (%d)\n", Z_STRVAL_P(obj->proxy->member), ocpy?Z_STRVAL_P(ocpy):"", Z_TYPE_P(property));
+	if(ocpy)zval_ptr_dtor(&ocpy);
+#endif
 	switch (Z_TYPE_P(property)) {
 		case IS_NULL:
 			array_init(property);
@@ -172,6 +246,7 @@ static void php_http_property_proxy_object_write_dimension(zval *object, zval *o
 				zval_ptr_dtor(&offset);
 			}
 			php_http_property_proxy_object_set(&object, property TSRMLS_CC);
+			zval_ptr_dtor(&property);
 			break;
 
 		default:
@@ -186,7 +261,7 @@ PHP_METHOD(HttpPropertyProxy, __construct)
 
 PHP_MINIT_FUNCTION(http_property_proxy)
 {
-	PHP_HTTP_REGISTER_CLASS(http\\Object, PropertyProxy, http_property_proxy, NULL, ZEND_ACC_FINAL);
+	PHP_HTTP_REGISTER_CLASS(http\\Object, PropertyProxy, http_property_proxy, NULL, ZEND_ACC_FINAL_CLASS);
 	php_http_property_proxy_class_entry->create_object = php_http_property_proxy_object_new;
 	memcpy(&php_http_property_proxy_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_http_property_proxy_object_handlers.set = php_http_property_proxy_object_set;