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
};
{
case HTTP_GET:
case HTTP_HEAD:
- break;
+ break;
case HTTP_PUT:
{
status = FAILURE;
}
}
+ break;
}
- break;
case HTTP_POST:
default:
}
}
}
+ break;
}
- break;
}
if (status == SUCCESS) {
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);
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *opts, **options;
opts = GET_PROP(options);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(options);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(url);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(method);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(contentType);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(queryData);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(postFields);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(rawPostData);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(postFiles);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(putFile);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(putData);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(responseData);
}
}
*/
PHP_METHOD(HttpRequest, getResponseHeader)
{
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *data, **headers, **header;
char *header_name = NULL;
int header_len = 0;
*/
PHP_METHOD(HttpRequest, getResponseCookies)
{
- IF_RETVAL_USED {
+ if (return_value_used) {
long flags = 0;
zval *allowed_extras_array = NULL, *data, **headers;
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval **body;
zval *data = GET_PROP(responseData);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(responseCode);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(responseStatus);
}
}
*/
PHP_METHOD(HttpRequest, getResponseInfo)
{
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *info, **infop;
char *info_name = NULL;
int info_len = 0;
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
http_message *msg;
getObject(http_request_object, obj);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
getObject(http_request_object, obj);
RETURN_PHPSTR_DUP(&obj->request->conv.request);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
getObject(http_request_object, obj);
RETURN_PHPSTR_DUP(&obj->request->conv.response);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *hist;
SET_EH_THROW_HTTP();