static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC);
#define http_message_object_write_prop _http_message_object_write_prop
static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC);
+#define http_message_object_get_prop_ptr _http_message_object_get_prop_ptr
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRMLS_DC);
#define http_message_object_get_props _http_message_object_get_props
static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
http_message_object_handlers.read_property = http_message_object_read_prop;
http_message_object_handlers.write_property = http_message_object_write_prop;
http_message_object_handlers.get_properties = http_message_object_get_props;
- http_message_object_handlers.get_property_ptr_ptr = NULL;
+ http_message_object_handlers.get_property_ptr_ptr = http_message_object_get_prop_ptr;
zend_declare_property_long(THIS_CE, ZEND_STRS("type")-1, HTTP_MSG_NONE, ZEND_ACC_PROTECTED TSRMLS_CC);
zend_declare_property_string(THIS_CE, ZEND_STRS("body")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC);
freeObject(o);
}
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRMLS_DC)
+{
+ int member_len = Z_STRLEN_P(member);
+
+#ifndef WONKY
+ member_len += 1;
+#endif
+
+ if (!zend_hash_exists(&http_message_object_ce->properties_info, Z_STRVAL_P(member), member_len)) {
+ return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member TSRMLS_CC);
+ }
+ zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index");
+ return NULL;
+}
+
static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
{
getObjectEx(http_message_object, obj, object);
http_message *msg = obj->message;
zval *return_value;
-#ifdef WONKY
- ulong h = zend_hash_func(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) {
- return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
- }
+ int member_len = Z_STRLEN_P(member);
+
+#ifndef WONKY
+ member_len += 1;
#endif
- if (type == BP_VAR_W) {
+ if (!zend_hash_exists(&http_message_object_ce->properties_info, Z_STRVAL_P(member), member_len)) {
+ return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
+ }
+ if (type != BP_VAR_R) {
zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index");
return NULL;
}
return_value->is_ref = 0;
#endif
-#ifdef WONKY
- switch (h)
-#else
- switch (pinfo->h)
-#endif
+ switch (zend_hash_func(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1))
{
case HTTP_MSG_PROPHASH_TYPE:
case HTTP_MSG_CHILD_PROPHASH_TYPE:
default:
FREE_ZVAL(return_value);
+ zend_error(E_WARNING, "possible bug accessing HttpMessage property");
return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
}
getObjectEx(http_message_object, obj, object);
http_message *msg = obj->message;
zval *cpy = NULL;
-#ifdef WONKY
- ulong h = zend_hash_func(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) {
+ int member_len = Z_STRLEN_P(member);
+
+#ifndef WONKY
+ member_len += 1;
+#endif
+
+ if (!zend_hash_exists(&http_message_object_ce->properties_info, Z_STRVAL_P(member), member_len)) {
zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
return;
}
-#endif
-#ifdef WONKY
- switch (h)
-#else
- switch (pinfo->h)
-#endif
+ switch (zend_hash_func(Z_STRVAL_P(member), Z_STRLEN_P(member) + 1))
{
case HTTP_MSG_PROPHASH_TYPE:
case HTTP_MSG_CHILD_PROPHASH_TYPE:
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &body, &len)) {
phpstr_dtor(PHPSTR(obj->message));
- phpstr_from_string_ex(PHPSTR(obj->message), body, len);
+ phpstr_from_string_ex(PHPSTR(obj->message), body, len);
}
}
/* }}} */
zval_ptr_dtor(&array);
if (PHPSTR_VAL(obj->message) && PHPSTR_LEN(obj->message)) {
+ phpstr_fix(PHPSTR(obj->message));
INIT_PZVAL(&body);
ZVAL_STRINGL(&body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message), 0);
if (method != HTTP_POST) {
zval_copy_ctor(&body);
sapi_module.treat_data(PARSE_STRING, Z_STRVAL(body), &post TSRMLS_CC);
zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setpostfields", NULL, &post);
+ zval_dtor(&post);
}
}
#else