X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_object.c;h=e6ed74ae0aaafd0dd2e876e746296e8322bdc08e;hp=c7d19c211517c16afaf4e8b868e7884603837f87;hb=13dc652c45a4a0b4dc219e46065bb3310229cedc;hpb=c8786ae961087abe56f42b49d64dd73ba6411fdd diff --git a/http_request_object.c b/http_request_object.c index c7d19c2..e6ed74a 100644 --- a/http_request_object.c +++ b/http_request_object.c @@ -12,10 +12,6 @@ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #define HTTP_WANT_CURL #include "php_http.h" @@ -339,7 +335,7 @@ zend_object_value _http_request_object_clone_obj(zval *this_ptr TSRMLS_DC) old_zo = zend_objects_get_address(this_ptr TSRMLS_CC); new_ov = http_request_object_new_ex(old_zo->ce, NULL, &new_obj); if (old_obj->request->ch) { - new_obj->request->ch = http_curl_init_ex(curl_easy_duphandle(old_obj->request->ch), new_obj->request, new_obj->request->_error); + http_curl_init_ex(curl_easy_duphandle(old_obj->request->ch), new_obj->request); } zend_objects_clone_members(&new_obj->zo, new_ov, old_zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); @@ -607,7 +603,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this zval_ptr_dtor(&resp); MAKE_STD_ZVAL(message); - ZVAL_OBJVAL(message, http_message_object_new_ex(http_message_object_ce, msg, NULL)); + ZVAL_OBJVAL(message, http_message_object_new_ex(http_message_object_ce, msg, NULL), 0); SET_PROP(responseMessage, message); zval_ptr_dtor(&message); @@ -629,8 +625,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, (key), sizeof(key), (ow)) static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAMETERS, char *key, size_t len, int overwrite) { - zval *old_opts, *new_opts, *opts, **entry; - getObject(http_request_object, obj); + zval *old_opts, *new_opts, *opts = NULL, **entry; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &opts)) { RETURN_FALSE; @@ -672,10 +667,8 @@ static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS, IF_RETVAL_USED { zval *opts, **options; - getObject(http_request_object, obj); opts = GET_PROP(options); - array_init(return_value); if ( (Z_TYPE_P(opts) == IS_ARRAY) && @@ -706,7 +699,6 @@ PHP_METHOD(HttpRequest, __construct) int URL_len; long meth = -1; zval *options = NULL; - getObject(http_request_object, obj); SET_EH_THROW_HTTP(); if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sla", &URL, &URL_len, &meth, &options)) { @@ -740,7 +732,6 @@ PHP_METHOD(HttpRequest, setOptions) ulong idx = 0; HashPosition pos; zval *opts = NULL, *old_opts, *new_opts, *add_opts, **opt; - getObject(http_request_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) { RETURN_FALSE; @@ -944,7 +935,6 @@ PHP_METHOD(HttpRequest, setUrl) { char *URL = NULL; int URL_len; - getObject(http_request_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &URL, &URL_len)) { RETURN_FALSE; @@ -983,7 +973,6 @@ PHP_METHOD(HttpRequest, getUrl) PHP_METHOD(HttpRequest, setMethod) { long meth; - getObject(http_request_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &meth)) { RETURN_FALSE; @@ -1126,7 +1115,6 @@ PHP_METHOD(HttpRequest, addQueryData) zval *qdata, *old_qdata; char *query_data = NULL; size_t query_data_len = 0; - getObject(http_request_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &qdata)) { RETURN_FALSE; @@ -1158,7 +1146,6 @@ PHP_METHOD(HttpRequest, addQueryData) PHP_METHOD(HttpRequest, addPostFields) { zval *post_data, *old_post, *new_post; - getObject(http_request_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &post_data)) { RETURN_FALSE; @@ -1193,7 +1180,6 @@ PHP_METHOD(HttpRequest, addPostFields) PHP_METHOD(HttpRequest, setPostFields) { zval *post, *post_data = NULL; - getObject(http_request_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!", &post_data)) { RETURN_FALSE; @@ -1243,7 +1229,6 @@ PHP_METHOD(HttpRequest, setRawPostData) { char *raw_data = NULL; int data_len = 0; - getObject(http_request_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &raw_data, &data_len)) { RETURN_FALSE; @@ -1271,7 +1256,6 @@ PHP_METHOD(HttpRequest, addRawPostData) { char *raw_data; int data_len; - getObject(http_request_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &raw_data, &data_len)) { RETURN_FALSE; @@ -1325,7 +1309,6 @@ PHP_METHOD(HttpRequest, addPostFile) zval *entry, *old_post, *new_post; char *name, *file, *type = NULL; int name_len, file_len, type_len = 0; - getObject(http_request_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s", &name, &name_len, &file, &file_len, &type, &type_len)) { RETURN_FALSE; @@ -1373,7 +1356,6 @@ PHP_METHOD(HttpRequest, addPostFile) PHP_METHOD(HttpRequest, setPostFiles) { zval *files = NULL, *post; - getObject(http_request_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!/", &files)) { RETURN_FALSE; @@ -1420,7 +1402,6 @@ PHP_METHOD(HttpRequest, setPutFile) { char *file = ""; int file_len = 0; - getObject(http_request_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &file, &file_len)) { RETURN_FALSE; @@ -1487,7 +1468,6 @@ PHP_METHOD(HttpRequest, getResponseHeader) zval *data, **headers, **header; char *header_name = NULL; int header_len = 0; - getObject(http_request_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &header_name, &header_len)) { RETURN_FALSE; @@ -1532,7 +1512,6 @@ PHP_METHOD(HttpRequest, getResponseCookie) zval *data, **headers; char *cookie_name = NULL; int cookie_len = 0; - getObject(http_request_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &cookie_name, &cookie_len)) { RETURN_FALSE; @@ -1633,7 +1612,6 @@ PHP_METHOD(HttpRequest, getResponseBody) IF_RETVAL_USED { zval **body; - getObject(http_request_object, obj); zval *data = GET_PROP(responseData); if ( (Z_TYPE_P(data) == IS_ARRAY) && @@ -1687,7 +1665,6 @@ PHP_METHOD(HttpRequest, getResponseInfo) zval *info, **infop; char *info_name = NULL; int info_len = 0; - getObject(http_request_object, obj); if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &info_name, &info_len)) { RETURN_FALSE; @@ -1732,12 +1709,11 @@ PHP_METHOD(HttpRequest, getResponseMessage) IF_RETVAL_USED { zval *message; - getObject(http_request_object, obj); SET_EH_THROW_HTTP(); message = GET_PROP(responseMessage); if (Z_TYPE_P(message) == IS_OBJECT) { - RETVAL_OBJECT(message); + RETVAL_OBJECT(message, 1); } else { RETVAL_NULL(); } @@ -1774,7 +1750,7 @@ PHP_METHOD(HttpRequest, getRequestMessage) SET_EH_THROW_HTTP(); if ((msg = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request)))) { - ZVAL_OBJVAL(return_value, http_message_object_new_ex(http_message_object_ce, msg, NULL)); + RETVAL_OBJVAL(http_message_object_new_ex(http_message_object_ce, msg, NULL), 0); } SET_EH_NORMAL(); } @@ -1848,7 +1824,7 @@ PHP_METHOD(HttpRequest, getHistory) SET_EH_THROW_HTTP(); if ((msg = http_message_parse(PHPSTR_VAL(&obj->history), PHPSTR_LEN(&obj->history)))) { - ZVAL_OBJVAL(return_value, http_message_object_new_ex(http_message_object_ce, msg, NULL)); + RETVAL_OBJVAL(http_message_object_new_ex(http_message_object_ce, msg, NULL), 0); } SET_EH_NORMAL(); } @@ -1928,7 +1904,7 @@ PHP_METHOD(HttpRequest, send) } else if (SUCCESS == http_request_object_requesthandler(obj, getThis())) { http_request_exec(obj->request); if (SUCCESS == http_request_object_responsehandler(obj, getThis())) { - RETVAL_OBJECT(GET_PROP(responseMessage)); + RETVAL_OBJECT(GET_PROP(responseMessage), 1); } }