projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
2167974
)
- fix ce
author
Michael Wallner
<mike@php.net>
Thu, 19 Jan 2006 18:47:27 +0000
(18:47 +0000)
committer
Michael Wallner
<mike@php.net>
Thu, 19 Jan 2006 18:47:27 +0000
(18:47 +0000)
- no add_ref in detach()
http_message_object.c
patch
|
blob
|
history
diff --git
a/http_message_object.c
b/http_message_object.c
index e6ce0646bfdaedafa0ec05ac8cf997bef396efb7..7d4530da6067b3eee99b2f302e7019736e229983 100644
(file)
--- a/
http_message_object.c
+++ b/
http_message_object.c
@@
-600,7
+600,7
@@
PHP_METHOD(HttpMessage, fromString)
if (class_name && *class_name) {
ce = zend_fetch_class(class_name, class_length, ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC);
if (class_name && *class_name) {
ce = zend_fetch_class(class_name, class_length, ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC);
- if (ce && !instanceof_function(ce, http_
request
_object_ce TSRMLS_CC)) {
+ if (ce && !instanceof_function(ce, http_
message
_object_ce TSRMLS_CC)) {
http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Class %s does not extend HttpMessage", class_name);
ce = NULL;
}
http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Class %s does not extend HttpMessage", class_name);
ce = NULL;
}
@@
-1108,7
+1108,7
@@
PHP_METHOD(HttpMessage, detach)
zend_hash_copy(&msg->hdrs, &obj->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
phpstr_append(&msg->body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message));
zend_hash_copy(&msg->hdrs, &obj->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
phpstr_append(&msg->body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message));
-
RETURN_OBJVAL(
http_message_object_new_ex(Z_OBJCE_P(getThis()), msg, NULL));
+
ZVAL_OBJVAL(return_value,
http_message_object_new_ex(Z_OBJCE_P(getThis()), msg, NULL));
}
/* }}} */
}
/* }}} */