X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_object.c;h=2ed979789b009c8a93b2c983baca769b5a50a946;hp=aef84e9de495ba9494c44d94806203a3f00618bd;hb=34644fd4c700fb55c3a2c2ff9966d0f5e7572509;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c diff --git a/http_request_object.c b/http_request_object.c index aef84e9..2ed9797 100644 --- a/http_request_object.c +++ b/http_request_object.c @@ -219,8 +219,6 @@ HTTP_END_ARGS; #define http_request_object_declare_default_properties() _http_request_object_declare_default_properties(TSRMLS_C) static inline void _http_request_object_declare_default_properties(TSRMLS_D); -#define http_request_object_clone_obj _http_request_object_clone_obj -static inline zend_object_value _http_request_object_clone_obj(zval *object TSRMLS_DC); zend_class_entry *http_request_object_ce; zend_function_entry http_request_object_fe[] = { @@ -300,18 +298,27 @@ static zend_object_handlers http_request_object_handlers; PHP_MINIT_FUNCTION(http_request_object) { HTTP_REGISTER_CLASS_EX(HttpRequest, http_request_object, NULL, 0); - http_request_object_handlers.clone_obj = NULL; + http_request_object_handlers.clone_obj = _http_request_object_clone_obj; return SUCCESS; } zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC) +{ + return http_request_object_new_ex(ce, curl_easy_init(), NULL); +} + +zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch, http_request_object **ptr TSRMLS_DC) { zend_object_value ov; http_request_object *o; o = ecalloc(1, sizeof(http_request_object)); o->zo.ce = ce; - o->ch = curl_easy_init(); + o->ch = ch; + + if (ptr) { + *ptr = o; + } phpstr_init(&o->history); phpstr_init(&o->request); @@ -327,6 +334,24 @@ zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC) return ov; } +zend_object_value _http_request_object_clone_obj(zval *this_ptr TSRMLS_DC) +{ + zend_object *old_zo; + zend_object_value new_ov; + http_request_object *new_obj; + getObject(http_request_object, old_obj); + + old_zo = zend_objects_get_address(this_ptr TSRMLS_CC); + new_ov = http_request_object_new_ex(old_zo->ce, curl_easy_duphandle(old_obj->ch), &new_obj); + + zend_objects_clone_members(&new_obj->zo, new_ov, old_zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + phpstr_append(&new_obj->history, old_obj->history.data, old_obj->history.used); + phpstr_append(&new_obj->request, old_obj->request.data, old_obj->request.used); + phpstr_append(&new_obj->response, old_obj->response.data, old_obj->response.used); + + return new_ov; +} + static inline void _http_request_object_declare_default_properties(TSRMLS_D) { zend_class_entry *ce = http_request_object_ce; @@ -347,7 +372,7 @@ static inline void _http_request_object_declare_default_properties(TSRMLS_D) DCL_PROP(PROTECTED, string, queryData, ""); DCL_PROP(PROTECTED, string, putFile, ""); - DCL_PROP(PUBLIC, bool, recordHistory, 1); + DCL_PROP(PUBLIC, bool, recordHistory, 0); #ifndef WONKY /* @@ -421,7 +446,7 @@ void _http_request_object_free(zend_object *object TSRMLS_DC) STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr, http_request_body *body TSRMLS_DC) { - zval *meth, *URL; + zval *meth, *URL, *meth_p, *URL_p; char *request_uri; STATUS status = SUCCESS; @@ -430,13 +455,19 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ } HTTP_CHECK_CURL_INIT(obj->ch, curl_easy_init(), return FAILURE); - URL = convert_to_type_ex(IS_STRING, GET_PROP(obj, url)); + URL = convert_to_type_ex(IS_STRING, GET_PROP(obj, url), &URL_p); // HTTP_URI_MAXLEN+1 long char * if (!(request_uri = http_absolute_uri_ex(Z_STRVAL_P(URL), Z_STRLEN_P(URL), NULL, 0, NULL, 0, 0))) { + if (URL_p) { + zval_ptr_dtor(&URL_p); + } return FAILURE; } + if (URL_p) { + zval_ptr_dtor(&URL_p); + } - meth = convert_to_type_ex(IS_LONG, GET_PROP(obj, method)); + meth = convert_to_type_ex(IS_LONG, GET_PROP(obj, method), &meth_p); switch (Z_LVAL_P(meth)) { case HTTP_GET: @@ -464,10 +495,10 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ default: { /* check for raw post data */ - zval *raw_data = convert_to_type_ex(IS_STRING, GET_PROP(obj, rawPostData)); + zval *raw_data_p, *raw_data = convert_to_type_ex(IS_STRING, GET_PROP(obj, rawPostData), &raw_data_p); if (Z_STRLEN_P(raw_data)) { - zval *ctype = convert_to_type_ex(IS_STRING, GET_PROP(obj, contentType)); + zval *ctype_p, *ctype = convert_to_type_ex(IS_STRING, GET_PROP(obj, contentType), &ctype_p); if (Z_STRLEN_P(ctype)) { zval **headers, *opts = GET_PROP(obj, options); @@ -491,6 +522,10 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ add_assoc_zval(opts, "headers", headers); } } + + if (ctype_p) { + zval_ptr_dtor(&ctype_p); + } body->type = HTTP_REQUEST_BODY_CSTRING; body->data = estrndup(Z_STRVAL_P(raw_data), Z_STRLEN_P(raw_data)); @@ -498,12 +533,20 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ } else { status = http_request_body_fill(body, Z_ARRVAL_P(GET_PROP(obj, postFields)), Z_ARRVAL_P(GET_PROP(obj, postFiles))); } + + if (raw_data_p) { + zval_ptr_dtor(&raw_data_p); + } } break; } + + if (meth_p) { + zval_ptr_dtor(&meth_p); + } if (status == SUCCESS) { - zval *qdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, queryData)); + zval *qdata_p, *qdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, queryData), &qdata_p); if (Z_STRLEN_P(qdata)) { if (!strchr(request_uri, '?')) { @@ -514,6 +557,10 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ strlcat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN); } + if (qdata_p) { + zval_ptr_dtor(&qdata_p); + } + status = http_request_init(obj->ch, Z_LVAL_P(meth), request_uri, body, Z_ARRVAL_P(GET_PROP(obj, options))); } efree(request_uri); @@ -544,6 +591,9 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this *resp = convert_to_type(IS_ARRAY, GET_PROP(obj, responseData)), *info = convert_to_type(IS_ARRAY, GET_PROP(obj, responseInfo)); + SEP_PROP(&resp); + SEP_PROP(&info); + if (zval_is_true(GET_PROP(obj, recordHistory))) { /* we need to act like a zipper, as we'll receive * the requests and the responses in separate chains @@ -580,9 +630,10 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this add_assoc_zval(resp, "headers", headers); add_assoc_stringl(resp, "body", body, body_len, 0); + SET_PROP(obj, responseData, resp); MAKE_STD_ZVAL(message); - ZVAL_OBJVAL(message, http_message_object_from_msg(msg)); + ZVAL_OBJVAL(message, http_message_object_new_ex(http_message_object_ce, msg, NULL)); SET_PROP(obj, responseMessage, message); zval_ptr_dtor(&message); @@ -633,10 +684,10 @@ static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS, NO_ARGS; IF_RETVAL_USED { - zval *opts, **options; + zval *opts_p, *opts, **options; getObject(http_request_object, obj); - opts = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, options)); + opts = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, options), &opts_p); array_init(return_value); @@ -644,6 +695,10 @@ static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS, convert_to_array(*options); array_copy(*options, return_value); } + + if (opts_p) { + zval_ptr_dtor(&opts_p); + } } } @@ -723,6 +778,7 @@ PHP_METHOD(HttpRequest, setOptions) { char *key = NULL; ulong idx = 0; + HashPosition pos; zval *opts = NULL, *old_opts, **opt; getObject(http_request_object, obj); @@ -731,14 +787,16 @@ PHP_METHOD(HttpRequest, setOptions) } old_opts = convert_to_type(IS_ARRAY, GET_PROP(obj, options)); - + SEP_PROP(&old_opts); + if (!opts || !zend_hash_num_elements(Z_ARRVAL_P(opts))) { zend_hash_clean(Z_ARRVAL_P(old_opts)); + SET_PROP(obj, options, old_opts); RETURN_TRUE; } /* some options need extra attention -- thus cannot use array_merge() directly */ - FOREACH_KEYVAL(opts, key, idx, opt) { + FOREACH_KEYVAL(pos, opts, key, idx, opt) { if (key) { if (!strcmp(key, "headers")) { zval **headers; @@ -802,12 +860,16 @@ PHP_METHOD(HttpRequest, getOptions) NO_ARGS; IF_RETVAL_USED { - zval *opts; + zval *opts_p, *opts; getObject(http_request_object, obj); - opts = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, options)); + opts = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, options), &opts_p); array_init(return_value); array_copy(opts, return_value); + + if (opts_p) { + zval_ptr_dtor(&opts_p); + } } } /* }}} */ @@ -1116,9 +1178,13 @@ PHP_METHOD(HttpRequest, getQueryData) IF_RETVAL_USED { getObject(http_request_object, obj); - zval *qdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, queryData)); + zval *qdata_p, *qdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, queryData), &qdata_p); RETURN_ZVAL(qdata, 1, 0); + + if (qdata_p) { + zval_ptr_dtor(&qdata_p); + } } } /* }}} */ @@ -1134,7 +1200,7 @@ PHP_METHOD(HttpRequest, getQueryData) */ PHP_METHOD(HttpRequest, addQueryData) { - zval *qdata, *old_qdata; + zval *qdata, *old_qdata, *old_qdata_p; char *query_data = NULL; size_t query_data_len = 0; getObject(http_request_object, obj); @@ -1143,15 +1209,22 @@ PHP_METHOD(HttpRequest, addQueryData) RETURN_FALSE; } - old_qdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, queryData)); + old_qdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, queryData), &old_qdata_p); if (SUCCESS != http_urlencode_hash_ex(HASH_OF(qdata), 1, Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata), &query_data, &query_data_len)) { + if (old_qdata_p) { + zval_ptr_dtor(&old_qdata_p); + } RETURN_FALSE; } UPD_STRL(obj, queryData, query_data, query_data_len); efree(query_data); + if (old_qdata_p) { + zval_ptr_dtor(&old_qdata_p); + } + RETURN_TRUE; } /* }}} */ @@ -1202,11 +1275,13 @@ PHP_METHOD(HttpRequest, setPostFields) } post = convert_to_type(IS_ARRAY, GET_PROP(obj, postFields)); - zend_hash_clean(Z_ARRVAL_P(post)); + SEP_PROP(&post); + zend_hash_clean(Z_ARRVAL_P(post)); if (post_data && zend_hash_num_elements(Z_ARRVAL_P(post_data))) { array_copy(post_data, post); } + SET_PROP(obj, postFields, post); RETURN_TRUE; } @@ -1224,10 +1299,14 @@ PHP_METHOD(HttpRequest, getPostFields) IF_RETVAL_USED { getObject(http_request_object, obj); - zval *post_data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, postFields)); + zval *post_data_p, *post_data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, postFields), &post_data_p); array_init(return_value); array_copy(post_data, return_value); + + if (post_data_p) { + zval_ptr_dtor(&post_data_p); + } } } /* }}} */ @@ -1283,7 +1362,7 @@ PHP_METHOD(HttpRequest, addRawPostData) } if (data_len) { - zval *zdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, rawPostData)); + zval *zdata_p, *zdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, rawPostData), &zdata_p); new_data = emalloc(Z_STRLEN_P(zdata) + data_len + 1); new_data[Z_STRLEN_P(zdata) + data_len] = '\0'; @@ -1294,6 +1373,10 @@ PHP_METHOD(HttpRequest, addRawPostData) memcpy(new_data + Z_STRLEN_P(zdata), raw_data, data_len); UPD_STRL(obj, rawPostData, new_data, Z_STRLEN_P(zdata) + data_len); + + if (zdata_p) { + zval_ptr_dtor(&zdata_p); + } } RETURN_TRUE; @@ -1312,9 +1395,13 @@ PHP_METHOD(HttpRequest, getRawPostData) IF_RETVAL_USED { getObject(http_request_object, obj); - zval *raw_data = convert_to_type_ex(IS_STRING, GET_PROP(obj, rawPostData)); + zval *raw_data_p, *raw_data = convert_to_type_ex(IS_STRING, GET_PROP(obj, rawPostData), &raw_data_p); - RETURN_ZVAL(raw_data, 1, 0); + RETVAL_ZVAL(raw_data, 1, 0); + + if (raw_data_p) { + zval_ptr_dtor(&raw_data_p); + } } } /* }}} */ @@ -1385,11 +1472,13 @@ PHP_METHOD(HttpRequest, setPostFiles) } pFiles = convert_to_type(IS_ARRAY, GET_PROP(obj, postFiles)); - zend_hash_clean(Z_ARRVAL_P(pFiles)); + SEP_PROP(&pFiles); + zend_hash_clean(Z_ARRVAL_P(pFiles)); if (files && zend_hash_num_elements(Z_ARRVAL_P(files))) { array_copy(files, pFiles); } + SET_PROP(obj, postFiles, pFiles); RETURN_TRUE; } @@ -1407,10 +1496,14 @@ PHP_METHOD(HttpRequest, getPostFiles) IF_RETVAL_USED { getObject(http_request_object, obj); - zval *files = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, postFiles)); + zval *files_p, *files = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, postFiles), &files_p); array_init(return_value); array_copy(files, return_value); + + if (files_p) { + zval_ptr_dtor(&files_p); + } } } /* }}} */ @@ -1451,9 +1544,13 @@ PHP_METHOD(HttpRequest, getPutFile) IF_RETVAL_USED { getObject(http_request_object, obj); - zval *putfile = convert_to_type_ex(IS_STRING, GET_PROP(obj, putFile)); + zval *putfile_p, *putfile = convert_to_type_ex(IS_STRING, GET_PROP(obj, putFile), &putfile_p); - RETURN_ZVAL(putfile, 1, 0); + RETVAL_ZVAL(putfile, 1, 0); + + if (putfile_p) { + zval_ptr_dtor(&putfile_p); + } } } /* }}} */ @@ -1475,10 +1572,14 @@ PHP_METHOD(HttpRequest, getResponseData) IF_RETVAL_USED { getObject(http_request_object, obj); - zval *data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseData)); + zval *data_p, *data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseData), &data_p); array_init(return_value); array_copy(data, return_value); + + if (data_p) { + zval_ptr_dtor(&data_p); + } } } /* }}} */ @@ -1499,7 +1600,7 @@ PHP_METHOD(HttpRequest, getResponseData) PHP_METHOD(HttpRequest, getResponseHeader) { IF_RETVAL_USED { - zval *data, **headers, **header; + zval *data_p, *data, **headers, **header; char *header_name = NULL; int header_len = 0; getObject(http_request_object, obj); @@ -1508,18 +1609,23 @@ PHP_METHOD(HttpRequest, getResponseHeader) RETURN_FALSE; } - data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseData)); - if (SUCCESS != zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) { - RETURN_FALSE; - } - convert_to_array_ex(headers); - if (!header_len || !header_name) { - array_init(return_value); - array_copy(*headers, return_value); - } else if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(headers), pretty_key(header_name, header_len, 1, 1), header_len + 1, (void **) &header)) { - RETURN_ZVAL(*header, 1, 0); + data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseData), &data_p); + if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) { + convert_to_array(*headers); + if (!header_len || !header_name) { + array_init(return_value); + array_copy(*headers, return_value); + } else if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(headers), pretty_key(header_name, header_len, 1, 1), header_len + 1, (void **) &header)) { + RETVAL_ZVAL(*header, 1, 0); + } else { + RETVAL_FALSE; + } } else { - RETURN_FALSE; + RETVAL_FALSE; + } + + if (data_p) { + zval_ptr_dtor(&data_p); } } } @@ -1554,20 +1660,22 @@ PHP_METHOD(HttpRequest, getResponseCookie) array_init(return_value); - data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseData)); + data = convert_to_type(IS_ARRAY, GET_PROP(obj, responseData)); if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) { ulong idx = 0; char *key = NULL; zval **header = NULL; + HashPosition pos1; - convert_to_array_ex(headers); - FOREACH_HASH_KEYVAL(Z_ARRVAL_PP(headers), key, idx, header) { + convert_to_array(*headers); + FOREACH_HASH_KEYVAL(pos1, Z_ARRVAL_PP(headers), key, idx, header) { if (key && !strcasecmp(key, "Set-Cookie")) { /* several cookies? */ if (Z_TYPE_PP(header) == IS_ARRAY) { zval **cookie; + HashPosition pos2; - FOREACH_HASH_VAL(Z_ARRVAL_PP(header), cookie) { + FOREACH_HASH_VAL(pos2, Z_ARRVAL_PP(header), cookie) { zval *cookie_hash; MAKE_STD_ZVAL(cookie_hash); array_init(cookie_hash); @@ -1644,10 +1752,9 @@ PHP_METHOD(HttpRequest, getResponseBody) IF_RETVAL_USED { zval **body; getObject(http_request_object, obj); - zval *data = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseData)); + zval *data = convert_to_type(IS_ARRAY, GET_PROP(obj, responseData)); if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "body", sizeof("body"), (void **) &body)) { - convert_to_string_ex(body); RETURN_ZVAL(*body, 1, 0); } else { RETURN_FALSE; @@ -1671,9 +1778,13 @@ PHP_METHOD(HttpRequest, getResponseCode) IF_RETVAL_USED { getObject(http_request_object, obj); - zval *code = convert_to_type_ex(IS_LONG, GET_PROP(obj, responseCode)); + zval *code_p, *code = convert_to_type_ex(IS_LONG, GET_PROP(obj, responseCode), &code_p); - RETURN_ZVAL(code, 1, 0); + RETVAL_ZVAL(code, 1, 0); + + if (code_p) { + zval_ptr_dtor(&code_p); + } } } /* }}} */ @@ -1706,7 +1817,7 @@ PHP_METHOD(HttpRequest, getResponseInfo) RETURN_FALSE; } - info = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, responseInfo)); + info = convert_to_type(IS_ARRAY, GET_PROP(obj, responseInfo)); if (info_len && info_name) { if (SUCCESS == zend_hash_find(Z_ARRVAL_P(info), pretty_key(info_name, info_len, 0, 0), info_len + 1, (void **) &infop)) { @@ -1766,6 +1877,13 @@ PHP_METHOD(HttpRequest, getResponseMessage) * references the last received response. Use HttpMessage::getParentMessage() * to access the data of previously sent requests whithin this request * cycle. + * + * Note that the internal request message is immutable, that means that the + * request message received through HttpRequest::getRequestMessage() will + * always look the same for the same request, regardless of any changes you + * may have made to the returned object. + * + * Throws HttpMalformedHeadersException, HttpEncodingException. */ PHP_METHOD(HttpRequest, getRequestMessage) { @@ -1777,7 +1895,7 @@ PHP_METHOD(HttpRequest, getRequestMessage) SET_EH_THROW_HTTP(); if (msg = http_message_parse(PHPSTR_VAL(&obj->request), PHPSTR_LEN(&obj->request))) { - RETVAL_OBJVAL(http_message_object_from_msg(msg)); + ZVAL_OBJVAL(return_value, http_message_object_new_ex(http_message_object_ce, msg, NULL)); } SET_EH_NORMAL(); } @@ -1797,7 +1915,11 @@ PHP_METHOD(HttpRequest, getRequestMessage) * The object references the last received response, use HttpMessage::getParentMessage() * to access the data of previously sent requests and received responses. * - * Throws HttpMalformedHeaderException. + * Note that the internal history is immutable, that means that any changes + * you make the the message list won't affect a history message list newly + * created by another call to HttpRequest::getHistory(). + * + * Throws HttpMalformedHeaderException, HttpEncodingException. */ PHP_METHOD(HttpRequest, getHistory) { @@ -1809,7 +1931,7 @@ PHP_METHOD(HttpRequest, getHistory) SET_EH_THROW_HTTP(); if (msg = http_message_parse(PHPSTR_VAL(&obj->history), PHPSTR_LEN(&obj->history))) { - RETVAL_OBJVAL(http_message_object_from_msg(msg)); + ZVAL_OBJVAL(return_value, http_message_object_new_ex(http_message_object_ce, msg, NULL)); } SET_EH_NORMAL(); } @@ -1835,6 +1957,10 @@ PHP_METHOD(HttpRequest, clearHistory) * * Returns the received response as HttpMessage object. * + * NOTE: While an exception may be thrown, the transfer could have succeeded + * at least partially, so you might want to check the return values of various + * HttpRequest::getResponse*() methods. + * * Throws HttpRuntimeException, HttpRequestException, * HttpMalformedHeaderException, HttpEncodingException. *