X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_object.c;h=80d802f81ebcdc7cc4e1e1cb63fdce821461e2e2;hp=8280f976317eb86f02a86bdbf648793c145a0dd6;hb=4fcbd8e8ae31611c5197ff2369673b5939fc2b80;hpb=2812cd0aee5634421e9909a77a8b1e9aff012a3d diff --git a/http_request_object.c b/http_request_object.c index 8280f97..80d802f 100644 --- a/http_request_object.c +++ b/http_request_object.c @@ -6,16 +6,12 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2005, Michael Wallner | + | Copyright (c) 2004-2006, Michael Wallner | +--------------------------------------------------------------------+ */ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #define HTTP_WANT_CURL #include "php_http.h" @@ -32,14 +28,11 @@ #include "php_http_request_pool_api.h" #include "php_http_url_api.h" -ZEND_EXTERN_MODULE_GLOBALS(http); - #define HTTP_BEGIN_ARGS(method, ret_ref, req_args) HTTP_BEGIN_ARGS_EX(HttpRequest, method, ret_ref, req_args) #define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpRequest, method, ret_ref) #define HTTP_REQUEST_ME(method, visibility) PHP_ME(HttpRequest, method, HTTP_ARGS(HttpRequest, method), visibility) #define HTTP_REQUEST_ALIAS(method, func) HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpRequest, method)) -HTTP_EMPTY_ARGS(__destruct, 0); HTTP_BEGIN_ARGS(__construct, 0, 0) HTTP_ARG_VAL(url, 0) HTTP_ARG_VAL(method, 0) @@ -56,6 +49,10 @@ HTTP_BEGIN_ARGS(setSslOptions, 0, 0) HTTP_ARG_VAL(ssl_options, 0) HTTP_END_ARGS; +HTTP_BEGIN_ARGS(addSslOptions, 0, 0) + HTTP_ARG_VAL(ssl_optins, 0) +HTTP_END_ARGS; + HTTP_EMPTY_ARGS(getHeaders, 0); HTTP_BEGIN_ARGS(setHeaders, 0, 0) HTTP_ARG_VAL(headers, 0) @@ -147,11 +144,13 @@ HTTP_BEGIN_ARGS(getResponseInfo, 0, 0) HTTP_ARG_VAL(name, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getResponseMessage, 1); -HTTP_EMPTY_ARGS(getRequestMessage, 1); -HTTP_EMPTY_ARGS(getHistory, 1); +HTTP_EMPTY_ARGS(getResponseMessage, 0); +HTTP_EMPTY_ARGS(getRawResponseMessage, 0); +HTTP_EMPTY_ARGS(getRequestMessage, 0); +HTTP_EMPTY_ARGS(getRawRequestMessage, 0); +HTTP_EMPTY_ARGS(getHistory, 0); HTTP_EMPTY_ARGS(clearHistory, 0); -HTTP_EMPTY_ARGS(send, 1); +HTTP_EMPTY_ARGS(send, 0); HTTP_BEGIN_ARGS(get, 0, 1) HTTP_ARG_VAL(url, 0) @@ -212,15 +211,16 @@ 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 OBJ_PROP_CE http_request_object_ce zend_class_entry *http_request_object_ce; zend_function_entry http_request_object_fe[] = { HTTP_REQUEST_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - HTTP_REQUEST_ME(__destruct, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR) HTTP_REQUEST_ME(setOptions, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(getOptions, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(setSslOptions, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(getSslOptions, ZEND_ACC_PUBLIC) + HTTP_REQUEST_ME(addSslOptions, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(addHeaders, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(getHeaders, ZEND_ACC_PUBLIC) @@ -267,7 +267,9 @@ zend_function_entry http_request_object_fe[] = { HTTP_REQUEST_ME(getResponseBody, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(getResponseInfo, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(getResponseMessage, ZEND_ACC_PUBLIC) + HTTP_REQUEST_ME(getRawResponseMessage, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(getRequestMessage, ZEND_ACC_PUBLIC) + HTTP_REQUEST_ME(getRawRequestMessage, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(getHistory, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(clearHistory, ZEND_ACC_PUBLIC) @@ -296,7 +298,7 @@ PHP_MINIT_FUNCTION(http_request_object) zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC) { - return http_request_object_new_ex(ce, curl_easy_init(), NULL); + return http_request_object_new_ex(ce, NULL, NULL); } zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch, http_request_object **ptr TSRMLS_DC) @@ -331,7 +333,10 @@ zend_object_value _http_request_object_clone_obj(zval *this_ptr TSRMLS_DC) 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->request->ch), &new_obj); + new_ov = http_request_object_new_ex(old_zo->ce, NULL, &new_obj); + if (old_obj->request->ch) { + 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); phpstr_append(&new_obj->history, old_obj->history.data, old_obj->history.used); @@ -345,21 +350,19 @@ static inline void _http_request_object_declare_default_properties(TSRMLS_D) { zend_class_entry *ce = http_request_object_ce; - DCL_PROP_N(PROTECTED, options); - DCL_PROP_N(PROTECTED, responseInfo); - DCL_PROP_N(PROTECTED, responseData); - DCL_PROP(PROTECTED, long, responseCode, 0); - DCL_PROP_N(PROTECTED, responseMessage); - DCL_PROP_N(PROTECTED, postFields); - DCL_PROP_N(PROTECTED, postFiles); - - DCL_PROP(PROTECTED, long, method, HTTP_GET); - - DCL_PROP(PROTECTED, string, url, ""); - DCL_PROP(PROTECTED, string, contentType, ""); - DCL_PROP(PROTECTED, string, rawPostData, ""); - DCL_PROP(PROTECTED, string, queryData, ""); - DCL_PROP(PROTECTED, string, putFile, ""); + DCL_PROP_N(PRIVATE, options); + DCL_PROP_N(PRIVATE, postFields); + DCL_PROP_N(PRIVATE, postFiles); + DCL_PROP_N(PRIVATE, responseInfo); + DCL_PROP_N(PRIVATE, responseData); + DCL_PROP_N(PRIVATE, responseMessage); + DCL_PROP(PRIVATE, long, responseCode, 0); + DCL_PROP(PRIVATE, long, method, HTTP_GET); + DCL_PROP(PRIVATE, string, url, ""); + DCL_PROP(PRIVATE, string, contentType, ""); + DCL_PROP(PRIVATE, string, rawPostData, ""); + DCL_PROP(PRIVATE, string, queryData, ""); + DCL_PROP(PRIVATE, string, putFile, ""); DCL_PROP(PUBLIC, bool, recordHistory, 0); @@ -399,6 +402,11 @@ static inline void _http_request_object_declare_default_properties(TSRMLS_D) /* WebDAV Access Control - RFC 3744 */ DCL_CONST(long, "METH_ACL", HTTP_ACL); + /* cURL HTTP protocol versions */ + DCL_CONST(long, "VERSION_1_0", CURL_HTTP_VERSION_1_0); + DCL_CONST(long, "VERSION_1_1", CURL_HTTP_VERSION_1_1); + DCL_CONST(long, "VERSION_NONE", CURL_HTTP_VERSION_NONE); + /* * Auth Constants */ @@ -424,23 +432,14 @@ void _http_request_object_free(zend_object *object TSRMLS_DC) STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr TSRMLS_DC) { - zval *URL, *URL_p, *meth_p; STATUS status = SUCCESS; http_request_reset(obj->request); - HTTP_CHECK_CURL_INIT(obj->request->ch, curl_easy_init(), return FAILURE); - - URL = convert_to_type_ex(IS_STRING, GET_PROP(obj, url), &URL_p); - obj->request->url = 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); - } + HTTP_CHECK_CURL_INIT(obj->request->ch, http_curl_init(obj->request), return FAILURE); - if (!obj->request->url) { - return FAILURE; - } + obj->request->url = http_absolute_url(Z_STRVAL_P(GET_PROP(url))); - switch (obj->request->meth = Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_PROP(obj, method), &meth_p))) + switch (obj->request->meth = Z_LVAL_P(GET_PROP(method))) { case HTTP_GET: case HTTP_HEAD: @@ -449,10 +448,10 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ case HTTP_PUT: { php_stream_statbuf ssb; - php_stream *stream = php_stream_open_wrapper(Z_STRVAL_P(GET_PROP(obj, putFile)), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); + php_stream *stream = php_stream_open_wrapper(Z_STRVAL_P(GET_PROP(putFile)), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); if (stream && !php_stream_stat(stream, &ssb)) { - http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1); + obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1); } else { status = FAILURE; } @@ -463,22 +462,21 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ default: { /* check for raw post data */ - zval *raw_data_p, *raw_data = convert_to_type_ex(IS_STRING, GET_PROP(obj, rawPostData), &raw_data_p); + zval *raw_data = GET_PROP(rawPostData); if (Z_STRLEN_P(raw_data)) { - zval *ctype_p, *ctype = convert_to_type_ex(IS_STRING, GET_PROP(obj, contentType), &ctype_p); + zval *ctype = GET_PROP(contentType); if (Z_STRLEN_P(ctype)) { - zval **headers, *opts = GET_PROP(obj, options); + zval **headers, *opts = GET_PROP(options); - convert_to_array(opts); - - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) { + if ( (Z_TYPE_P(opts) == IS_ARRAY) && + (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) && + (Z_TYPE_PP(headers) == IS_ARRAY)) { zval **ct_header; - convert_to_array(*headers); /* only override if not already set */ - if (SUCCESS != zend_hash_find(Z_ARRVAL_PP(headers), "Content-Type", sizeof("Content-Type"), (void **) &ct_header)) { + if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(headers), "Content-Type", sizeof("Content-Type"), (void **) &ct_header)) && (Z_TYPE_PP(ct_header) == IS_STRING)) { add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); } } else { @@ -487,65 +485,62 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ MAKE_STD_ZVAL(headers); array_init(headers); add_assoc_stringl(headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); - add_assoc_zval(opts, "headers", headers); + zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addheaders", NULL, headers); + zval_ptr_dtor(&headers); } } - if (ctype_p) { - zval_ptr_dtor(&ctype_p); - } - obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_CSTRING, estrndup(Z_STRVAL_P(raw_data), Z_STRLEN_P(raw_data)), Z_STRLEN_P(raw_data), 1); } else { - zval *fields_cpy, *files_cpy; - HashTable *fields = Z_ARRVAL_P(convert_to_type_ex(IS_ARRAY, GET_PROP(obj, postFields), &fields_cpy)); - HashTable *files = Z_ARRVAL_P(convert_to_type_ex(IS_ARRAY, GET_PROP(obj, postFiles), &files_cpy)); + zval *zfields = GET_PROP(postFields), *zfiles = GET_PROP(postFiles); + HashTable *fields; + HashTable *files; - if (!(obj->request->body = http_request_body_fill(obj->request->body, fields, files))) { - status = FAILURE; - } + fields = (Z_TYPE_P(zfields) == IS_ARRAY) ? Z_ARRVAL_P(zfields) : NULL; + files = (Z_TYPE_P(zfiles) == IS_ARRAY) ? Z_ARRVAL_P(zfiles) : NULL; - if (fields_cpy) { - zval_ptr_dtor(&fields_cpy); - } - if (files_cpy) { - zval_ptr_dtor(&files_cpy); + if ((fields && zend_hash_num_elements(fields)) || (files && zend_hash_num_elements(files))) { + if (!(obj->request->body = http_request_body_fill(obj->request->body, fields, files))) { + status = FAILURE; + } } } - - if (raw_data_p) { - zval_ptr_dtor(&raw_data_p); - } } break; } - if (meth_p) { - zval_ptr_dtor(&meth_p); - } - if (status == SUCCESS) { - zval *qdata_p, *qdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, queryData), &qdata_p); - zval *opt_p, *options = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, options), &opt_p); + zval *qdata = GET_PROP(queryData); + zval *options = GET_PROP(options); if (Z_STRLEN_P(qdata)) { if (!strchr(obj->request->url, '?')) { - strlcat(obj->request->url, "?", HTTP_URI_MAXLEN); + strlcat(obj->request->url, "?", HTTP_URL_MAXLEN); } else { - strlcat(obj->request->url, "&", HTTP_URI_MAXLEN); + strlcat(obj->request->url, "&", HTTP_URL_MAXLEN); } - strlcat(obj->request->url, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN); + strlcat(obj->request->url, Z_STRVAL_P(qdata), HTTP_URL_MAXLEN); } http_request_prepare(obj->request, Z_ARRVAL_P(options)); - if (opt_p) { - zval_ptr_dtor(&opt_p); - } - if (qdata_p) { - zval_ptr_dtor(&qdata_p); + /* check if there's a onProgress method and add it as progress callback if one isn't already set */ + if (zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onprogress", sizeof("onprogress"))) { + zval **entry, *pcb; + + if ( (Z_TYPE_P(options) != IS_ARRAY) + || (SUCCESS != zend_hash_find(Z_ARRVAL_P(options), "onprogress", sizeof("onprogress"), (void **) &entry) + || (!zval_is_true(*entry)))) { + MAKE_STD_ZVAL(pcb); + array_init(pcb); + ZVAL_ADDREF(getThis()); + add_next_index_zval(pcb, getThis()); + add_next_index_stringl(pcb, "onprogress", lenof("onprogress"), 1); + http_request_set_progress_callback(obj->request, pcb); + zval_ptr_dtor(&pcb); + } } } @@ -566,14 +561,9 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this } else { char *body; size_t body_len; - zval *headers, *message, - *resp = convert_to_type(IS_ARRAY, GET_PROP(obj, responseData)), - *info = convert_to_type(IS_ARRAY, GET_PROP(obj, responseInfo)); + zval *headers, *message, *resp, *info; - SEP_PROP(&resp); - SEP_PROP(&info); - - if (zval_is_true(GET_PROP(obj, recordHistory))) { + if (zval_is_true(GET_PROP(recordHistory))) { /* we need to act like a zipper, as we'll receive * the requests and the responses in separate chains * for redirects @@ -599,26 +589,34 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this phpstr_fix(&obj->history); } - UPD_PROP(obj, long, responseCode, msg->http.info.response.code); + UPD_PROP(long, responseCode, msg->http.info.response.code); + MAKE_STD_ZVAL(resp); + array_init(resp); MAKE_STD_ZVAL(headers); array_init(headers); - zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - phpstr_data(PHPSTR(msg), &body, &body_len); - add_assoc_zval(resp, "headers", headers); + phpstr_data(PHPSTR(msg), &body, &body_len); add_assoc_stringl(resp, "body", body, body_len, 0); - SET_PROP(obj, responseData, resp); + SET_PROP(responseData, resp); + zval_ptr_dtor(&resp); MAKE_STD_ZVAL(message); ZVAL_OBJVAL(message, http_message_object_new_ex(http_message_object_ce, msg, NULL)); - SET_PROP(obj, responseMessage, message); + SET_PROP(responseMessage, message); zval_ptr_dtor(&message); + MAKE_STD_ZVAL(info); + array_init(info); http_request_info(obj->request, Z_ARRVAL_P(info)); - SET_PROP(obj, responseInfo, info); - + SET_PROP(responseInfo, info); + zval_ptr_dtor(&info); + + if (zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onfinish", sizeof("onfinish"))) { + zend_call_method_with_0_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "onfinish", NULL); + } + return SUCCESS; } } @@ -627,31 +625,36 @@ 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 *opts, **options, *new_options = NULL; - getObject(http_request_object, obj); + zval *old_opts, *new_opts, *opts = NULL, **entry; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &new_options)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &opts)) { RETURN_FALSE; } - opts = convert_to_type(IS_ARRAY, GET_PROP(obj, options)); + MAKE_STD_ZVAL(new_opts); + array_init(new_opts); + old_opts = GET_PROP(options); + if (Z_TYPE_P(old_opts) == IS_ARRAY) { + array_copy(old_opts, new_opts); + } - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void **) &options)) { - convert_to_array(*options); + if (SUCCESS == zend_hash_find(Z_ARRVAL_P(new_opts), key, len, (void **) &entry)) { if (overwrite) { - zend_hash_clean(Z_ARRVAL_PP(options)); + zend_hash_clean(Z_ARRVAL_PP(entry)); } - if (new_options && zend_hash_num_elements(Z_ARRVAL_P(new_options))) { + if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) { if (overwrite) { - array_copy(new_options, *options); + array_copy(opts, *entry); } else { - array_merge(new_options, *options); + array_merge(opts, *entry); } } - } else if (new_options && zend_hash_num_elements(Z_ARRVAL_P(new_options))) { - ZVAL_ADDREF(new_options); - add_assoc_zval(opts, key, new_options); + } else if (opts) { + ZVAL_ADDREF(opts); + add_assoc_zval(new_opts, key, opts); } + SET_PROP(options, new_opts); + zval_ptr_dtor(&new_opts); RETURN_TRUE; } @@ -663,21 +666,16 @@ static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS, NO_ARGS; IF_RETVAL_USED { - zval *opts_p, *opts, **options; - getObject(http_request_object, obj); - - opts = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, options), &opts_p); + zval *opts, **options; + opts = GET_PROP(options); array_init(return_value); - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void **) &options)) { + if ( (Z_TYPE_P(opts) == IS_ARRAY) && + (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void **) &options))) { convert_to_array(*options); array_copy(*options, return_value); } - - if (opts_p) { - zval_ptr_dtor(&opts_p); - } } } @@ -701,21 +699,14 @@ 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)) { - INIT_PARR(obj, options); - INIT_PARR(obj, responseInfo); - INIT_PARR(obj, responseData); - INIT_PARR(obj, postFields); - INIT_PARR(obj, postFiles); - if (URL) { - UPD_STRL(obj, url, URL, URL_len); + UPD_STRL(url, URL, URL_len); } if (meth > -1) { - UPD_PROP(obj, long, method, meth); + UPD_PROP(long, method, meth); } if (options) { zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setoptions", NULL, options); @@ -725,24 +716,6 @@ PHP_METHOD(HttpRequest, __construct) } /* }}} */ -/* {{{ proto void HttpRequest::__destruct() - * - * Destroys the HttpRequest object. - */ -PHP_METHOD(HttpRequest, __destruct) -{ - getObject(http_request_object, obj); - - NO_ARGS; - - FREE_PARR(obj, options); - FREE_PARR(obj, responseInfo); - FREE_PARR(obj, responseData); - FREE_PARR(obj, postFields); - FREE_PARR(obj, postFiles); -} -/* }}} */ - /* {{{ proto bool HttpRequest::setOptions([array options]) * * Set the request options to use. See http_get() for a full list of available options. @@ -758,72 +731,54 @@ PHP_METHOD(HttpRequest, setOptions) char *key = NULL; ulong idx = 0; HashPosition pos; - zval *opts = NULL, *old_opts, **opt; - getObject(http_request_object, obj); + zval *opts = NULL, *old_opts, *new_opts, *add_opts, **opt; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!", &opts)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) { RETURN_FALSE; } - old_opts = convert_to_type(IS_ARRAY, GET_PROP(obj, options)); - SEP_PROP(&old_opts); - + MAKE_STD_ZVAL(new_opts); + array_init(new_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); + SET_PROP(options, new_opts); + zval_ptr_dtor(&new_opts); RETURN_TRUE; } + MAKE_STD_ZVAL(add_opts); + array_init(add_opts); /* some options need extra attention -- thus cannot use array_merge() directly */ FOREACH_KEYVAL(pos, opts, key, idx, opt) { if (key) { if (!strcmp(key, "headers")) { - zval **headers; - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "headers", sizeof("headers"), (void **) &headers)) { - convert_to_array_ex(opt); - convert_to_array(*headers); - array_merge(*opt, *headers); - continue; - } + zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addheaders", NULL, *opt); } else if (!strcmp(key, "cookies")) { - zval **cookies; - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "cookies", sizeof("cookies"), (void **) &cookies)) { - convert_to_array_ex(opt); - convert_to_array(*cookies); - array_merge(*opt, *cookies); - continue; - } + zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addcookies", NULL, *opt); } else if (!strcmp(key, "ssl")) { - zval **ssl; - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "ssl", sizeof("ssl"), (void **) &ssl)) { - convert_to_array_ex(opt); - convert_to_array(*ssl); - array_merge(*opt, *ssl); - continue; - } + zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addssloptions", NULL, *opt); } else if ((!strcasecmp(key, "url")) || (!strcasecmp(key, "uri"))) { - if (Z_TYPE_PP(opt) != IS_STRING) { - convert_to_string_ex(opt); - } - UPD_STRL(obj, url, Z_STRVAL_PP(opt), Z_STRLEN_PP(opt)); - continue; + zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "seturl", NULL, *opt); } else if (!strcmp(key, "method")) { - if (Z_TYPE_PP(opt) != IS_LONG) { - convert_to_long_ex(opt); - } - UPD_PROP(obj, long, method, Z_LVAL_PP(opt)); - continue; + zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setmethod", NULL, *opt); + } else { + ZVAL_ADDREF(*opt); + add_assoc_zval(add_opts, key, *opt); } - - ZVAL_ADDREF(*opt); - add_assoc_zval(old_opts, key, *opt); - /* reset */ key = NULL; } } - SET_PROP(obj, options, old_opts); - + + old_opts = GET_PROP(options); + if (Z_TYPE_P(old_opts) == IS_ARRAY) { + array_copy(old_opts, new_opts); + } + array_merge(add_opts, new_opts); + SET_PROP(options, new_opts); + zval_ptr_dtor(&new_opts); + zval_ptr_dtor(&add_opts); + RETURN_TRUE; } /* }}} */ @@ -839,16 +794,7 @@ PHP_METHOD(HttpRequest, getOptions) NO_ARGS; IF_RETVAL_USED { - zval *opts_p, *opts; - getObject(http_request_object, obj); - - 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); - } + RETURN_PROP(options); } } /* }}} */ @@ -989,13 +935,12 @@ 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; } - UPD_STRL(obj, url, URL, URL_len); + UPD_STRL(url, URL, URL_len); RETURN_TRUE; } /* }}} */ @@ -1011,10 +956,7 @@ PHP_METHOD(HttpRequest, getUrl) NO_ARGS; IF_RETVAL_USED { - getObject(http_request_object, obj); - zval *URL = GET_PROP(obj, url); - - RETURN_ZVAL(URL, 1, 0); + RETURN_PROP(url); } } /* }}} */ @@ -1031,13 +973,12 @@ 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; } - UPD_PROP(obj, long, method, meth); + UPD_PROP(long, method, meth); RETURN_TRUE; } /* }}} */ @@ -1053,10 +994,7 @@ PHP_METHOD(HttpRequest, getMethod) NO_ARGS; IF_RETVAL_USED { - getObject(http_request_object, obj); - zval *meth = GET_PROP(obj, method); - - RETURN_ZVAL(meth, 1, 0); + RETURN_PROP(method); } } /* }}} */ @@ -1082,7 +1020,7 @@ PHP_METHOD(HttpRequest, setContentType) } HTTP_CHECK_CONTENT_TYPE(ctype, RETURN_FALSE); - UPD_STRL(obj, contentType, ctype, ct_len); + UPD_STRL(contentType, ctype, ct_len); RETURN_TRUE; } /* }}} */ @@ -1098,10 +1036,7 @@ PHP_METHOD(HttpRequest, getContentType) NO_ARGS; IF_RETVAL_USED { - getObject(http_request_object, obj); - zval *ctype = GET_PROP(obj, contentType); - - RETURN_ZVAL(ctype, 1, 0); + RETURN_PROP(contentType); } } /* }}} */ @@ -1127,7 +1062,7 @@ PHP_METHOD(HttpRequest, setQueryData) } if ((!qdata) || Z_TYPE_P(qdata) == IS_NULL) { - UPD_STRL(obj, queryData, "", 0); + UPD_STRL(queryData, "", 0); } else if ((Z_TYPE_P(qdata) == IS_ARRAY) || (Z_TYPE_P(qdata) == IS_OBJECT)) { char *query_data = NULL; @@ -1135,11 +1070,16 @@ PHP_METHOD(HttpRequest, setQueryData) RETURN_FALSE; } - UPD_PROP(obj, string, queryData, query_data); + UPD_PROP(string, queryData, query_data); efree(query_data); } else { + zval *orig = qdata; + convert_to_string_ex(&qdata); - UPD_STRL(obj, queryData, Z_STRVAL_P(qdata), Z_STRLEN_P(qdata)); + UPD_STRL(queryData, Z_STRVAL_P(qdata), Z_STRLEN_P(qdata)); + if (orig != qdata) { + zval_ptr_dtor(&qdata); + } } RETURN_TRUE; } @@ -1156,14 +1096,7 @@ PHP_METHOD(HttpRequest, getQueryData) NO_ARGS; IF_RETVAL_USED { - getObject(http_request_object, obj); - 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); - } + RETURN_PROP(queryData); } } /* }}} */ @@ -1179,31 +1112,23 @@ PHP_METHOD(HttpRequest, getQueryData) */ PHP_METHOD(HttpRequest, addQueryData) { - zval *qdata, *old_qdata, *old_qdata_p; + 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)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &qdata)) { RETURN_FALSE; } - old_qdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, queryData), &old_qdata_p); + old_qdata = GET_PROP(queryData); 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); + UPD_STRL(queryData, query_data, query_data_len); efree(query_data); - if (old_qdata_p) { - zval_ptr_dtor(&old_qdata_p); - } - RETURN_TRUE; } /* }}} */ @@ -1220,16 +1145,24 @@ PHP_METHOD(HttpRequest, addQueryData) */ PHP_METHOD(HttpRequest, addPostFields) { - zval *post, *post_data; - getObject(http_request_object, obj); + zval *post_data, *old_post, *new_post; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &post_data)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &post_data)) { RETURN_FALSE; } - post = convert_to_type(IS_ARRAY, GET_PROP(obj, postFields)); - array_merge(post_data, post); - + if (zend_hash_num_elements(Z_ARRVAL_P(post_data))) { + MAKE_STD_ZVAL(new_post); + array_init(new_post); + old_post = GET_PROP(postFields); + if (Z_TYPE_P(old_post) == IS_ARRAY) { + array_copy(old_post, new_post); + } + array_merge(post_data, new_post); + SET_PROP(postFields, new_post); + zval_ptr_dtor(&new_post); + } + RETURN_TRUE; } /* }}} */ @@ -1247,20 +1180,18 @@ 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)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!", &post_data)) { RETURN_FALSE; } - post = convert_to_type(IS_ARRAY, GET_PROP(obj, postFields)); - - SEP_PROP(&post); - zend_hash_clean(Z_ARRVAL_P(post)); + MAKE_STD_ZVAL(post); + array_init(post); if (post_data && zend_hash_num_elements(Z_ARRVAL_P(post_data))) { array_copy(post_data, post); } - SET_PROP(obj, postFields, post); + SET_PROP(postFields, post); + zval_ptr_dtor(&post); RETURN_TRUE; } @@ -1277,15 +1208,7 @@ PHP_METHOD(HttpRequest, getPostFields) NO_ARGS; IF_RETVAL_USED { - getObject(http_request_object, obj); - 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); - } + RETURN_PROP(postFields); } } /* }}} */ @@ -1306,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; @@ -1316,7 +1238,7 @@ PHP_METHOD(HttpRequest, setRawPostData) raw_data = ""; } - UPD_STRL(obj, rawPostData, raw_data, data_len); + UPD_STRL(rawPostData, raw_data, data_len); RETURN_TRUE; } /* }}} */ @@ -1332,30 +1254,21 @@ PHP_METHOD(HttpRequest, setRawPostData) */ PHP_METHOD(HttpRequest, addRawPostData) { - char *raw_data, *new_data; + 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; } if (data_len) { - 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'; - - if (Z_STRLEN_P(zdata)) { - memcpy(new_data, Z_STRVAL_P(zdata), Z_STRLEN_P(zdata)); - } + zval *data = zval_copy(IS_STRING, GET_PROP(rawPostData)); - 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); - } + Z_STRVAL_P(data) = erealloc(Z_STRVAL_P(data), (Z_STRLEN_P(data) += data_len) + 1); + Z_STRVAL_P(data)[Z_STRLEN_P(data)] = '\0'; + memcpy(Z_STRVAL_P(data) + Z_STRLEN_P(data) - data_len, raw_data, data_len); + SET_PROP(rawPostData, data); + zval_free(&data); } RETURN_TRUE; @@ -1373,14 +1286,7 @@ PHP_METHOD(HttpRequest, getRawPostData) NO_ARGS; IF_RETVAL_USED { - getObject(http_request_object, obj); - zval *raw_data_p, *raw_data = convert_to_type_ex(IS_STRING, GET_PROP(obj, rawPostData), &raw_data_p); - - RETVAL_ZVAL(raw_data, 1, 0); - - if (raw_data_p) { - zval_ptr_dtor(&raw_data_p); - } + RETURN_PROP(rawPostData); } } /* }}} */ @@ -1400,10 +1306,9 @@ PHP_METHOD(HttpRequest, getRawPostData) */ PHP_METHOD(HttpRequest, addPostFile) { - zval *files, *entry; + 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; @@ -1423,8 +1328,15 @@ PHP_METHOD(HttpRequest, addPostFile) add_assoc_stringl(entry, "type", type, type_len, 1); add_assoc_stringl(entry, "file", file, file_len, 1); - files = convert_to_type(IS_ARRAY, GET_PROP(obj, postFiles)); - add_next_index_zval(files, entry); + MAKE_STD_ZVAL(new_post); + array_init(new_post); + old_post = GET_PROP(postFiles); + if (Z_TYPE_P(old_post) == IS_ARRAY) { + array_copy(old_post, new_post); + } + add_next_index_zval(new_post, entry); + SET_PROP(postFiles, new_post); + zval_ptr_dtor(&new_post); RETURN_TRUE; } @@ -1443,21 +1355,19 @@ PHP_METHOD(HttpRequest, addPostFile) */ PHP_METHOD(HttpRequest, setPostFiles) { - zval *files, *pFiles; - getObject(http_request_object, obj); + zval *files = NULL, *post; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &files)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!/", &files)) { RETURN_FALSE; } - pFiles = convert_to_type(IS_ARRAY, GET_PROP(obj, postFiles)); - - SEP_PROP(&pFiles); - zend_hash_clean(Z_ARRVAL_P(pFiles)); - if (files && zend_hash_num_elements(Z_ARRVAL_P(files))) { - array_copy(files, pFiles); + MAKE_STD_ZVAL(post); + array_init(post); + if (files && (Z_TYPE_P(files) == IS_ARRAY)) { + array_copy(files, post); } - SET_PROP(obj, postFiles, pFiles); + SET_PROP(postFiles, post); + zval_ptr_dtor(&post); RETURN_TRUE; } @@ -1474,15 +1384,7 @@ PHP_METHOD(HttpRequest, getPostFiles) NO_ARGS; IF_RETVAL_USED { - getObject(http_request_object, obj); - 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); - } + RETURN_PROP(postFiles); } } /* }}} */ @@ -1500,13 +1402,12 @@ 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; } - UPD_STRL(obj, putFile, file, file_len); + UPD_STRL(putFile, file, file_len); RETURN_TRUE; } /* }}} */ @@ -1522,14 +1423,7 @@ PHP_METHOD(HttpRequest, getPutFile) NO_ARGS; IF_RETVAL_USED { - getObject(http_request_object, obj); - zval *putfile_p, *putfile = convert_to_type_ex(IS_STRING, GET_PROP(obj, putFile), &putfile_p); - - RETVAL_ZVAL(putfile, 1, 0); - - if (putfile_p) { - zval_ptr_dtor(&putfile_p); - } + RETURN_PROP(putFile); } } /* }}} */ @@ -1550,15 +1444,7 @@ PHP_METHOD(HttpRequest, getResponseData) NO_ARGS; IF_RETVAL_USED { - getObject(http_request_object, obj); - 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); - } + RETURN_PROP(responseData); } } /* }}} */ @@ -1579,21 +1465,20 @@ PHP_METHOD(HttpRequest, getResponseData) PHP_METHOD(HttpRequest, getResponseHeader) { IF_RETVAL_USED { - zval *data_p, *data, **headers, **header; + 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; } - 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); + data = GET_PROP(responseData); + if ( (Z_TYPE_P(data) == IS_ARRAY) && + (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) && + (Z_TYPE_PP(headers) == IS_ARRAY)) { if (!header_len || !header_name) { - array_init(return_value); - array_copy(*headers, return_value); + RETVAL_ZVAL(*headers, 1, 0); } 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 { @@ -1602,10 +1487,6 @@ PHP_METHOD(HttpRequest, getResponseHeader) } else { RETVAL_FALSE; } - - if (data_p) { - zval_ptr_dtor(&data_p); - } } } /* }}} */ @@ -1631,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; @@ -1639,8 +1519,10 @@ PHP_METHOD(HttpRequest, getResponseCookie) array_init(return_value); - data = convert_to_type(IS_ARRAY, GET_PROP(obj, responseData)); - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) { + data = GET_PROP(responseData); + if ( (Z_TYPE_P(data) == IS_ARRAY) && + (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) && + (Z_TYPE_PP(headers) == IS_ARRAY)) { ulong idx = 0; char *key = NULL; zval **header = NULL; @@ -1730,10 +1612,10 @@ PHP_METHOD(HttpRequest, getResponseBody) IF_RETVAL_USED { zval **body; - getObject(http_request_object, obj); - zval *data = convert_to_type(IS_ARRAY, GET_PROP(obj, responseData)); + zval *data = GET_PROP(responseData); - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "body", sizeof("body"), (void **) &body)) { + if ( (Z_TYPE_P(data) == IS_ARRAY) && + (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "body", sizeof("body"), (void **) &body))) { RETURN_ZVAL(*body, 1, 0); } else { RETURN_FALSE; @@ -1756,14 +1638,7 @@ PHP_METHOD(HttpRequest, getResponseCode) NO_ARGS; IF_RETVAL_USED { - getObject(http_request_object, obj); - zval *code_p, *code = convert_to_type_ex(IS_LONG, GET_PROP(obj, responseCode), &code_p); - - RETVAL_ZVAL(code, 1, 0); - - if (code_p) { - zval_ptr_dtor(&code_p); - } + RETURN_PROP(responseCode); } } /* }}} */ @@ -1790,13 +1665,16 @@ 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; } - info = convert_to_type(IS_ARRAY, GET_PROP(obj, responseInfo)); + info = GET_PROP(responseInfo); + + if (Z_TYPE_P(info) != IS_ARRAY) { + RETURN_FALSE; + } 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)) { @@ -1806,8 +1684,7 @@ PHP_METHOD(HttpRequest, getResponseInfo) RETURN_FALSE; } } else { - array_init(return_value); - array_copy(info, return_value); + RETURN_ZVAL(info, 1, 0); } } } @@ -1832,10 +1709,9 @@ PHP_METHOD(HttpRequest, getResponseMessage) IF_RETVAL_USED { zval *message; - getObject(http_request_object, obj); SET_EH_THROW_HTTP(); - message = GET_PROP(obj, responseMessage); + message = GET_PROP(responseMessage); if (Z_TYPE_P(message) == IS_OBJECT) { RETVAL_OBJECT(message); } else { @@ -1881,6 +1757,44 @@ PHP_METHOD(HttpRequest, getRequestMessage) } /* }}} */ +/* {{{ proto string HttpRequest::getRawRequestMessage() + * + * Get sent HTTP message. + * + * Returns an HttpMessage in a form of a string + * + */ +PHP_METHOD(HttpRequest, getRawRequestMessage) +{ + NO_ARGS; + + IF_RETVAL_USED { + getObject(http_request_object, obj); + + RETURN_PHPSTR_DUP(&obj->request->conv.request); + } +} +/* }}} */ + +/* {{{ proto string HttpRequest::getRawResponseMessage() + * + * Get the entire HTTP response. + * + * Returns the complete web server response, including the headers in a form of a string. + * + */ +PHP_METHOD(HttpRequest, getRawResponseMessage) +{ + NO_ARGS; + + IF_RETVAL_USED { + getObject(http_request_object, obj); + + RETURN_PHPSTR_DUP(&obj->request->conv.response); + } +} +/* }}} */ + /* {{{ proto HttpMessage HttpRequest::getHistory() * * Get all sent requests and received responses as an HttpMessage object. @@ -1983,18 +1897,14 @@ PHP_METHOD(HttpRequest, send) SET_EH_THROW_HTTP(); + RETVAL_FALSE; + if (obj->pool) { http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot perform HttpRequest::send() while attached to an HttpRequestPool"); - SET_EH_NORMAL(); - RETURN_FALSE; - } - - RETVAL_NULL(); - - if (SUCCESS == http_request_object_requesthandler(obj, getThis())) { + } 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(obj, responseMessage)); + RETVAL_OBJECT(GET_PROP(responseMessage)); } }