make &$this->headers work; &$this->headers["foo"] still doesn't though

[m6w6/ext-http] / php_http_property_proxy.c

diff --git a/php_http_property_proxy.c b/php_http_property_proxy.c
index 426f3c3dd2a6f5d63d7b7575d4c2f6b4df80c594..8fae2f115d9eead34d0aa1fc629bd75181f90dbf 100644 (file)
--- a/php_http_property_proxy.c
+++ b/php_http_property_proxy.c
@@ -1,6 +1,20 @@
-
-#include "php_http.h"
-
+/*
+    +--------------------------------------------------------------------+
+    | 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 1
+#endif
 
 php_http_property_proxy_t *php_http_property_proxy_init(php_http_property_proxy_t *proxy, zval *object, zval *member TSRMLS_DC)
 {
@@ -15,6 +29,9 @@ php_http_property_proxy_t *php_http_property_proxy_init(php_http_property_proxy_
        proxy->object = object;
        proxy->member = php_http_ztyp(IS_STRING, member);
 
+#if PHP_HTTP_PPDBG
+       fprintf(stderr, "proxy_init: %s\n", Z_STRVAL_P(proxy->member));
+#endif
        return proxy;
 }
 
@@ -88,14 +105,43 @@ static void php_http_property_proxy_object_set(zval **object, zval *value TSRMLS
 {
        php_http_property_proxy_object_t *obj = zend_object_store_get_object(*object TSRMLS_CC);
 
-       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);
+#if PHP_HTTP_PPDBG
+       fprintf(stderr, "proxy_set: %s\n", Z_STRVAL_P(obj->proxy->member));
+#endif
+       if (Z_TYPE_P(obj->proxy->object) == IS_OBJECT) {
+               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);
+       } else {
+               Z_ADDREF_P(value);
+               zend_symtable_update(Z_ARRVAL_P(obj->proxy->object), Z_STRVAL_P(obj->proxy->member), Z_STRLEN_P(obj->proxy->member)+1, (void *) &value, sizeof(zval *), NULL);
+       }
 }
 
 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);
 
-       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);
+#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);
+               }
+
+               return *data;
+       }
+
+       return NULL;
 }
 
 static STATUS php_http_property_proxy_object_cast(zval *object, zval *return_value, int type TSRMLS_DC)
@@ -118,7 +164,16 @@ static zval *php_http_property_proxy_object_read_dimension(zval *object, zval *o
 {
        zval *retval = NULL, *property = php_http_property_proxy_object_get(object TSRMLS_CC);
 
-       if (Z_TYPE_P(property) == IS_ARRAY) {
+#if PHP_HTTP_PPDBG
+       php_http_property_proxy_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+       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
+       if (type != BP_VAR_R) {
+               Z_ADDREF_P(property);
+               retval = php_http_property_proxy_init(NULL, property, offset TSRMLS_CC)->myself;
+       } else if (Z_TYPE_P(property) == IS_ARRAY) {
                zval **data = NULL;
 
                if (Z_TYPE_P(offset) == IS_LONG) {
@@ -127,7 +182,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);
@@ -138,7 +193,7 @@ static zval *php_http_property_proxy_object_read_dimension(zval *object, zval *o
                }
        }
        zval_ptr_dtor(&property);
-
+if(retval)Z_SET_ISREF_P(retval);
        return retval;
 }
 
@@ -146,10 +201,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);
-                       /* fallthrough */
+                       /* no break */
                case IS_ARRAY:
                        Z_ADDREF_P(value);
                        if (!offset) {
@@ -188,3 +249,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
+ */
+