HTTP_ARG_VAL(cookies, 0)
HTTP_END_ARGS;
+HTTP_EMPTY_ARGS(enableCookies);
+#if HTTP_CURL_VERSION(7,14,1)
+HTTP_BEGIN_ARGS(resetCookies, 0)
+ HTTP_ARG_VAL(session_only, 0)
+HTTP_END_ARGS;
+#endif
+
HTTP_EMPTY_ARGS(getUrl);
HTTP_BEGIN_ARGS(setUrl, 1)
HTTP_ARG_VAL(url, 0)
HTTP_ARG_VAL(info, 1)
HTTP_END_ARGS;
+HTTP_BEGIN_ARGS(putData, 2)
+ HTTP_ARG_VAL(url, 0)
+ HTTP_ARG_VAL(data, 0)
+ HTTP_ARG_VAL(options, 0)
+ HTTP_ARG_VAL(info, 1)
+HTTP_END_ARGS;
+
HTTP_BEGIN_ARGS(putFile, 2)
HTTP_ARG_VAL(url, 0)
HTTP_ARG_VAL(file, 0)
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;
zend_function_entry http_request_object_fe[] = {
HTTP_REQUEST_ME(getCookies, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(setCookies, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(enableCookies, ZEND_ACC_PUBLIC)
+#if HTTP_CURL_VERSION(7,14,1)
+ HTTP_REQUEST_ME(resetCookies, ZEND_ACC_PUBLIC)
+#endif
+
HTTP_REQUEST_ME(setMethod, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getMethod, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ALIAS(head, http_head)
HTTP_REQUEST_ALIAS(postData, http_post_data)
HTTP_REQUEST_ALIAS(postFields, http_post_fields)
+ HTTP_REQUEST_ALIAS(putData, http_put_data)
HTTP_REQUEST_ALIAS(putFile, http_put_file)
HTTP_REQUEST_ALIAS(putStream, http_put_stream)
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;
}
ALLOC_HASHTABLE(OBJ_PROP(o));
- zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
ov.handle = putObject(http_request_object, o);
{
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)
zval **headers, *opts = GET_PROP(options);
if ( (Z_TYPE_P(opts) == IS_ARRAY) &&
- (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) &&
+ (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void *) &headers)) &&
(Z_TYPE_PP(headers) == IS_ARRAY)) {
zval **ct_header;
/* 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))) {
add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
} else
/* or not a string, zero length string or a string of spaces */
{
case HTTP_GET:
case HTTP_HEAD:
- break;
+ break;
case HTTP_PUT:
{
status = FAILURE;
}
}
+ break;
}
- break;
case HTTP_POST:
default:
}
}
}
+ break;
}
- break;
}
if (status == SUCCESS) {
zval **entry, *pcb;
if ( (Z_TYPE_P(options) != IS_ARRAY)
- || (SUCCESS != zend_hash_find(Z_ARRVAL_P(options), "onprogress", sizeof("onprogress"), (void **) &entry)
+ || (SUCCESS != zend_hash_find(Z_ARRVAL_P(options), "onprogress", sizeof("onprogress"), (void *) &entry)
|| (!zval_is_true(*entry)))) {
MAKE_STD_ZVAL(pcb);
array_init(pcb);
}
UPD_PROP(long, responseCode, msg->http.info.response.code);
- UPD_PROP(string, responseStatus, msg->http.info.response.status);
+ UPD_PROP(string, responseStatus, msg->http.info.response.status ? msg->http.info.response.status : "");
MAKE_STD_ZVAL(resp);
array_init(resp);
ret = FAILURE;
}
- if (zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onfinish", sizeof("onfinish"))) {
+ if (!EG(exception) && zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onfinish", sizeof("onfinish"))) {
zval *param;
MAKE_STD_ZVAL(param);
ZVAL_BOOL(param, ret == SUCCESS);
- zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "onfinish", NULL, param);
+ with_error_handling(EH_NORMAL, NULL) {
+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "onfinish", NULL, param);
+ } end_error_handling();
zval_ptr_dtor(¶m);
}
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 (SUCCESS == zend_hash_find(Z_ARRVAL_P(new_opts), key, len, (void *) &entry)) {
if (overwrite) {
zend_hash_clean(Z_ARRVAL_PP(entry));
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *opts, **options;
opts = GET_PROP(options);
array_init(return_value);
if ( (Z_TYPE_P(opts) == IS_ARRAY) &&
- (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void **) &options))) {
+ (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) {
convert_to_array(*options);
array_copy(*options, return_value);
}
zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "seturl", NULL, *opt);
} else if (!strcmp(key, "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")) {
+ getObject(http_request_object, obj);
+ http_request_reset_cookies(obj->request, 0);
+#endif
+ } else if (!strcmp(key, "enablecookies")) {
+ getObject(http_request_object, obj);
+ http_request_enable_cookies(obj->request);
+ } else if (!strcasecmp(key, "recordHistory")) {
+ UPD_PROP(bool, recordHistory, 1);
} else {
ZVAL_ADDREF(*opt);
add_assoc_zval(add_opts, key, *opt);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(options);
}
}
}
/* }}} */
+/* {{{ proto bool HttpRequest::enableCookies()
+ *
+ * Enable automatic sending of received cookies.
+ * Note that cuutomly set cookies will be sent anyway.
+ */
+PHP_METHOD(HttpRequest, enableCookies)
+{
+ NO_ARGS {
+ getObject(http_request_object, obj);
+ RETURN_SUCCESS(http_request_enable_cookies(obj->request));
+ }
+
+}
+/* }}} */
+
+/* {{{ 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)
+{
+ 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));
+}
+/* }}} */
+
/* {{{ proto bool HttpRequest::setUrl(string url)
*
* Set the request URL.
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(url);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(method);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(contentType);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(queryData);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(postFields);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(rawPostData);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(postFiles);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(putFile);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(putData);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(responseData);
}
}
*/
PHP_METHOD(HttpRequest, getResponseHeader)
{
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *data, **headers, **header;
char *header_name = NULL;
int header_len = 0;
data = GET_PROP(responseData);
if ( (Z_TYPE_P(data) == IS_ARRAY) &&
- (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) &&
+ (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)) {
+ } 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;
*/
PHP_METHOD(HttpRequest, getResponseCookies)
{
- IF_RETVAL_USED {
+ if (return_value_used) {
long flags = 0;
zval *allowed_extras_array = NULL, *data, **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)) &&
+ (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void *) &headers)) &&
(Z_TYPE_PP(headers) == IS_ARRAY)) {
int i = 0;
ulong idx = 0;
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval **body;
zval *data = GET_PROP(responseData);
if ( (Z_TYPE_P(data) == IS_ARRAY) &&
- (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "body", sizeof("body"), (void **) &body))) {
+ (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "body", sizeof("body"), (void *) &body))) {
RETURN_ZVAL(*body, 1, 0);
} else {
RETURN_FALSE;
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(responseCode);
}
}
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
RETURN_PROP(responseStatus);
}
}
*/
PHP_METHOD(HttpRequest, getResponseInfo)
{
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *info, **infop;
char *info_name = NULL;
int info_len = 0;
}
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)) {
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(info), pretty_key(info_name, info_len, 0, 0), info_len + 1, (void *) &infop)) {
RETURN_ZVAL(*infop, 1, 0);
} else {
http_error_ex(HE_NOTICE, HTTP_E_INVALID_PARAM, "Could not find response info named %s", info_name);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
http_message *msg;
getObject(http_request_object, obj);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
getObject(http_request_object, obj);
RETURN_PHPSTR_DUP(&obj->request->conv.request);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
getObject(http_request_object, obj);
RETURN_PHPSTR_DUP(&obj->request->conv.response);
{
NO_ARGS;
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *hist;
SET_EH_THROW_HTTP();