X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_object.c;h=c56562a0af9cdcf9c41f0cce33ff6394ea829eba;hp=45625f0f777ab4dbf1fa0be4d5e229ed5818e591;hb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d;hpb=dd199f9961262ed43fa544240df15a9d6d7d0f08 diff --git a/http_request_object.c b/http_request_object.c index 45625f0..c56562a 100644 --- a/http_request_object.c +++ b/http_request_object.c @@ -74,7 +74,9 @@ HTTP_END_ARGS; HTTP_EMPTY_ARGS(enableCookies); #if HTTP_CURL_VERSION(7,14,1) -HTTP_EMPTY_ARGS(resetCookies); +HTTP_BEGIN_ARGS(resetCookies, 0) + HTTP_ARG_VAL(session_only, 0) +HTTP_END_ARGS; #endif HTTP_EMPTY_ARGS(getUrl); @@ -232,10 +234,12 @@ HTTP_BEGIN_ARGS(methodExists, 1) HTTP_ARG_VAL(method, 0) HTTP_END_ARGS; +#ifdef HAVE_CURL_GETFORMDATA HTTP_BEGIN_ARGS(encodeBody, 2) HTTP_ARG_VAL(fields, 0) HTTP_ARG_VAL(files, 0) HTTP_END_ARGS; +#endif #define OBJ_PROP_CE http_request_object_ce zend_class_entry *http_request_object_ce; @@ -321,9 +325,9 @@ zend_function_entry http_request_object_fe[] = { HTTP_REQUEST_ALIAS(methodUnregister, http_request_method_unregister) HTTP_REQUEST_ALIAS(methodName, http_request_method_name) HTTP_REQUEST_ALIAS(methodExists, http_request_method_exists) - +#ifdef HAVE_CURL_GETFORMDATA HTTP_REQUEST_ALIAS(encodeBody, http_request_body_encode) - +#endif EMPTY_FUNCTION_ENTRY }; static zend_object_handlers http_request_object_handlers; @@ -337,7 +341,6 @@ PHP_MINIT_FUNCTION(http_request_object) 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, string, responseStatus, ""); @@ -392,7 +395,23 @@ PHP_MINIT_FUNCTION(http_request_object) */ 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); + DCL_CONST(long, "VERSION_NONE", CURL_HTTP_VERSION_NONE); /* to be removed */ + DCL_CONST(long, "VERSION_ANY", CURL_HTTP_VERSION_NONE); + + /* + * SSL Version Constants + */ + DCL_CONST(long, "SSL_VERSION_TLSv1", CURL_SSLVERSION_TLSv1); + DCL_CONST(long, "SSL_VERSION_SSLv2", CURL_SSLVERSION_SSLv2); + DCL_CONST(long, "SSL_VERSION_SSLv3", CURL_SSLVERSION_SSLv3); + DCL_CONST(long, "SSL_VERSION_ANY", CURL_SSLVERSION_DEFAULT); + + /* + * DNS IPvX resolving + */ + DCL_CONST(long, "IPRESOLVE_V4", CURL_IPRESOLVE_V4); + DCL_CONST(long, "IPRESOLVE_V6", CURL_IPRESOLVE_V6); + DCL_CONST(long, "IPRESOLVE_ANY", CURL_IPRESOLVE_WHATEVER); /* * Auth Constants @@ -400,6 +419,7 @@ PHP_MINIT_FUNCTION(http_request_object) DCL_CONST(long, "AUTH_BASIC", CURLAUTH_BASIC); DCL_CONST(long, "AUTH_DIGEST", CURLAUTH_DIGEST); DCL_CONST(long, "AUTH_NTLM", CURLAUTH_NTLM); + DCL_CONST(long, "AUTH_GSSNEG", CURLAUTH_GSSNEGOTIATE); DCL_CONST(long, "AUTH_ANY", CURLAUTH_ANY); /* @@ -445,18 +465,16 @@ zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch, ht 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, NULL, &new_obj); + new_ov = http_request_object_new_ex(old_obj->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); + zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); phpstr_append(&new_obj->request->conv.request, old_obj->request->conv.request.data, old_obj->request->conv.request.used); phpstr_append(&new_obj->request->conv.response, old_obj->request->conv.response.data, old_obj->request->conv.response.used); @@ -467,12 +485,8 @@ void _http_request_object_free(zend_object *object TSRMLS_DC) { http_request_object *o = (http_request_object *) object; - if (OBJ_PROP(o)) { - zend_hash_destroy(OBJ_PROP(o)); - FREE_HASHTABLE(OBJ_PROP(o)); - } http_request_free(&o->request); - efree(o); + freeObject(o); } #define http_request_object_check_request_content_type(t) _http_request_object_check_request_content_type((t) TSRMLS_CC) @@ -500,7 +514,7 @@ static inline void _http_request_object_check_request_content_type(zval *this_pt /* check for spaces only */ for (i = 0; i < Z_STRLEN_PP(ct_header); ++i) { - if (!isspace(Z_STRVAL_PP(ct_header)[i])) { + if (!HTTP_IS_CTYPE(space, Z_STRVAL_PP(ct_header)[i])) { only_space = 0; break; } @@ -538,21 +552,23 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ case HTTP_PUT: { - zval *put_data = GET_PROP(putData); + zval *put_file = GET_PROP(putFile); http_request_object_check_request_content_type(getThis()); - if (Z_STRLEN_P(put_data)) { - obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_CSTRING, - estrndup(Z_STRVAL_P(put_data), Z_STRLEN_P(put_data)), Z_STRLEN_P(put_data), 1); - } else { + + if (Z_STRLEN_P(put_file)) { php_stream_statbuf ssb; - php_stream *stream = php_stream_open_wrapper_ex(Z_STRVAL_P(GET_PROP(putFile)), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT); + php_stream *stream = php_stream_open_wrapper_ex(Z_STRVAL_P(put_file), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT); - if (stream && !php_stream_stat(stream, &ssb)) { + if (stream && SUCCESS == php_stream_stat(stream, &ssb)) { obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1); } else { status = FAILURE; } + } else { + zval *put_data = GET_PROP(putData); + obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_CSTRING, + estrndup(Z_STRVAL_P(put_data), Z_STRLEN_P(put_data)), Z_STRLEN_P(put_data), 1); } break; } @@ -639,9 +655,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this phpstr_fix(&obj->request->conv.response); if ((msg = http_message_parse(PHPSTR_VAL(&obj->request->conv.response), PHPSTR_LEN(&obj->request->conv.response)))) { - char *body; - size_t body_len; - zval *headers, *message, *resp; + zval *message; if (zval_is_true(GET_PROP(recordHistory))) { zval *hist, *history = GET_PROP(history); @@ -658,18 +672,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this } UPD_PROP(long, responseCode, msg->http.info.response.code); - UPD_PROP(string, responseStatus, msg->http.info.response.status ? msg->http.info.response.status : ""); - - 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 *)); - add_assoc_zval(resp, "headers", headers); - phpstr_data(PHPSTR(msg), &body, &body_len); - add_assoc_stringl(resp, "body", body, body_len, 0); - SET_PROP(responseData, resp); - zval_ptr_dtor(&resp); + UPD_PROP(string, responseStatus, STR_PTR(msg->http.info.response.status)); MAKE_STD_ZVAL(message); ZVAL_OBJVAL(message, http_message_object_new_ex(http_message_object_ce, msg, NULL), 0); @@ -679,17 +682,13 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this ret = SUCCESS; } else { /* update properties with empty values*/ - zval *resp = GET_PROP(responseData), *znull; + zval *znull; MAKE_STD_ZVAL(znull); ZVAL_NULL(znull); SET_PROP(responseMessage, znull); zval_ptr_dtor(&znull); - if (Z_TYPE_P(resp) == IS_ARRAY) { - zend_hash_clean(Z_ARRVAL_P(resp)); - } - UPD_PROP(long, responseCode, 0); UPD_PROP(string, responseStatus, ""); @@ -749,26 +748,26 @@ static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM array_init(new_opts); old_opts = GET_PROP(options); if (Z_TYPE_P(old_opts) == IS_ARRAY) { - array_copy(old_opts, new_opts); + array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts)); } - if (prettify_keys && opts) { - zend_hash_apply_with_arguments(Z_ARRVAL_P(opts), apply_pretty_key, 0); - } if (SUCCESS == zend_hash_find(Z_ARRVAL_P(new_opts), key, len, (void *) &entry)) { if (overwrite) { zend_hash_clean(Z_ARRVAL_PP(entry)); } if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) { if (overwrite) { - array_copy(opts, *entry); + array_copy(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry)); } else { - array_merge(opts, *entry); + array_join(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry), 0, prettify_keys ? ARRAY_JOIN_PRETTIFY : 0); } } } else if (opts) { + if (prettify_keys) { + zend_hash_apply_with_arguments(Z_ARRVAL_P(opts), apply_pretty_key, 0); + } ZVAL_ADDREF(opts); - add_assoc_zval(new_opts, key, opts); + add_assoc_zval_ex(new_opts, key, len, opts); } SET_PROP(options, new_opts); zval_ptr_dtor(&new_opts); @@ -791,7 +790,7 @@ static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS, 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); + array_copy(Z_ARRVAL_PP(options), Z_ARRVAL_P(return_value)); } } } @@ -818,7 +817,7 @@ PHP_METHOD(HttpRequest, __construct) zval *options = NULL; SET_EH_THROW_HTTP(); - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sla", &URL, &URL_len, &meth, &options)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sla!", &URL, &URL_len, &meth, &options)) { if (URL) { UPD_STRL(url, URL, URL_len); } @@ -845,8 +844,7 @@ PHP_METHOD(HttpRequest, __construct) */ PHP_METHOD(HttpRequest, setOptions) { - char *key = NULL; - ulong idx = 0; + HashKey key = initHashKey(0); HashPosition pos; zval *opts = NULL, *old_opts, *new_opts, *add_opts, **opt; @@ -866,37 +864,40 @@ PHP_METHOD(HttpRequest, setOptions) 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")) { + FOREACH_KEYVAL(pos, opts, key, opt) { + if (key.type == HASH_KEY_IS_STRING) { + if (!strcmp(key.str, "headers")) { zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addheaders", NULL, *opt); - } else if (!strcmp(key, "cookies")) { + } else if (!strcmp(key.str, "cookies")) { zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addcookies", NULL, *opt); - } else if (!strcmp(key, "ssl")) { + } else if (!strcmp(key.str, "ssl")) { zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addssloptions", NULL, *opt); - } else if ((!strcasecmp(key, "url")) || (!strcasecmp(key, "uri"))) { + } else if ((!strcasecmp(key.str, "url")) || (!strcasecmp(key.str, "uri"))) { zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "seturl", NULL, *opt); - } else if (!strcmp(key, "method")) { + } else if (!strcmp(key.str, "method")) { zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setmethod", NULL, *opt); #if HTTP_CURL_VERSION(7,14,1) - } else if (!strcmp(key, "resetcookies")) { + } else if (!strcmp(key.str, "resetcookies")) { getObject(http_request_object, obj); - http_request_reset_cookies(obj->request); + http_request_reset_cookies(obj->request, 0); #endif + } else if (!strcmp(key.str, "enablecookies")) { + getObject(http_request_object, obj); + http_request_enable_cookies(obj->request); + } else if (!strcasecmp(key.str, "recordHistory")) { + UPD_PROP(bool, recordHistory, 1); } else { ZVAL_ADDREF(*opt); - add_assoc_zval(add_opts, key, *opt); + add_assoc_zval_ex(add_opts, key.str, key.len, *opt); } - /* reset */ - key = NULL; } } old_opts = GET_PROP(options); if (Z_TYPE_P(old_opts) == IS_ARRAY) { - array_copy(old_opts, new_opts); + array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts)); } - array_merge(add_opts, new_opts); + array_join(Z_ARRVAL_P(add_opts), Z_ARRVAL_P(new_opts), 0, 0); SET_PROP(options, new_opts); zval_ptr_dtor(&new_opts); zval_ptr_dtor(&add_opts); @@ -1060,17 +1061,26 @@ PHP_METHOD(HttpRequest, enableCookies) } /* }}} */ -/* {{{ proto bool HttpRequest::resetCookies() +/* {{{ proto bool HttpRequest::resetCookies([bool session_only = FALSE]) * * Reset all automatically received/sent cookies. * Note that customly set cookies are not affected. + * + * Accepts an optional bool parameter specifying + * whether only session cookies should be reset + * (needs libcurl >= v7.15.4, else libcurl >= v7.14.1). + * + * Returns TRUE on success, or FALSE on failure. */ PHP_METHOD(HttpRequest, resetCookies) { - NO_ARGS { - getObject(http_request_object, obj); - RETURN_SUCCESS(http_request_reset_cookies(obj->request)); + zend_bool session_only = 0; + getObject(http_request_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &session_only)) { + RETURN_FALSE; } + RETURN_SUCCESS(http_request_reset_cookies(obj->request, session_only)); } /* }}} */ @@ -1307,9 +1317,9 @@ PHP_METHOD(HttpRequest, addPostFields) array_init(new_post); old_post = GET_PROP(postFields); if (Z_TYPE_P(old_post) == IS_ARRAY) { - array_copy(old_post, new_post); + array_copy(Z_ARRVAL_P(old_post), Z_ARRVAL_P(new_post)); } - array_merge(post_data, new_post); + array_join(Z_ARRVAL_P(post_data), Z_ARRVAL_P(new_post), 0, 0); SET_PROP(postFields, new_post); zval_ptr_dtor(&new_post); } @@ -1339,7 +1349,7 @@ PHP_METHOD(HttpRequest, setPostFields) MAKE_STD_ZVAL(post); array_init(post); if (post_data && zend_hash_num_elements(Z_ARRVAL_P(post_data))) { - array_copy(post_data, post); + array_copy(Z_ARRVAL_P(post_data), Z_ARRVAL_P(post)); } SET_PROP(postFields, post); zval_ptr_dtor(&post); @@ -1485,7 +1495,7 @@ PHP_METHOD(HttpRequest, addPostFile) array_init(new_post); old_post = GET_PROP(postFiles); if (Z_TYPE_P(old_post) == IS_ARRAY) { - array_copy(old_post, new_post); + array_copy(Z_ARRVAL_P(old_post), Z_ARRVAL_P(new_post)); } add_next_index_zval(new_post, entry); SET_PROP(postFiles, new_post); @@ -1517,7 +1527,7 @@ PHP_METHOD(HttpRequest, setPostFiles) MAKE_STD_ZVAL(post); array_init(post); if (files && (Z_TYPE_P(files) == IS_ARRAY)) { - array_copy(files, post); + array_copy(Z_ARRVAL_P(files), Z_ARRVAL_P(post)); } SET_PROP(postFiles, post); zval_ptr_dtor(&post); @@ -1677,7 +1687,23 @@ PHP_METHOD(HttpRequest, getResponseData) NO_ARGS; if (return_value_used) { - RETURN_PROP(responseData); + char *body; + size_t body_len; + zval *headers, *message = GET_PROP(responseMessage); + + if (Z_TYPE_P(message) == IS_OBJECT) { + getObjectEx(http_message_object, msg, message); + + array_init(return_value); + + MAKE_STD_ZVAL(headers); + array_init(headers); + zend_hash_copy(Z_ARRVAL_P(headers), &msg->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + add_assoc_zval(return_value, "headers", headers); + + phpstr_data(PHPSTR(msg->message), &body, &body_len); + add_assoc_stringl(return_value, "body", body, body_len, 0); + } } } /* }}} */ @@ -1698,28 +1724,28 @@ PHP_METHOD(HttpRequest, getResponseData) PHP_METHOD(HttpRequest, getResponseHeader) { if (return_value_used) { - zval *data, **headers, **header; + zval *header; char *header_name = NULL; int header_len = 0; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &header_name, &header_len)) { - RETURN_FALSE; - } - - 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) { - 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 { - RETVAL_FALSE; + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &header_name, &header_len)) { + zval *message = GET_PROP(responseMessage); + + if (Z_TYPE_P(message) == IS_OBJECT) { + getObjectEx(http_message_object, msg, message); + + if (header_len) { + if ((header = http_message_header_ex(msg->message, pretty_key(header_name, header_len, 1, 1), header_len + 1, 0))) { + RETURN_ZVAL(header, 1, 1); + } + } else { + array_init(return_value); + zend_hash_copy(Z_ARRVAL_P(return_value), &msg->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + return; + } } - } else { - RETVAL_FALSE; } + RETURN_FALSE; } } /* }}} */ @@ -1737,45 +1763,55 @@ PHP_METHOD(HttpRequest, getResponseCookies) { if (return_value_used) { long flags = 0; - zval *allowed_extras_array = NULL, *data, **headers; - - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|la", &flags, &allowed_extras_array)) { - RETURN_FALSE; - } - - 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)) { + zval *allowed_extras_array = NULL; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|la!", &flags, &allowed_extras_array)) { int i = 0; - ulong idx = 0; - char *key = NULL, **allowed_extras = NULL; - zval **header = NULL, **entry = NULL; + HashKey key = initHashKey(0); + char **allowed_extras = NULL; + zval **header = NULL, **entry = NULL, *message = GET_PROP(responseMessage); HashPosition pos, pos1, pos2; - array_init(return_value); - - if (allowed_extras_array) { - allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *)); - FOREACH_VAL(pos, allowed_extras_array, entry) { - ZVAL_ADDREF(*entry); - convert_to_string_ex(entry); - allowed_extras[i++] = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry)); - zval_ptr_dtor(entry); + if (Z_TYPE_P(message) == IS_OBJECT) { + getObjectEx(http_message_object, msg, message); + + array_init(return_value); + + if (allowed_extras_array) { + allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *)); + FOREACH_VAL(pos, allowed_extras_array, entry) { + ZVAL_ADDREF(*entry); + convert_to_string_ex(entry); + allowed_extras[i++] = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry)); + zval_ptr_dtor(entry); + } } - } - - FOREACH_HASH_KEYVAL(pos1, Z_ARRVAL_PP(headers), key, idx, header) { - if (key && !strcasecmp(key, "Set-Cookie")) { - http_cookie_list list; - - if (Z_TYPE_PP(header) == IS_ARRAY) { - zval **single_header; + + FOREACH_HASH_KEYVAL(pos1, &msg->message->hdrs, key, header) { + if (key.type == HASH_KEY_IS_STRING && !strcasecmp(key.str, "Set-Cookie")) { + http_cookie_list list; - FOREACH_VAL(pos2, *header, single_header) { - ZVAL_ADDREF(*single_header); - convert_to_string_ex(single_header); - if (http_parse_cookie_ex(&list, Z_STRVAL_PP(single_header), flags, allowed_extras)) { + if (Z_TYPE_PP(header) == IS_ARRAY) { + zval **single_header; + + FOREACH_VAL(pos2, *header, single_header) { + ZVAL_ADDREF(*single_header); + convert_to_string_ex(single_header); + if (http_parse_cookie_ex(&list, Z_STRVAL_PP(single_header), flags, allowed_extras)) { + zval *cookie; + + MAKE_STD_ZVAL(cookie); + object_init(cookie); + http_cookie_list_tostruct(&list, cookie); + add_next_index_zval(return_value, cookie); + http_cookie_list_dtor(&list); + } + zval_ptr_dtor(single_header); + } + } else { + ZVAL_ADDREF(*header); + convert_to_string_ex(header); + if (http_parse_cookie_ex(&list, Z_STRVAL_PP(header), flags, allowed_extras)) { zval *cookie; MAKE_STD_ZVAL(cookie); @@ -1784,36 +1820,22 @@ PHP_METHOD(HttpRequest, getResponseCookies) add_next_index_zval(return_value, cookie); http_cookie_list_dtor(&list); } - zval_ptr_dtor(single_header); + zval_ptr_dtor(header); } - } else { - ZVAL_ADDREF(*header); - convert_to_string_ex(header); - if (http_parse_cookie_ex(&list, Z_STRVAL_PP(header), flags, allowed_extras)) { - zval *cookie; - - MAKE_STD_ZVAL(cookie); - object_init(cookie); - http_cookie_list_tostruct(&list, cookie); - add_next_index_zval(return_value, cookie); - http_cookie_list_dtor(&list); - } - zval_ptr_dtor(header); } } - /* reset key */ - key = NULL; - } - - if (allowed_extras) { - for (i = 0; allowed_extras[i]; ++i) { - efree(allowed_extras[i]); + + if (allowed_extras) { + for (i = 0; allowed_extras[i]; ++i) { + efree(allowed_extras[i]); + } + efree(allowed_extras); } - efree(allowed_extras); + + return; } - } else { - RETURN_FALSE; } + RETURN_FALSE; } } /* }}} */ @@ -1832,12 +1854,11 @@ PHP_METHOD(HttpRequest, getResponseBody) NO_ARGS; if (return_value_used) { - zval **body; - zval *data = GET_PROP(responseData); + zval *message = GET_PROP(responseMessage); - 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); + if (Z_TYPE_P(message) == IS_OBJECT) { + getObjectEx(http_message_object, msg, message); + RETURN_PHPSTR_DUP(&msg->message->body); } else { RETURN_FALSE; }