- fixed a gotcha in http_chunked_decode (-size_t is always > 0)

[m6w6/ext-http] / http_message_object.c

diff --git a/http_message_object.c b/http_message_object.c
index 6b29ef8ac2ef5bb3c1fa1c30f3061e91368addf3..058f963d8cb81f8aa045901b352bdadb2188efad 100644 (file)
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -160,9 +160,6 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message
 
        o = ecalloc(1, sizeof(http_message_object));
        o->zo.ce = ce;
-       o->message = NULL;
-       o->parent.handle = 0;
-       o->parent.handlers = NULL;
 
        if (msg) {
                o->message = msg;
@@ -231,21 +228,25 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
        getObjectEx(http_message_object, obj, object);
        http_message *msg = obj->message;
        zval *return_value;
+#ifdef WONKY
+       zend_hash_value h = zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member)+1);
+#else
        zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
        
        if (!pinfo || ACC_PROP_PUBLIC(pinfo->flags)) {
                return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
        }
+#endif
 
        return_value = &EG(uninitialized_zval);
        return_value->refcount = 0;
        return_value->is_ref = 0;
 
-#if 0
-       fprintf(stderr, "Read HttpMessage::$%s\n", Z_STRVAL_P(member));
-#endif
-
+#ifdef WONKY
+       switch (h)
+#else
        switch (pinfo->h)
+#endif
        {
                case HTTP_MSG_PROPHASH_TYPE:
                        RETVAL_LONG(msg->type);
@@ -316,7 +317,11 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
                break;
                
                default:
+#ifdef WONKY
+                       return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
+#else
                        RETVAL_NULL();
+#endif
                break;
        }
 
@@ -327,18 +332,22 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 {
        getObjectEx(http_message_object, obj, object);
        http_message *msg = obj->message;
+#ifdef WONKY
+       zend_hash_value h = zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1);
+#else
        zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
        
        if (!pinfo || ACC_PROP_PUBLIC(pinfo->flags)) {
                zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
                return;
        }
-
-#if 0
-       fprintf(stderr, "Write HttpMessage::$%s\n", Z_STRVAL_P(member));
 #endif
 
+#ifdef WONKY
+       switch (h)
+#else
        switch (pinfo->h)
+#endif
        {
                case HTTP_MSG_PROPHASH_TYPE:
                        convert_to_long_ex(&value);
@@ -398,7 +407,13 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
                                convert_to_string_ex(&value);
                                STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)));
                        }
-                       
+               break;
+               
+               default:
+#ifdef WONKY
+                       zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
+#endif
+               break;
        }
 }
 
@@ -430,8 +445,6 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
                efree(m_prop_name); \
        }
 
-       //zend_hash_clean(OBJ_PROP(obj));
-
        ASSOC_PROP(array, long, "type", msg->type);
        ASSOC_PROP(array, double, "httpVersion", msg->http.version);