/*
- +----------------------------------------------------------------------+
- | PECL :: http |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, that |
- | is bundled with this package in the file LICENSE, and is available |
- | through the world-wide-web at http://www.php.net/license/3_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Copyright (c) 2004-2005 Michael Wallner <mike@php.net> |
- +----------------------------------------------------------------------+
+ +--------------------------------------------------------------------+
+ | PECL :: http |
+ +--------------------------------------------------------------------+
+ | Redistribution and use in source and binary forms, with or without |
+ | modification, are permitted provided that the conditions mentioned |
+ | in the accompanying LICENSE file are met. |
+ +--------------------------------------------------------------------+
+ | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ +--------------------------------------------------------------------+
*/
/* $Id$ */
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
+
+#define HTTP_WANT_CURL
+#include "php_http.h"
#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
#include "zend_interfaces.h"
-#include "php_http_std_defs.h"
-#include "php_http_request_object.h"
-#include "php_http_request_api.h"
-#include "php_http_request_pool_api.h"
-#include "php_http.h"
#include "php_http_api.h"
-#include "php_http_url_api.h"
+#include "php_http_exception_object.h"
#include "php_http_message_api.h"
#include "php_http_message_object.h"
-#include "php_http_exception_object.h"
-
-#include "missing.h"
-
-#ifdef PHP_WIN32
-# include <winsock2.h>
-#endif
-#include <curl/curl.h>
+#include "php_http_request_api.h"
+#include "php_http_request_object.h"
+#include "php_http_request_pool_api.h"
+#include "php_http_url_api.h"
ZEND_EXTERN_MODULE_GLOBALS(http);
};
static zend_object_handlers http_request_object_handlers;
-void _http_request_object_init(INIT_FUNC_ARGS)
+PHP_MINIT_FUNCTION(http_request_object)
{
HTTP_REGISTER_CLASS_EX(HttpRequest, http_request_object, NULL, 0);
+ 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->request = http_request_init_ex(NULL, ch, 0, NULL);
phpstr_init(&o->history);
- phpstr_init(&o->request);
- phpstr_init_ex(&o->response, HTTP_CURLBUF_SIZE, 0);
+
+ if (ptr) {
+ *ptr = o;
+ }
ALLOC_HASHTABLE(OBJ_PROP(o));
zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
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->request->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->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);
+
+ return new_ov;
+}
+
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_N(PROTECTED, responseCode);
+ DCL_PROP(PROTECTED, long, responseCode, 0);
DCL_PROP_N(PROTECTED, responseMessage);
DCL_PROP_N(PROTECTED, postFields);
DCL_PROP_N(PROTECTED, postFiles);
DCL_PROP(PROTECTED, string, queryData, "");
DCL_PROP(PROTECTED, string, putFile, "");
- DCL_PROP(PUBLIC, bool, recordHistory, 1);
+ DCL_PROP(PUBLIC, bool, recordHistory, 0);
#ifndef WONKY
/*
/*
* Auth Constants
*/
-# if LIBCURL_VERSION_NUM >= 0x070a05
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_ANY", CURLAUTH_ANY);
-# endif /* LIBCURL_VERSION_NUM */
#endif /* WONKY */
}
zend_hash_destroy(OBJ_PROP(o));
FREE_HASHTABLE(OBJ_PROP(o));
}
- if (o->ch) {
- /* avoid nasty segfaults with already cleaned up callbacks */
- curl_easy_setopt(o->ch, CURLOPT_NOPROGRESS, 1);
- curl_easy_setopt(o->ch, CURLOPT_PROGRESSFUNCTION, NULL);
- curl_easy_setopt(o->ch, CURLOPT_VERBOSE, 0);
- curl_easy_setopt(o->ch, CURLOPT_DEBUGFUNCTION, NULL);
- curl_easy_cleanup(o->ch);
- }
- phpstr_dtor(&o->response);
- phpstr_dtor(&o->request);
+ http_request_free(&o->request);
phpstr_dtor(&o->history);
efree(o);
}
-STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr, http_request_body *body TSRMLS_DC)
+STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr TSRMLS_DC)
{
- zval *meth, *URL;
- char *request_uri;
+ zval *URL, *URL_p, *meth_p;
STATUS status = SUCCESS;
- if (!body) {
- return FAILURE;
+ 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->ch, curl_easy_init(), return FAILURE);
-
- URL = convert_to_type_ex(IS_STRING, GET_PROP(obj, url));
- // 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 (!obj->request->url) {
return FAILURE;
}
- meth = convert_to_type_ex(IS_LONG, GET_PROP(obj, method));
- switch (Z_LVAL_P(meth))
+ switch (obj->request->meth = Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_PROP(obj, method), &meth_p)))
{
case HTTP_GET:
case HTTP_HEAD:
- body->type = -1;
- body = NULL;
break;
case HTTP_PUT:
php_stream *stream = php_stream_open_wrapper(Z_STRVAL_P(GET_PROP(obj, putFile)), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
if (stream && !php_stream_stat(stream, &ssb)) {
- body->type = HTTP_REQUEST_BODY_UPLOADFILE;
- body->data = stream;
- body->size = ssb.sb.st_size;
+ http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1);
} else {
status = FAILURE;
}
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);
add_assoc_zval(opts, "headers", 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);
- body->type = HTTP_REQUEST_BODY_CSTRING;
- body->data = estrndup(Z_STRVAL_P(raw_data), Z_STRLEN_P(raw_data));
- body->size = Z_STRLEN_P(raw_data);
} else {
- status = http_request_body_fill(body, Z_ARRVAL_P(GET_PROP(obj, postFields)), Z_ARRVAL_P(GET_PROP(obj, postFiles)));
+ 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));
+
+ if (!(obj->request->body = http_request_body_fill(obj->request->body, fields, files))) {
+ status = FAILURE;
+ }
+
+ if (fields_cpy) {
+ zval_ptr_dtor(&fields_cpy);
+ }
+ if (files_cpy) {
+ zval_ptr_dtor(&files_cpy);
+ }
+ }
+
+ 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);
+ zval *opt_p, *options = convert_to_type_ex(IS_ARRAY, GET_PROP(obj, options), &opt_p);
if (Z_STRLEN_P(qdata)) {
- if (!strchr(request_uri, '?')) {
- strlcat(request_uri, "?", HTTP_URI_MAXLEN);
+ if (!strchr(obj->request->url, '?')) {
+ strlcat(obj->request->url, "?", HTTP_URI_MAXLEN);
} else {
- strlcat(request_uri, "&", HTTP_URI_MAXLEN);
+ strlcat(obj->request->url, "&", HTTP_URI_MAXLEN);
}
- strlcat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN);
+ strlcat(obj->request->url, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN);
}
- status = http_request_init(obj->ch, Z_LVAL_P(meth), request_uri, body, Z_ARRVAL_P(GET_PROP(obj, options)));
+ 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);
+ }
}
- efree(request_uri);
-
- /* clean previous response */
- phpstr_dtor(&obj->response);
- /* clean previous request */
- phpstr_dtor(&obj->request);
return status;
}
STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this_ptr TSRMLS_DC)
{
http_message *msg;
-
- phpstr_fix(&obj->request);
- phpstr_fix(&obj->response);
- msg = http_message_parse(PHPSTR_VAL(&obj->response), PHPSTR_LEN(&obj->response));
+ phpstr_fix(&obj->request->conv.request);
+ phpstr_fix(&obj->request->conv.response);
+
+ msg = http_message_parse(PHPSTR_VAL(&obj->request->conv.response), PHPSTR_LEN(&obj->request->conv.response));
if (!msg) {
return FAILURE;
*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
* for redirects
*/
- http_message *response = msg, *request = http_message_parse(PHPSTR_VAL(&obj->request), PHPSTR_LEN(&obj->request));
+ http_message *response = msg, *request = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request));
http_message *free_msg = request;
do {
UPD_PROP(obj, long, responseCode, msg->http.info.response.code);
- MAKE_STD_ZVAL(headers)
+ 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);
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);
- http_request_info(obj->ch, Z_ARRVAL_P(info));
+ http_request_info(obj->request, Z_ARRVAL_P(info));
SET_PROP(obj, responseInfo, info);
return SUCCESS;
}
}
} else if (new_options && zend_hash_num_elements(Z_ARRVAL_P(new_options))) {
- zval_add_ref(&new_options);
+ ZVAL_ADDREF(new_options);
add_assoc_zval(opts, key, new_options);
}
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);
convert_to_array(*options);
array_copy(*options, return_value);
}
+
+ if (opts_p) {
+ zval_ptr_dtor(&opts_p);
+ }
}
}
{
char *key = NULL;
ulong idx = 0;
+ HashPosition pos;
zval *opts = NULL, *old_opts, **opt;
getObject(http_request_object, obj);
- 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);
+
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;
if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "headers", sizeof("headers"), (void **) &headers)) {
- convert_to_array(*opt);
+ convert_to_array_ex(opt);
convert_to_array(*headers);
array_merge(*opt, *headers);
continue;
} 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(*opt);
+ convert_to_array_ex(opt);
convert_to_array(*cookies);
array_merge(*opt, *cookies);
continue;
} 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(*opt);
+ convert_to_array_ex(opt);
convert_to_array(*ssl);
array_merge(*opt, *ssl);
continue;
continue;
}
- zval_add_ref(opt);
+ ZVAL_ADDREF(*opt);
add_assoc_zval(old_opts, key, *opt);
/* reset */
key = NULL;
}
}
+ SET_PROP(obj, options, old_opts);
RETURN_TRUE;
}
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);
+ }
}
}
/* }}} */
* Set the request method.
*
* Expects an int as parameter specifying the request method to use.
- * In PHP 5.1+ HttpRequest::METH, otherwise the HTTP_METH constants can be used.
+ * In PHP 5.1+ HttpRequest::METH_*, otherwise the HTTP_METH_* constants can be used.
*
* Returns TRUE on success, or FALSE on failure.
*/
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);
+ }
}
}
/* }}} */
*/
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);
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;
}
/* }}} */
}
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;
}
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);
+ }
}
}
/* }}} */
}
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';
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;
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);
+ }
}
}
/* }}} */
}
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;
}
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);
+ }
}
}
/* }}} */
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);
+ }
}
}
/* }}} */
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);
+ }
}
}
/* }}} */
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);
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);
}
}
}
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);
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;
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);
+ }
}
}
/* }}} */
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)) {
* 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)
{
getObject(http_request_object, obj);
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));
+ 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));
}
SET_EH_NORMAL();
}
* 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)
{
getObject(http_request_object, obj);
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));
+ 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));
}
SET_EH_NORMAL();
}
*
* 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.
*
* GET example:
* <pre>
* <?php
- * $r = new HttpRequest('http://example.com/feed.rss', HTTP_GET);
+ * $r = new HttpRequest('http://example.com/feed.rss', HttpRequest::METH_GET);
* $r->setOptions(array('lastmodified' => filemtime('local.rss')));
* $r->addQueryData(array('category' => 3));
* try {
* POST example:
* <pre>
* <?php
- * $r = new HttpRequest('http://example.com/form.php', HTTP_POST);
+ * $r = new HttpRequest('http://example.com/form.php', HttpRequest::METH_POST);
* $r->setOptions(array('cookies' => array('lang' => 'de')));
* $r->addPostFields(array('user' => 'mike', 'pass' => 's3c|r3t'));
* $r->addPostFile('image', 'profile.jpg', 'image/jpeg');
*/
PHP_METHOD(HttpRequest, send)
{
- http_request_body body = {0, NULL, 0};
getObject(http_request_object, obj);
NO_ARGS;
RETVAL_NULL();
- if ( (SUCCESS == http_request_object_requesthandler(obj, getThis(), &body)) &&
- (SUCCESS == http_request_exec(obj->ch, NULL, &obj->response, &obj->request)) &&
- (SUCCESS == http_request_object_responsehandler(obj, getThis()))) {
- RETVAL_OBJECT(GET_PROP(obj, responseMessage));
+ 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));
+ }
}
- http_request_body_dtor(&body);
SET_EH_NORMAL();
}
projects / m6w6 / ext-http / blobdiff