X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_property_proxy.c;h=43ec7095c56f1054959122dc923e1da9013a0449;hp=44ccd2cdf1665c0d0405a0a0c79ae9e6dd61cd77;hb=66f7e8b6b937976c9c1d3dbfb86a90141b19b5c6;hpb=50546d76a9bf44bba6237df7c8101be125bc929a

diff --git a/php_http_property_proxy.c b/php_http_property_proxy.c
index 44ccd2c..43ec709 100644
--- a/php_http_property_proxy.c
+++ b/php_http_property_proxy.c
@@ -1,8 +1,22 @@
-
-#include "php_http.h"
-
-
-php_http_property_proxy_t *php_http_property_proxy_init(php_http_property_proxy_t *proxy, zval *object, zval *member TSRMLS_DC)
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
+#include "php_http_api.h"
+
+#ifndef PHP_HTTP_PPDBG
+#	define PHP_HTTP_PPDBG 0
+#endif
+
+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));
@@ -14,7 +28,14 @@ php_http_property_proxy_t *php_http_property_proxy_init(php_http_property_proxy_
 	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;
 }
 
@@ -23,6 +44,9 @@ 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)
@@ -84,18 +108,53 @@ 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;
+
+			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);
+		}
 
-	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);
+		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
+	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 {
+		Z_ADDREF_P(value);
+		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)
@@ -116,9 +175,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) {
@@ -127,7 +197,7 @@ static zval *php_http_property_proxy_object_read_dimension(zval *object, zval *o
 			}
 		} else {
 			offset = php_http_ztyp(IS_STRING, offset);
-			if (SUCCESS == zend_hash_find(Z_ARRVAL_P(property), Z_STRVAL_P(offset), Z_STRLEN_P(offset), (void *) &data)) {
+			if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(property), Z_STRVAL_P(offset), Z_STRLEN_P(offset), (void *) &data)) {
 				retval = *data;
 			}
 			zval_ptr_dtor(&offset);
@@ -146,9 +216,16 @@ 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);
+			/* no break */
 		case IS_ARRAY:
 			Z_ADDREF_P(value);
 			if (!offset) {
@@ -161,6 +238,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:
@@ -187,3 +265,13 @@ PHP_MINIT_FUNCTION(http_property_proxy)
 	return SUCCESS;
 }
 
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+