X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_object.c;h=23974c3c48c2146a687541f308051ee81c61e61e;hp=a5b2ca82616d38f78bf94e3dba62a6c65df6bc4d;hb=7d35618105146cc620cce13454a5ef242bf52a12;hpb=a197d80241b36d6f5581feeb80bea60a59fdbd02 diff --git a/http_message_object.c b/http_message_object.c index a5b2ca8..23974c3 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -513,9 +513,15 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message } } + +#ifdef ZEND_ENGINE_2_4 + zend_object_std_init(OBJ_PROP(o), ce TSRMLS_CC); + object_properties_init(OBJ_PROP(o), ce); +#else ALLOC_HASHTABLE(OBJ_PROP(o)); zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); +#endif ov.handle = putObject(http_message_object, o); ov.handlers = &http_message_object_handlers; @@ -1000,7 +1006,7 @@ PHP_METHOD(HttpMessage, setResponseStatus) HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE); - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) { RETURN_FALSE; } STR_SET(obj->message->http.info.response.status, estrndup(status, status_len));