static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC);
#define http_message_object_get_props _http_message_object_get_props
static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
-#define http_message_object_clone_obj _http_message_object_clone_obj
-static inline zend_object_value _http_message_object_clone_obj(zval *object TSRMLS_DC);
zend_class_entry *http_message_object_ce;
zend_function_entry http_message_object_fe[] = {
HTTP_LONG_CONSTANT("HTTP_MSG_REQUEST", HTTP_MSG_REQUEST);
HTTP_LONG_CONSTANT("HTTP_MSG_RESPONSE", HTTP_MSG_RESPONSE);
- http_message_object_handlers.clone_obj = http_message_object_clone_obj;
+ http_message_object_handlers.clone_obj = _http_message_object_clone_obj;
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;
zend_object_value _http_message_object_new(zend_class_entry *ce TSRMLS_DC)
{
- return http_message_object_new_ex(ce, NULL);
+ return http_message_object_new_ex(ce, NULL, NULL);
}
-zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message *msg TSRMLS_DC)
+zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message *msg, http_message_object **ptr TSRMLS_DC)
{
zend_object_value ov;
http_message_object *o;
o = ecalloc(1, sizeof(http_message_object));
o->zo.ce = ce;
+
+ if (ptr) {
+ *ptr = o;
+ }
if (msg) {
o->message = msg;
if (msg->parent) {
- o->parent = http_message_object_from_msg(msg->parent);
+ o->parent = http_message_object_new_ex(ce, msg->parent, NULL);
}
+ } else {
+ o->message = http_message_init(NULL);
}
ALLOC_HASHTABLE(OBJ_PROP(o));
return ov;
}
-zend_object_value _http_message_object_clone(zval *this_ptr TSRMLS_DC)
+zend_object_value _http_message_object_clone_obj(zval *this_ptr TSRMLS_DC)
{
- return http_message_object_clone_obj(this_ptr TSRMLS_CC);
+ getObject(http_message_object, obj);
+ return http_message_object_new_ex(Z_OBJCE_P(this_ptr), http_message_dup(obj->message), NULL);
}
static inline void _http_message_object_declare_default_properties(TSRMLS_D)
efree(o);
}
-static inline zend_object_value _http_message_object_clone_obj(zval *this_ptr TSRMLS_DC)
-{
- getObject(http_message_object, obj);
- return http_message_object_from_msg(http_message_dup(obj->message));
-}
-
static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
{
getObjectEx(http_message_object, obj, object);
}
#endif
- return_value = &EG(uninitialized_zval);
- return_value->refcount = 0;
- return_value->is_ref = 0;
+ if (type == BP_VAR_W) {
+ return_value = &EG(uninitialized_zval);
+ return_value->refcount = 1;
+ return_value->is_ref = 1;
+ } else {
+ ALLOC_ZVAL(return_value);
+ return_value->refcount = 0;
+ return_value->is_ref = 0;
+ }
#ifdef WONKY
switch (h)
#endif
{
case HTTP_MSG_PROPHASH_TYPE:
+ case HTTP_MSG_CHILD_PROPHASH_TYPE:
RETVAL_LONG(msg->type);
break;
case HTTP_MSG_PROPHASH_HTTP_VERSION:
+ case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION:
RETVAL_DOUBLE(msg->http.version);
break;
case HTTP_MSG_PROPHASH_BODY:
+ case HTTP_MSG_CHILD_PROPHASH_BODY:
phpstr_fix(PHPSTR(msg));
- RETVAL_PHPSTR(PHPSTR(msg), 0, 1);
+ RETVAL_PHPSTR(PHPSTR(msg), 0, !return_value->is_ref);
break;
case HTTP_MSG_PROPHASH_HEADERS:
- /* This is needed for situations like
- * $this->headers['foo'] = 'bar';
- */
- if (type == BP_VAR_W) {
- return_value->refcount = 1;
- return_value->is_ref = 1;
+ case HTTP_MSG_CHILD_PROPHASH_HEADERS:
+ if (return_value->is_ref) {
Z_TYPE_P(return_value) = IS_ARRAY;
Z_ARRVAL_P(return_value) = &msg->hdrs;
} else {
break;
case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
+ case HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE:
if (msg->parent) {
RETVAL_OBJVAL(obj->parent);
} else {
break;
case HTTP_MSG_PROPHASH_REQUEST_METHOD:
+ case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD:
if (HTTP_MSG_TYPE(REQUEST, msg) && msg->http.info.request.method) {
- RETVAL_STRING(msg->http.info.request.method, 1);
+ RETVAL_STRING(msg->http.info.request.method, !return_value->is_ref);
} else {
RETVAL_NULL();
}
break;
case HTTP_MSG_PROPHASH_REQUEST_URI:
+ case HTTP_MSG_CHILD_PROPHASH_REQUEST_URI:
if (HTTP_MSG_TYPE(REQUEST, msg) && msg->http.info.request.URI) {
- RETVAL_STRING(msg->http.info.request.URI, 1);
+ RETVAL_STRING(msg->http.info.request.URI, !return_value->is_ref);
} else {
RETVAL_NULL();
}
break;
case HTTP_MSG_PROPHASH_RESPONSE_CODE:
+ case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE:
if (HTTP_MSG_TYPE(RESPONSE, msg)) {
RETVAL_LONG(msg->http.info.response.code);
} else {
break;
case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
+ case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS:
if (HTTP_MSG_TYPE(RESPONSE, msg) && msg->http.info.response.status) {
- RETVAL_STRING(msg->http.info.response.status, 1);
+ RETVAL_STRING(msg->http.info.response.status, !return_value->is_ref);
} else {
RETVAL_NULL();
}
#endif
{
case HTTP_MSG_PROPHASH_TYPE:
+ case HTTP_MSG_CHILD_PROPHASH_TYPE:
convert_to_long_ex(&value);
http_message_set_type(msg, Z_LVAL_P(value));
break;
case HTTP_MSG_PROPHASH_HTTP_VERSION:
+ case HTTP_MSG_CHILD_PROPHASH_HTTP_VERSION:
convert_to_double_ex(&value);
msg->http.version = Z_DVAL_P(value);
break;
case HTTP_MSG_PROPHASH_BODY:
+ case HTTP_MSG_CHILD_PROPHASH_BODY:
convert_to_string_ex(&value);
phpstr_dtor(PHPSTR(msg));
phpstr_from_string_ex(PHPSTR(msg), Z_STRVAL_P(value), Z_STRLEN_P(value));
break;
case HTTP_MSG_PROPHASH_HEADERS:
+ case HTTP_MSG_CHILD_PROPHASH_HEADERS:
convert_to_array_ex(&value);
zend_hash_clean(&msg->hdrs);
zend_hash_copy(&msg->hdrs, Z_ARRVAL_P(value), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
break;
case HTTP_MSG_PROPHASH_PARENT_MESSAGE:
+ case HTTP_MSG_CHILD_PROPHASH_PARENT_MESSAGE:
if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), http_message_object_ce TSRMLS_CC)) {
if (msg->parent) {
zval tmp;
break;
case HTTP_MSG_PROPHASH_REQUEST_METHOD:
+ case HTTP_MSG_CHILD_PROPHASH_REQUEST_METHOD:
if (HTTP_MSG_TYPE(REQUEST, msg)) {
convert_to_string_ex(&value);
STR_SET(msg->http.info.request.method, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)));
break;
case HTTP_MSG_PROPHASH_REQUEST_URI:
+ case HTTP_MSG_CHILD_PROPHASH_REQUEST_URI:
if (HTTP_MSG_TYPE(REQUEST, msg)) {
convert_to_string_ex(&value);
STR_SET(msg->http.info.request.URI, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)));
break;
case HTTP_MSG_PROPHASH_RESPONSE_CODE:
+ case HTTP_MSG_CHILD_PROPHASH_RESPONSE_CODE:
if (HTTP_MSG_TYPE(RESPONSE, msg)) {
convert_to_long_ex(&value);
msg->http.info.response.code = Z_LVAL_P(value);
break;
case HTTP_MSG_PROPHASH_RESPONSE_STATUS:
+ case HTTP_MSG_CHILD_PROPHASH_RESPONSE_STATUS:
if (HTTP_MSG_TYPE(RESPONSE, msg)) {
convert_to_string_ex(&value);
STR_SET(msg->http.info.response.status, estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)));
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &message, &length) && message && length) {
if (obj->message = http_message_parse(message, length)) {
if (obj->message->parent) {
- obj->parent = http_message_object_from_msg(obj->message->parent);
+ obj->parent = http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL);
}
}
} else if (!obj->message) {
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &length)) {
if (msg = http_message_parse(string, length)) {
Z_TYPE_P(return_value) = IS_OBJECT;
- return_value->value.obj = http_message_object_from_msg(msg);
+ return_value->value.obj = http_message_object_new_ex(http_message_object_ce, msg, NULL);
}
}
SET_EH_NORMAL();
projects / m6w6 / ext-http / blobdiff