#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>
+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)
HTTP_END_ARGS;
HTTP_EMPTY_ARGS(getOptions, 0);
-HTTP_EMPTY_ARGS(unsetOptions, 0);
-HTTP_BEGIN_ARGS(setOptions, 0, 1)
+HTTP_BEGIN_ARGS(setOptions, 0, 0)
HTTP_ARG_VAL(options, 0)
HTTP_END_ARGS;
HTTP_EMPTY_ARGS(getSslOptions, 0);
-HTTP_EMPTY_ARGS(unsetSslOptions, 0);
-HTTP_BEGIN_ARGS(setSslOptions, 0, 1)
+HTTP_BEGIN_ARGS(setSslOptions, 0, 0)
HTTP_ARG_VAL(ssl_options, 0)
HTTP_END_ARGS;
HTTP_EMPTY_ARGS(getHeaders, 0);
-HTTP_EMPTY_ARGS(unsetHeaders, 0);
+HTTP_BEGIN_ARGS(setHeaders, 0, 0)
+ HTTP_ARG_VAL(headers, 0)
+HTTP_END_ARGS;
+
HTTP_BEGIN_ARGS(addHeaders, 0, 1)
HTTP_ARG_VAL(headers, 0)
HTTP_END_ARGS;
HTTP_EMPTY_ARGS(getCookies, 0);
-HTTP_EMPTY_ARGS(unsetCookies, 0);
+HTTP_BEGIN_ARGS(setCookies, 0, 0)
+ HTTP_ARG_VAL(cookies, 0)
+HTTP_END_ARGS;
+
HTTP_BEGIN_ARGS(addCookies, 0, 1)
HTTP_ARG_VAL(cookies, 0)
HTTP_END_ARGS;
HTTP_END_ARGS;
HTTP_EMPTY_ARGS(getQueryData, 0);
-HTTP_EMPTY_ARGS(unsetQueryData, 0);
-HTTP_BEGIN_ARGS(setQueryData, 0, 1)
+HTTP_BEGIN_ARGS(setQueryData, 0, 0)
HTTP_ARG_VAL(query_data, 0)
HTTP_END_ARGS;
HTTP_END_ARGS;
HTTP_EMPTY_ARGS(getPostFields, 0);
-HTTP_EMPTY_ARGS(unsetPostFields, 0);
-HTTP_BEGIN_ARGS(setPostFields, 0, 1)
+HTTP_BEGIN_ARGS(setPostFields, 0, 0)
HTTP_ARG_VAL(post_fields, 0)
HTTP_END_ARGS;
HTTP_END_ARGS;
HTTP_EMPTY_ARGS(getPostFiles, 0);
-HTTP_EMPTY_ARGS(unsetPostFiles, 0);
-HTTP_BEGIN_ARGS(setPostFiles, 0, 1)
+HTTP_BEGIN_ARGS(setPostFiles, 0, 0)
HTTP_ARG_VAL(post_files, 0)
HTTP_END_ARGS;
HTTP_ARG_VAL(content_type, 0)
HTTP_END_ARGS;
+HTTP_EMPTY_ARGS(getRawPostData, 0);
+HTTP_BEGIN_ARGS(setRawPostData, 0, 0)
+ HTTP_ARG_VAL(raw_post_data, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(addRawPostData, 0, 1)
+ HTTP_ARG_VAL(raw_post_data, 0)
+HTTP_END_ARGS;
+
HTTP_EMPTY_ARGS(getPutFile, 0);
-HTTP_EMPTY_ARGS(unsetPutFile, 0);
-HTTP_BEGIN_ARGS(setPutFile, 0, 1)
+HTTP_BEGIN_ARGS(setPutFile, 0, 0)
HTTP_ARG_VAL(filename, 0)
HTTP_END_ARGS;
HTTP_EMPTY_ARGS(getResponseMessage, 1);
HTTP_EMPTY_ARGS(getRequestMessage, 1);
HTTP_EMPTY_ARGS(getHistory, 1);
-HTTP_EMPTY_ARGS(send, 0);
+HTTP_EMPTY_ARGS(send, 1);
HTTP_BEGIN_ARGS(get, 0, 1)
HTTP_ARG_VAL(url, 0)
HTTP_REQUEST_ME(setOptions, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getOptions, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetOptions, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(setSslOptions, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getSslOptions, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetSslOptions, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(addHeaders, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getHeaders, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetHeaders, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(setHeaders, ZEND_ACC_PUBLIC)
+
HTTP_REQUEST_ME(addCookies, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getCookies, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetCookies, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(setCookies, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(setMethod, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getMethod, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(setQueryData, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getQueryData, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(addQueryData, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetQueryData, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(setPostFields, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getPostFields, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(addPostFields, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetPostFields, ZEND_ACC_PUBLIC)
+
+ HTTP_REQUEST_ME(setRawPostData, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(getRawPostData, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(addRawPostData, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(setPostFiles, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(addPostFile, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getPostFiles, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetPostFiles, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(setPutFile, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getPutFile, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetPutFile, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(send, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ALIAS(methodName, http_request_method_name)
HTTP_REQUEST_ALIAS(methodExists, http_request_method_exists)
- {NULL, NULL, NULL}
+ EMPTY_FUNCTION_ENTRY
};
static zend_object_handlers http_request_object_handlers;
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, "");
STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr, http_request_body *body TSRMLS_DC)
{
- zval *meth, *URL, *qdata, *opts;
+ zval *meth, *URL;
char *request_uri;
- STATUS status;
+ STATUS status = SUCCESS;
if (!body) {
return FAILURE;
}
if ((!obj->ch) && (!(obj->ch = curl_easy_init()))) {
- http_error(E_WARNING, HTTP_E_CURL, "Could not initilaize curl");
+ http_error(HE_WARNING, HTTP_E_REQUEST, "Could not initilaize curl");
return FAILURE;
}
- meth = GET_PROP(obj, method);
- URL = GET_PROP(obj, url);
- qdata = GET_PROP(obj, queryData);
- opts = GET_PROP(obj, options);
-
+ URL = 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))) {
return FAILURE;
}
-
- if (Z_STRLEN_P(qdata) && (strlen(request_uri) < HTTP_URI_MAXLEN)) {
- if (!strchr(request_uri, '?')) {
- strcat(request_uri, "?");
- } else {
- strcat(request_uri, "&");
- }
- strncat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN - strlen(request_uri));
- }
-
+
+ meth = GET_PROP(obj, method);
switch (Z_LVAL_P(meth))
{
case HTTP_GET:
case HTTP_HEAD:
body->type = -1;
- status = http_request_init(obj->ch, Z_LVAL_P(meth), request_uri, NULL, Z_ARRVAL_P(opts));
+ body = NULL;
break;
case HTTP_PUT:
{
- php_stream *stream;
php_stream_statbuf ssb;
- zval *file = GET_PROP(obj, putFile);
-
- if ( (stream = php_stream_open_wrapper(Z_STRVAL_P(file), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL)) &&
- !php_stream_stat(stream, &ssb)) {
+ 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;
-
- status = http_request_init(obj->ch, HTTP_PUT, request_uri, body, Z_ARRVAL_P(opts));
} else {
status = FAILURE;
}
break;
case HTTP_POST:
+ default:
{
- zval *fields = GET_PROP(obj, postFields), *files = GET_PROP(obj, postFiles);
-
- if (SUCCESS == (status = http_request_body_fill(body, Z_ARRVAL_P(fields), Z_ARRVAL_P(files)))) {
- status = http_request_init(obj->ch, HTTP_POST, request_uri, body, Z_ARRVAL_P(opts));
+ /* check for raw post data */
+ zval *raw_data = GET_PROP(obj, rawPostData);
+
+ if (Z_STRLEN_P(raw_data)) {
+ zval *ctype = GET_PROP(obj, contentType);
+
+ if (Z_STRLEN_P(ctype)) {
+ zval **headers, *opts = GET_PROP(obj, options);
+
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) {
+ 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)) {
+ add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+ }
+ } else {
+ zval *headers;
+
+ 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);
+ }
+ }
+
+ 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)));
}
}
break;
-
- default:
- {
- zval *post = GET_PROP(obj, postData);
-
- body->type = HTTP_REQUEST_BODY_CSTRING;
- body->data = Z_STRVAL_P(post);
- body->size = Z_STRLEN_P(post);
-
- status = http_request_init(obj->ch, Z_LVAL_P(meth), request_uri, body, Z_ARRVAL_P(opts));
+ }
+
+ if (status == SUCCESS) {
+ zval *qdata = GET_PROP(obj, queryData);
+
+ if (Z_STRLEN_P(qdata) && (strlen(request_uri) < HTTP_URI_MAXLEN)) {
+ if (!strchr(request_uri, '?')) {
+ strcat(request_uri, "?");
+ } else {
+ strcat(request_uri, "&");
+ }
+ strncat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN - strlen(request_uri));
}
- break;
+
+ status = http_request_init(obj->ch, Z_LVAL_P(meth), request_uri, body, Z_ARRVAL_P(GET_PROP(obj, options)));
}
+ efree(request_uri);
/* clean previous response */
phpstr_dtor(&obj->response);
/* clean previous request */
phpstr_dtor(&obj->request);
- efree(request_uri);
return status;
}
phpstr_fix(&obj->request);
phpstr_fix(&obj->response);
-
- if (msg = http_message_parse(PHPSTR_VAL(&obj->response), PHPSTR_LEN(&obj->response))) {
+
+ msg = http_message_parse(PHPSTR_VAL(&obj->response), PHPSTR_LEN(&obj->response));
+
+ if (!msg) {
+ return FAILURE;
+ } else {
char *body;
size_t body_len;
zval *headers, *message,
/* should we record history? */
if (Z_TYPE_P(hist) != IS_BOOL) {
- convert_to_boolean_ex(&hist);
+ convert_to_boolean(hist);
}
if (Z_LVAL_P(hist)) {
/* we need to act like a zipper, as we'll receive
} while ((response = response->parent) && (request = request->parent));
- http_message_free(free_msg);
+ http_message_free(&free_msg);
phpstr_fix(&obj->history);
}
- UPD_PROP(obj, long, responseCode, msg->info.response.code);
+ UPD_PROP(obj, long, responseCode, msg->http.info.response.code);
MAKE_STD_ZVAL(headers)
array_init(headers);
add_assoc_stringl(resp, "body", body, body_len, 0);
MAKE_STD_ZVAL(message);
- message->type = IS_OBJECT;
- message->is_ref = 1;
- message->value.obj = http_message_object_from_msg(msg);
+ ZVAL_OBJVAL(message, http_message_object_from_msg(msg));
SET_PROP(obj, responseMessage, message);
zval_ptr_dtor(&message);
return SUCCESS;
}
- return FAILURE;
}
+#define http_request_object_set_options_subr(key, ow) \
+ _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);
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &new_options)) {
+ RETURN_FALSE;
+ }
+
+ opts = GET_PROP(obj, options);
+
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void **) &options)) {
+ if (overwrite) {
+ zend_hash_clean(Z_ARRVAL_PP(options));
+ }
+ if (new_options && zend_hash_num_elements(Z_ARRVAL_P(new_options))) {
+ if (overwrite) {
+ array_copy(new_options, *options);
+ } else {
+ array_merge(new_options, *options);
+ }
+ }
+ } else if (new_options && zend_hash_num_elements(Z_ARRVAL_P(new_options))) {
+ zval_add_ref(&new_options);
+ add_assoc_zval(opts, key, new_options);
+ }
+
+ RETURN_TRUE;
+}
+
+#define http_request_object_get_options_subr(key) \
+ _http_request_get_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, (key), sizeof(key))
+static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS, char *key, size_t len)
+{
+ NO_ARGS;
+
+ IF_RETVAL_USED {
+ zval *opts, **options;
+ getObject(http_request_object, obj);
+
+ opts = GET_PROP(obj, options);
+
+ array_init(return_value);
+
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void **) &options)) {
+ array_copy(*options, return_value);
+ }
+ }
+}
+
+
/* ### USERLAND ### */
/* {{{ proto void HttpRequest::__construct([string url[, long request_method = HTTP_GET]])
INIT_PARR(obj, postFiles);
if (URL) {
- UPD_PROP(obj, string, url, URL);
+ UPD_STRL(obj, url, URL, URL_len);
}
if (meth > -1) {
UPD_PROP(obj, long, method, meth);
}
/* }}} */
-/* {{{ proto bool HttpRequest::setOptions(array options)
+/* {{{ proto bool HttpRequest::setOptions([array options])
*
* Set the request options to use. See http_get() for a full list of available options.
*/
{
char *key = NULL;
ulong idx = 0;
- zval *opts, *old_opts, **opt;
+ 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 = GET_PROP(obj, options);
+ if (!opts || !zend_hash_num_elements(Z_ARRVAL_P(opts))) {
+ zend_hash_clean(Z_ARRVAL_P(old_opts));
+ RETURN_TRUE;
+ }
+
/* some options need extra attention -- thus cannot use array_merge() directly */
FOREACH_KEYVAL(opts, key, idx, opt) {
if (key) {
if (Z_TYPE_PP(opt) != IS_STRING) {
convert_to_string_ex(opt);
}
- UPD_PROP(obj, string, url, Z_STRVAL_PP(opt));
+ UPD_STRL(obj, url, Z_STRVAL_PP(opt), Z_STRLEN_PP(opt));
continue;
} else if (!strcmp(key, "method")) {
if (Z_TYPE_PP(opt) != IS_LONG) {
/* {{{ proto array HttpRequest::getOptions()
*
- * Get current set options.
+ * Get currently set options.
*/
PHP_METHOD(HttpRequest, getOptions)
{
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetOptions()
+/* {{{ proto bool HttpRequest::setSslOptions([array options])
*
- * Unset all options/headers/cookies.
+ * Set SSL options.
*/
-PHP_METHOD(HttpRequest, unsetOptions)
+PHP_METHOD(HttpRequest, setSslOptions)
{
- getObject(http_request_object, obj);
-
- NO_ARGS;
-
- FREE_PARR(obj, options);
- INIT_PARR(obj, options);
+ http_request_object_set_options_subr("ssl", 1);
}
/* }}} */
-/* {{{ proto bool HttpRequest::setSslOptions(array options)
+/* {{{ proto bool HttpRequest::addSslOptions(array options)
*
* Set additional SSL options.
*/
-PHP_METHOD(HttpRequest, setSslOptions)
+PHP_METHOD(HttpRequest, addSslOptions)
{
- zval *opts, *old_opts, **ssl_options;
- getObject(http_request_object, obj);
-
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &opts)) {
- RETURN_FALSE;
- }
-
- old_opts = GET_PROP(obj, options);
-
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "ssl", sizeof("ssl"), (void **) &ssl_options)) {
- array_merge(opts, *ssl_options);
- } else {
- zval_add_ref(&opts);
- add_assoc_zval(old_opts, "ssl", opts);
- }
-
- RETURN_TRUE;
+ http_request_object_set_options_subr("ssl", 0);
}
/* }}} */
*/
PHP_METHOD(HttpRequest, getSslOptions)
{
- NO_ARGS;
-
- IF_RETVAL_USED {
- zval *opts, **ssl_options;
- getObject(http_request_object, obj);
-
- opts = GET_PROP(obj, options);
-
- array_init(return_value);
-
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "ssl", sizeof("ssl"), (void **) &ssl_options)) {
- array_copy(*ssl_options, return_value);
- }
- }
+ http_request_object_get_options_subr("ssl");
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetSslOptions()
+/* {{{ proto bool HttpRequest::addHeaders(array headers)
*
- * Unset previously set SSL options.
+ * Add request header name/value pairs.
*/
-PHP_METHOD(HttpRequest, unsetSslOptions)
+PHP_METHOD(HttpRequest, addHeaders)
{
- zval *opts;
- getObject(http_request_object, obj);
-
- NO_ARGS;
-
- opts = GET_PROP(obj, options);
- zend_hash_del(Z_ARRVAL_P(opts), "ssl", sizeof("ssl"));
+ http_request_object_set_options_subr("headers", 0);
}
-/* }}} */
-/* {{{ proto bool HttpRequest::addHeaders(array headers)
+/* {{{ proto bool HttpRequest::setHeaders([array headers])
*
- * Add request header name/value pairs.
+ * Set request header name/value pairs.
*/
-PHP_METHOD(HttpRequest, addHeaders)
+PHP_METHOD(HttpRequest, setHeaders)
{
- zval *opts, **headers, *new_headers;
- getObject(http_request_object, obj);
-
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &new_headers)) {
- RETURN_FALSE;
- }
-
- opts = GET_PROP(obj, options);
-
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) {
- array_merge(new_headers, *headers);
- } else {
- zval_add_ref(&new_headers);
- add_assoc_zval(opts, "headers", new_headers);
- }
-
- RETURN_TRUE;
+ http_request_object_set_options_subr("headers", 1);
}
/* }}} */
*/
PHP_METHOD(HttpRequest, getHeaders)
{
- NO_ARGS;
-
- IF_RETVAL_USED {
- zval *opts, **headers;
- getObject(http_request_object, obj);
-
- opts = GET_PROP(obj, options);
-
- array_init(return_value);
-
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) {
- array_copy(*headers, return_value);
- }
- }
+ http_request_object_get_options_subr("headers");
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetHeaders()
+/* {{{ proto bool HttpRequest::setCookies([array cookies])
*
- * Unset previously set request headers.
+ * Set cookies.
*/
-PHP_METHOD(HttpRequest, unsetHeaders)
+PHP_METHOD(HttpRequest, setCookies)
{
- zval *opts;
- getObject(http_request_object, obj);
-
- NO_ARGS;
-
- opts = GET_PROP(obj, options);
- zend_hash_del(Z_ARRVAL_P(opts), "headers", sizeof("headers"));
+ http_request_object_set_options_subr("cookies", 1);
}
/* }}} */
*/
PHP_METHOD(HttpRequest, addCookies)
{
- zval *opts, **cookies, *new_cookies;
- getObject(http_request_object, obj);
-
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &new_cookies)) {
- RETURN_FALSE;
- }
-
- opts = GET_PROP(obj, options);
-
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
- array_merge(new_cookies, *cookies);
- } else {
- zval_add_ref(&new_cookies);
- add_assoc_zval(opts, "cookies", new_cookies);
- }
-
- RETURN_TRUE;
+ http_request_object_set_options_subr("cookies", 0);
}
/* }}} */
*/
PHP_METHOD(HttpRequest, getCookies)
{
- NO_ARGS;
-
- IF_RETVAL_USED {
- zval *opts, **cookies;
- getObject(http_request_object, obj);
-
- opts = GET_PROP(obj, options);
-
- array_init(return_value);
-
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
- array_copy(*cookies, return_value);
- }
- }
-}
-/* }}} */
-
-/* {{{ proto void HttpRequest::unsetCookies()
- *
- */
-PHP_METHOD(HttpRequest, unsetCookies)
-{
- zval *opts;
- getObject(http_request_object, obj);
-
- NO_ARGS;
-
- opts = GET_PROP(obj, options);
- zend_hash_del(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"));
+ http_request_object_get_options_subr("cookies");
}
/* }}} */
RETURN_FALSE;
}
- UPD_PROP(obj, string, url, URL);
+ UPD_STRL(obj, url, URL, URL_len);
RETURN_TRUE;
}
/* }}} */
}
if (!strchr(ctype, '/')) {
- http_error_ex(E_WARNING, HTTP_E_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", ctype);
+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", ctype);
RETURN_FALSE;
}
- UPD_PROP(obj, string, contentType, ctype);
+ UPD_STRL(obj, contentType, ctype, ct_len);
RETURN_TRUE;
}
/* }}} */
}
/* }}} */
-/* {{{ proto bool HttpRequest::setQueryData(mixed query_data)
+/* {{{ proto bool HttpRequest::setQueryData([mixed query_data])
*
* Set the URL query parameters to use.
* Overwrites previously set query parameters.
*/
PHP_METHOD(HttpRequest, setQueryData)
{
- zval *qdata;
- char *query_data = NULL;
+ zval *qdata = NULL;
getObject(http_request_object, obj);
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &qdata)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!", &qdata)) {
RETURN_FALSE;
}
- if ((Z_TYPE_P(qdata) == IS_ARRAY) || (Z_TYPE_P(qdata) == IS_OBJECT)) {
+ if ((!qdata) || Z_TYPE_P(qdata) == IS_NULL) {
+ UPD_STRL(obj, queryData, "", 0);
+ } else if ((Z_TYPE_P(qdata) == IS_ARRAY) || (Z_TYPE_P(qdata) == IS_OBJECT)) {
+ char *query_data = NULL;
+
if (SUCCESS != http_urlencode_hash(HASH_OF(qdata), &query_data)) {
RETURN_FALSE;
}
+
UPD_PROP(obj, string, queryData, query_data);
efree(query_data);
- RETURN_TRUE;
+ } else {
+ convert_to_string(qdata);
+ UPD_STRL(obj, queryData, Z_STRVAL_P(qdata), Z_STRLEN_P(qdata));
}
-
- convert_to_string(qdata);
- UPD_PROP(obj, string, queryData, Z_STRVAL_P(qdata));
RETURN_TRUE;
}
/* }}} */
{
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)) {
old_qdata = GET_PROP(obj, queryData);
- if (SUCCESS != http_urlencode_hash_ex(HASH_OF(qdata), 1, Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata), &query_data, NULL)) {
+ 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)) {
RETURN_FALSE;
}
- UPD_PROP(obj, string, queryData, query_data);
+ UPD_STRL(obj, queryData, query_data, query_data_len);
efree(query_data);
RETURN_TRUE;
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetQueryData()
- *
- * Clean the query parameters.
- * Affects any request type.
- */
-PHP_METHOD(HttpRequest, unsetQueryData)
-{
- getObject(http_request_object, obj);
-
- NO_ARGS;
-
- UPD_PROP(obj, string, queryData, "");
-}
-/* }}} */
-
/* {{{ proto bool HttpRequest::addPostFields(array post_data)
*
* Adds POST data entries.
}
/* }}} */
-/* {{{ proto bool HttpRequest::setPostFields(array post_data)
+/* {{{ proto bool HttpRequest::setPostFields([array post_data])
*
* Set the POST data entries.
* Overwrites previously set POST data.
*/
PHP_METHOD(HttpRequest, setPostFields)
{
- zval *post, *post_data;
+ 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 = GET_PROP(obj, postFields);
zend_hash_clean(Z_ARRVAL_P(post));
- array_copy(post_data, post);
+
+ if (post_data && zend_hash_num_elements(Z_ARRVAL_P(post_data))) {
+ array_copy(post_data, post);
+ }
RETURN_TRUE;
}
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetPostFields()
+/* {{{ proto bool HttpRequest::setRawPostData([string raw_post_data])
*
- * Clean POST data entires.
+ * Set raw post data to send. Don't forget to specify a content type.
* Affects only POST requests.
*/
-PHP_METHOD(HttpRequest, unsetPostFields)
+PHP_METHOD(HttpRequest, setRawPostData)
{
- zval *post_data;
+ 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;
+ }
+
+ if (!raw_data) {
+ raw_data = "";
+ }
+
+ UPD_STRL(obj, rawPostData, raw_data, data_len);
+ RETURN_TRUE;
+}
+/* }}} */
- NO_ARGS;
+/* {{{ proto bool HttpRequest::addRawPostData(string raw_post_data)
+ *
+ * Add raw post data.
+ * Affects only POST requests.
+ */
+PHP_METHOD(HttpRequest, addRawPostData)
+{
+ char *raw_data, *new_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 = GET_PROP(obj, rawPostData);
+
+ 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));
+ }
+
+ memcpy(new_data + Z_STRLEN_P(zdata), raw_data, data_len);
+ UPD_STRL(obj, rawPostData, new_data, Z_STRLEN_P(zdata) + data_len);
+ }
+
+ RETURN_TRUE;
+}
+/* }}} */
- post_data = GET_PROP(obj, postFields);
- zend_hash_clean(Z_ARRVAL_P(post_data));
+/* {{{ proto string HttpRequest::getRawPostData()
+ *
+ * Get previously set raw post data.
+ */
+PHP_METHOD(HttpRequest, getRawPostData)
+{
+ NO_ARGS;
+
+ IF_RETVAL_USED {
+ getObject(http_request_object, obj);
+ zval *raw_data = GET_PROP(obj, rawPostData);
+
+ RETURN_STRINGL(Z_STRVAL_P(raw_data), Z_STRLEN_P(raw_data), 1);
+ }
}
/* }}} */
if (type_len) {
if (!strchr(type, '/')) {
- http_error_ex(E_WARNING, HTTP_E_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", type);
+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", type);
RETURN_FALSE;
}
} else {
}
/* }}} */
-/* {{{ proto bool HttpRequest::setPostFiles(array post_files)
+/* {{{ proto bool HttpRequest::setPostFiles([array post_files])
*
* Set files to post.
* Overwrites previously set post files.
pFiles = GET_PROP(obj, postFiles);
zend_hash_clean(Z_ARRVAL_P(pFiles));
- array_copy(files, pFiles);
+
+ if (files && zend_hash_num_elements(Z_ARRVAL_P(files))) {
+ array_copy(files, pFiles);
+ }
RETURN_TRUE;
}
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetPostFiles()
- *
- * Unset the POST files list.
- * Affects only POST requests.
- */
-PHP_METHOD(HttpRequest, unsetPostFiles)
-{
- zval *files;
- getObject(http_request_object, obj);
-
- NO_ARGS;
-
- files = GET_PROP(obj, postFiles);
- zend_hash_clean(Z_ARRVAL_P(files));
-}
-/* }}} */
-
-/* {{{ proto bool HttpRequest::SetPutFile(string file)
+/* {{{ proto bool HttpRequest::setPutFile([string file])
*
* Set file to put.
* Affects only PUT requests.
*/
PHP_METHOD(HttpRequest, setPutFile)
{
- char *file;
- int file_len;
+ 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)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &file, &file_len)) {
RETURN_FALSE;
}
- UPD_PROP(obj, string, putFile, file);
+ UPD_STRL(obj, putFile, file, file_len);
RETURN_TRUE;
}
/* }}} */
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetPutFile()
- *
- * Unset file to put.
- * Affects only PUT requests.
- */
-PHP_METHOD(HttpRequest, unsetPutFile)
-{
- getObject(http_request_object, obj);
-
- NO_ARGS;
-
- UPD_PROP(obj, string, putFile, "");
-}
-/* }}} */
-
/* {{{ proto array HttpRequest::getResponseData()
*
* Get all response data after the request has been sent.
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)) {
- RETURN_ZVAL(*infop, 1, ZVAL_PTR_DTOR);
+ RETURN_ZVAL(*infop, 1, 0);
} else {
- http_error_ex(E_NOTICE, HTTP_E_PARAM, "Could not find response info named %s", info_name);
+ http_error_ex(HE_NOTICE, HTTP_E_INVALID_PARAM, "Could not find response info named %s", info_name);
RETURN_FALSE;
}
} else {
NO_ARGS;
IF_RETVAL_USED {
- zval *message;
http_message *msg;
getObject(http_request_object, obj);
NO_ARGS;
IF_RETVAL_USED {
- zval *history;
http_message *msg;
getObject(http_request_object, obj);
}
}
-/* {{{ proto bool HttpRequest::send()
+/* {{{ proto HttpMessage HttpRequest::send()
*
* Send the HTTP request.
*
* <?php
* $r = new HttpRequest('http://example.com/form.php', HTTP_POST);
* $r->setOptions(array('cookies' => array('lang' => 'de')));
- * $r->addpostFields(array('user' => 'mike', 'pass' => 's3c|r3t'));
+ * $r->addPostFields(array('user' => 'mike', 'pass' => 's3c|r3t'));
* $r->addPostFile('image', 'profile.jpg', 'image/jpeg');
- * if ($r->send()) {
- * echo $r->getResponseBody();
+ * try {
+ * echo $r->send()->getBody();
+ * } catch (HttpException $ex) {
+ * echo $ex;
* }
* ?>
* </pre>
*/
PHP_METHOD(HttpRequest, send)
{
- STATUS status = FAILURE;
http_request_body body = {0, NULL, 0};
getObject(http_request_object, obj);
SET_EH_THROW_HTTP();
if (obj->pool) {
- http_error(E_WARNING, HTTP_E_CURL, "Cannot perform HttpRequest::send() while attached to an HttpRequestPool");
+ http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot perform HttpRequest::send() while attached to an HttpRequestPool");
SET_EH_NORMAL();
RETURN_FALSE;
}
- if (SUCCESS == (status = http_request_object_requesthandler(obj, getThis(), &body))) {
- status = http_request_exec(obj->ch, NULL, &obj->response, &obj->request);
+ 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));
}
http_request_body_dtor(&body);
- /* final data handling */
- if (SUCCESS == status) {
- status = http_request_object_responsehandler(obj, getThis());
- }
-
SET_EH_NORMAL();
- RETURN_SUCCESS(status);
}
/* }}} */
projects / m6w6 / ext-http / blobdiff