HTTP_ARG_VAL(info, 1)
HTTP_END_ARGS;
+HTTP_BEGIN_ARGS(putData, 2)
+ HTTP_ARG_VAL(url, 0)
+ HTTP_ARG_VAL(data, 0)
+ HTTP_ARG_VAL(options, 0)
+ HTTP_ARG_VAL(info, 1)
+HTTP_END_ARGS;
+
HTTP_BEGIN_ARGS(putFile, 2)
HTTP_ARG_VAL(url, 0)
HTTP_ARG_VAL(file, 0)
HTTP_ARG_VAL(method, 0)
HTTP_END_ARGS;
+HTTP_BEGIN_ARGS(encodeBody, 2)
+ HTTP_ARG_VAL(fields, 0)
+ HTTP_ARG_VAL(files, 0)
+HTTP_END_ARGS;
+
#define OBJ_PROP_CE http_request_object_ce
zend_class_entry *http_request_object_ce;
zend_function_entry http_request_object_fe[] = {
HTTP_REQUEST_ALIAS(head, http_head)
HTTP_REQUEST_ALIAS(postData, http_post_data)
HTTP_REQUEST_ALIAS(postFields, http_post_fields)
+ HTTP_REQUEST_ALIAS(putData, http_put_data)
HTTP_REQUEST_ALIAS(putFile, http_put_file)
HTTP_REQUEST_ALIAS(putStream, http_put_stream)
HTTP_REQUEST_ALIAS(methodUnregister, http_request_method_unregister)
HTTP_REQUEST_ALIAS(methodName, http_request_method_name)
HTTP_REQUEST_ALIAS(methodExists, http_request_method_exists)
+
+ HTTP_REQUEST_ALIAS(encodeBody, http_request_body_encode)
EMPTY_FUNCTION_ENTRY
};
}
ALLOC_HASHTABLE(OBJ_PROP(o));
- zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
+ 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 *));
ov.handle = putObject(http_request_object, o);
}
UPD_PROP(long, responseCode, msg->http.info.response.code);
- UPD_PROP(string, responseStatus, msg->http.info.response.status);
+ UPD_PROP(string, responseStatus, msg->http.info.response.status ? msg->http.info.response.status : "");
MAKE_STD_ZVAL(resp);
array_init(resp);
ret = FAILURE;
}
- if (zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onfinish", sizeof("onfinish"))) {
+ if (!EG(exception) && zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onfinish", sizeof("onfinish"))) {
zval *param;
MAKE_STD_ZVAL(param);
ZVAL_BOOL(param, ret == SUCCESS);
- zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "onfinish", NULL, param);
+ with_error_handling(EH_NORMAL, NULL) {
+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "onfinish", NULL, param);
+ } end_error_handling();
zval_ptr_dtor(¶m);
}