X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=2d3a231ad7471af577cd96bf4bf2aa3db96aa29c;hp=88cec86091f3b19dcf253d7d10b04a21a08f3647;hb=a820fb35e71f11ee1ac424f0bd0fb9ca6df90f16;hpb=687fcc79f03b9915884223259b4dc64196d7edf6 diff --git a/http_message_object.c b/http_message_object.c index 88cec86..2d3a231 100644 --- 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,20 +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 + ulong 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)); +#ifdef WONKY + switch (h) +#else + switch (pinfo->h) #endif - if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) { - zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member)); - return EG(uninitialized_zval_ptr); - } - - switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1)) { case HTTP_MSG_PROPHASH_TYPE: RETVAL_LONG(msg->type); @@ -315,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; } @@ -326,15 +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; - -#if 0 - fprintf(stderr, "Write HttpMessage::$%s\n", Z_STRVAL_P(member)); -#endif - if (!EG(scope) || !instanceof_function(EG(scope), obj->zo.ce TSRMLS_CC)) { - zend_error(E_WARNING, "Cannot access protected property %s::$%s", obj->zo.ce->name, Z_STRVAL_P(member)); +#ifdef WONKY + ulong 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; } +#endif - switch (zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1)) +#ifdef WONKY + switch (h) +#else + switch (pinfo->h) +#endif { case HTTP_MSG_PROPHASH_TYPE: convert_to_long_ex(&value); @@ -394,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; } } @@ -403,62 +422,62 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) zval *headers; getObjectEx(http_message_object, obj, object); http_message *msg = obj->message; + HashTable *props = OBJ_PROP(obj); + zval array; + + INIT_ZARR(array, props); -#define ASSOC_PROP(obj, ptype, name, val) \ +#define ASSOC_PROP(array, ptype, name, val) \ { \ - zval array; \ char *m_prop_name; \ int m_prop_len; \ - INIT_ZARR(array, OBJ_PROP(obj)); \ - zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \ + zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 0); \ add_assoc_ ##ptype## _ex(&array, m_prop_name, sizeof(name)+4, val); \ + efree(m_prop_name); \ } -#define ASSOC_STRING(obj, name, val) ASSOC_STRINGL(obj, name, val, strlen(val)) -#define ASSOC_STRINGL(obj, name, val, len) \ +#define ASSOC_STRING(array, name, val) ASSOC_STRINGL(array, name, val, strlen(val)) +#define ASSOC_STRINGL(array, name, val, len) \ { \ - zval array; \ char *m_prop_name; \ int m_prop_len; \ - INIT_ZARR(array, OBJ_PROP(obj)); \ - zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 1); \ + zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 0); \ add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+4, val, len, 1); \ + efree(m_prop_name); \ } - zend_hash_clean(OBJ_PROP(obj)); - - ASSOC_PROP(obj, long, "type", msg->type); - ASSOC_PROP(obj, double, "httpVersion", msg->http.version); + ASSOC_PROP(array, long, "type", msg->type); + ASSOC_PROP(array, double, "httpVersion", msg->http.version); switch (msg->type) { case HTTP_MSG_REQUEST: - ASSOC_PROP(obj, long, "responseCode", 0); - ASSOC_STRINGL(obj, "responseStatus", "", 0); - ASSOC_STRING(obj, "requestMethod", msg->http.info.request.method); - ASSOC_STRING(obj, "requestUri", msg->http.info.request.URI); + ASSOC_PROP(array, long, "responseCode", 0); + ASSOC_STRINGL(array, "responseStatus", "", 0); + ASSOC_STRING(array, "requestMethod", msg->http.info.request.method); + ASSOC_STRING(array, "requestUri", msg->http.info.request.URI); break; case HTTP_MSG_RESPONSE: - ASSOC_PROP(obj, long, "responseCode", msg->http.info.response.code); - ASSOC_STRING(obj, "responseStatus", msg->http.info.response.status); - ASSOC_STRINGL(obj, "requestMethod", "", 0); - ASSOC_STRINGL(obj, "requestUri", "", 0); + ASSOC_PROP(array, long, "responseCode", msg->http.info.response.code); + ASSOC_STRING(array, "responseStatus", msg->http.info.response.status); + ASSOC_STRINGL(array, "requestMethod", "", 0); + ASSOC_STRINGL(array, "requestUri", "", 0); break; case HTTP_MSG_NONE: default: - ASSOC_PROP(obj, long, "responseCode", 0); - ASSOC_STRINGL(obj, "responseStatus", "", 0); - ASSOC_STRINGL(obj, "requestMethod", "", 0); - ASSOC_STRINGL(obj, "requestUri", "", 0); + ASSOC_PROP(array, long, "responseCode", 0); + ASSOC_STRINGL(array, "responseStatus", "", 0); + ASSOC_STRINGL(array, "requestMethod", "", 0); + ASSOC_STRINGL(array, "requestUri", "", 0); break; } MAKE_STD_ZVAL(headers); array_init(headers); zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - ASSOC_PROP(obj, zval, "headers", headers); - ASSOC_STRINGL(obj, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg)); + ASSOC_PROP(array, zval, "headers", headers); + ASSOC_STRINGL(array, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg)); return OBJ_PROP(obj); }