HTTP_EMPTY_ARGS(reverse);
#define http_message_object_read_prop _http_message_object_read_prop
-static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC);
+static zval *_http_message_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC 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);
+static void _http_message_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC 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);
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_GET_PPTR_TYPE_DC ZEND_LITERAL_KEY_DC TSRMLS_DC);
#define http_message_object_get_props _http_message_object_get_props
static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
}
}
+
+#ifdef ZEND_ENGINE_2_4
+ zend_object_std_init(o, ce TSRMLS_CC);
+ object_properties_init(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;
freeObject(o);
}
-static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRMLS_DC) {
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_GET_PPTR_TYPE_DC ZEND_LITERAL_KEY_DC TSRMLS_DC) {
getObjectEx(http_message_object, obj, object);
http_message_object_prophandler *handler;
return NULL;
}
- return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member TSRMLS_CC);
+ return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member ZEND_GET_PPTR_TYPE_CC ZEND_LITERAL_KEY_CC TSRMLS_CC);
}
-static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
+static zval *_http_message_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC)
{
getObjectEx(http_message_object, obj, object);
http_message_object_prophandler *handler;
handler->read(obj, return_value TSRMLS_CC);
} else {
- return_value = zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
+ return_value = zend_get_std_object_handlers()->read_property(object, member, type ZEND_LITERAL_KEY_CC TSRMLS_CC);
}
return return_value;
}
-static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC)
+static void _http_message_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC)
{
getObjectEx(http_message_object, obj, object);
http_message_object_prophandler *handler;
if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) {
handler->write(obj, value TSRMLS_CC);
} else {
- zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
+ zend_get_std_object_handlers()->write_property(object, member, value ZEND_LITERAL_KEY_CC TSRMLS_CC);
}
}
zval *headers;
getObjectEx(http_message_object, obj, object);
http_message *msg = obj->message;
- HashTable *props = OBJ_PROP(obj);
zval array, *parent;
-
+#ifdef ZEND_ENGINE_2_4
+ HashTable *props = zend_get_std_object_handlers()->get_properties(object TSRMLS_CC);
+#else
+ HashTable *props = OBJ_PROP(obj);
+#endif
INIT_ZARR(array, props);
#define ASSOC_PROP(array, ptype, name, val) \
}
ASSOC_PROP(array, zval, "parentMessage", parent);
- return OBJ_PROP(obj);
+ return props;
}
/* ### USERLAND ### */
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));
NO_ARGS;
if (return_value_used) {
- char ver[4] = {0};
+ char *version;
getObject(http_message_object, obj);
- sprintf(ver, "%1.1lf", obj->message->http.version);
- RETURN_STRINGL(ver, 3, 1);
+ spprintf(&version, 0, "%1.1F", obj->message->http.version);
+ RETURN_STRING(version, 0);
}
}
/* }}} */
Set the HTTP Protocol version of the Message. */
PHP_METHOD(HttpMessage, setHttpVersion)
{
- char v[4];
zval *zv;
+ char *version;
getObject(http_message_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &zv)) {
}
convert_to_double(zv);
- snprintf(v, sizeof(v), "%1.1f", Z_DVAL_P(zv));
- if (strcmp(v, "1.0") && strcmp(v, "1.1")) {
+ spprintf(&version, 0, "%1.1F", Z_DVAL_P(zv));
+ if (strcmp(version, "1.0") && strcmp(version, "1.1")) {
+ efree(version);
http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid HTTP protocol version (1.0 or 1.1): %g", Z_DVAL_P(zv));
RETURN_FALSE;
}
-
+ efree(version);
obj->message->http.version = Z_DVAL_P(zv);
RETURN_TRUE;
}