- API juggling
[m6w6/ext-http] / http_request_object.c
index c9bbbde551d76f1e71977d78c7085a014f0941d0..4d862279e0807a13b05cb45cea093fc2bad16902 100644 (file)
 /*
-
    +----------------------------------------------------------------------+
-
    | 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>               |
-
    +----------------------------------------------------------------------+
-
 */
 
-
-
 /* $Id$ */
 
 
-
-
-
 #ifdef HAVE_CONFIG_H
-
 #      include "config.h"
-
-#endif
-
-
-
-#ifdef HTTP_HAVE_CURL
-
-#      ifdef PHP_WIN32
-
-#              include <winsock2.h>
-
-#      endif
-
-#      include <curl/curl.h>
-
 #endif
-
-
-
 #include "php.h"
 
-
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
 
 #include "php_http_std_defs.h"
-
 #include "php_http_request_object.h"
-
 #include "php_http_request_api.h"
-
-
-
-#ifdef ZEND_ENGINE_2
-
-#ifdef HTTP_HAVE_CURL
-
-
+#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_message_api.h"
+#include "php_http_message_object.h"
+#include "php_http_exception_object.h"
+
+#ifdef PHP_WIN32
+#      include <winsock2.h>
+#endif
+#include <curl/curl.h>
+
+#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)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getOptions, 0);
+HTTP_EMPTY_ARGS(unsetOptions, 0);
+HTTP_BEGIN_ARGS(setOptions, 0, 1)
+       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_ARG_VAL(ssl_options, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getHeaders, 0);
+HTTP_EMPTY_ARGS(unsetHeaders, 0);
+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(addCookies, 0, 1)
+       HTTP_ARG_VAL(cookies, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getUrl, 0);
+HTTP_BEGIN_ARGS(setUrl, 0, 1)
+       HTTP_ARG_VAL(url, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getMethod, 0);
+HTTP_BEGIN_ARGS(setMethod, 0, 1)
+       HTTP_ARG_VAL(request_method, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getContentType, 0);
+HTTP_BEGIN_ARGS(setContentType, 0, 1)
+       HTTP_ARG_VAL(content_type, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getQueryData, 0);
+HTTP_EMPTY_ARGS(unsetQueryData, 0);
+HTTP_BEGIN_ARGS(setQueryData, 0, 1)
+       HTTP_ARG_VAL(query_data, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(addQueryData, 0, 1)
+       HTTP_ARG_VAL(query_data, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getPostFields, 0);
+HTTP_EMPTY_ARGS(unsetPostFields, 0);
+HTTP_BEGIN_ARGS(setPostFields, 0, 1)
+       HTTP_ARG_VAL(post_fields, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(addPostFields, 0, 1)
+       HTTP_ARG_VAL(post_fields, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getPostFiles, 0);
+HTTP_EMPTY_ARGS(unsetPostFiles, 0);
+HTTP_BEGIN_ARGS(setPostFiles, 0, 1)
+       HTTP_ARG_VAL(post_files, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(addPostFile, 0, 2)
+       HTTP_ARG_VAL(formname, 0)
+       HTTP_ARG_VAL(filename, 0)
+       HTTP_ARG_VAL(content_type, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getPutFile, 0);
+HTTP_EMPTY_ARGS(unsetPutFile, 0);
+HTTP_BEGIN_ARGS(setPutFile, 0, 1)
+       HTTP_ARG_VAL(filename, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getResponseData, 0);
+HTTP_BEGIN_ARGS(getResponseHeader, 0, 0)
+       HTTP_ARG_VAL(name, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(getResponseCookie, 0, 0)
+       HTTP_ARG_VAL(name, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getResponseBody, 0);
+HTTP_EMPTY_ARGS(getResponseCode, 0);
+HTTP_BEGIN_ARGS(getResponseInfo, 0, 0)
+       HTTP_ARG_VAL(name, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getResponseMessage, 1);
+HTTP_EMPTY_ARGS(send, 0);
+
+HTTP_BEGIN_ARGS(get, 1, 0)
+       HTTP_ARG_VAL(url, 0)
+       HTTP_ARG_VAL(options, 0)
+       HTTP_ARG_VAL(info, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(head, 1, 0)
+       HTTP_ARG_VAL(url, 0)
+       HTTP_ARG_VAL(options, 0)
+       HTTP_ARG_VAL(info, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(postData, 2, 0)
+       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(postFields, 2, 0)
+       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, 0)
+       HTTP_ARG_VAL(url, 0)
+       HTTP_ARG_VAL(file, 0)
+       HTTP_ARG_VAL(options, 0)
+       HTTP_ARG_VAL(info, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(putStream, 2, 0)
+       HTTP_ARG_VAL(url, 0)
+       HTTP_ARG_VAL(stream, 0)
+       HTTP_ARG_VAL(options, 0)
+       HTTP_ARG_VAL(info, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(methodRegister, 1, 0)
+       HTTP_ARG_VAL(method_name, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(methodUnregister, 1, 0)
+       HTTP_ARG_VAL(method, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(methodName, 1, 0)
+       HTTP_ARG_VAL(method_id, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(methodExists, 1, 0)
+       HTTP_ARG_VAL(method, 0)
+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);
 
-
-
 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(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(addCookies, ZEND_ACC_PUBLIC)
+       HTTP_REQUEST_ME(getCookies, ZEND_ACC_PUBLIC)
+       HTTP_REQUEST_ME(unsetCookies, ZEND_ACC_PUBLIC)
+
+       HTTP_REQUEST_ME(setMethod, ZEND_ACC_PUBLIC)
+       HTTP_REQUEST_ME(getMethod, ZEND_ACC_PUBLIC)
+
+       HTTP_REQUEST_ME(setUrl, ZEND_ACC_PUBLIC)
+       HTTP_REQUEST_ME(getUrl, ZEND_ACC_PUBLIC)
+
+       HTTP_REQUEST_ME(setContentType, ZEND_ACC_PUBLIC)
+       HTTP_REQUEST_ME(getContentType, 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(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_ME(getResponseData, ZEND_ACC_PUBLIC)
+       HTTP_REQUEST_ME(getResponseHeader, ZEND_ACC_PUBLIC)
+       HTTP_REQUEST_ME(getResponseCookie, ZEND_ACC_PUBLIC)
+       HTTP_REQUEST_ME(getResponseCode, ZEND_ACC_PUBLIC)
+       HTTP_REQUEST_ME(getResponseBody, ZEND_ACC_PUBLIC)
+       HTTP_REQUEST_ME(getResponseInfo, ZEND_ACC_PUBLIC)
+       HTTP_REQUEST_ME(getResponseMessage, ZEND_ACC_PUBLIC)
+
+       HTTP_REQUEST_ALIAS(get, http_get)
+       HTTP_REQUEST_ALIAS(head, http_head)
+       HTTP_REQUEST_ALIAS(postData, http_post_data)
+       HTTP_REQUEST_ALIAS(postFields, http_post_fields)
+       HTTP_REQUEST_ALIAS(putFile, http_put_file)
+       HTTP_REQUEST_ALIAS(putStream, http_put_stream)
+
+       HTTP_REQUEST_ALIAS(methodRegister, http_request_method_register)
+       HTTP_REQUEST_ALIAS(methodUnregister, http_request_method_unregister)
+       HTTP_REQUEST_ALIAS(methodName, http_request_method_name)
+       HTTP_REQUEST_ALIAS(methodExists, http_request_method_exists)
 
-       PHP_ME(HttpRequest, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-
-       PHP_ME(HttpRequest, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
-
-
-
-       PHP_ME(HttpRequest, setOptions, NULL, ZEND_ACC_PUBLIC)
+       {NULL, NULL, NULL}
+};
+static zend_object_handlers http_request_object_handlers;
 
-       PHP_ME(HttpRequest, getOptions, NULL, ZEND_ACC_PUBLIC)
+void _http_request_object_init(INIT_FUNC_ARGS)
+{
+       HTTP_REGISTER_CLASS_EX(HttpRequest, http_request_object, NULL, 0);
 
-       PHP_ME(HttpRequest, unsetOptions, NULL, ZEND_ACC_PUBLIC)
+       /* HTTP/1.1 */
+       HTTP_LONG_CONSTANT("HTTP_GET", HTTP_GET);
+       HTTP_LONG_CONSTANT("HTTP_HEAD", HTTP_HEAD);
+       HTTP_LONG_CONSTANT("HTTP_POST", HTTP_POST);
+       HTTP_LONG_CONSTANT("HTTP_PUT", HTTP_PUT);
+       HTTP_LONG_CONSTANT("HTTP_DELETE", HTTP_DELETE);
+       HTTP_LONG_CONSTANT("HTTP_OPTIONS", HTTP_OPTIONS);
+       HTTP_LONG_CONSTANT("HTTP_TRACE", HTTP_TRACE);
+       HTTP_LONG_CONSTANT("HTTP_CONNECT", HTTP_CONNECT);
+       /* WebDAV - RFC 2518 */
+       HTTP_LONG_CONSTANT("HTTP_PROPFIND", HTTP_PROPFIND);
+       HTTP_LONG_CONSTANT("HTTP_PROPPATCH", HTTP_PROPPATCH);
+       HTTP_LONG_CONSTANT("HTTP_MKCOL", HTTP_MKCOL);
+       HTTP_LONG_CONSTANT("HTTP_COPY", HTTP_COPY);
+       HTTP_LONG_CONSTANT("HTTP_MOVE", HTTP_MOVE);
+       HTTP_LONG_CONSTANT("HTTP_LOCK", HTTP_LOCK);
+       HTTP_LONG_CONSTANT("HTTP_UNLOCK", HTTP_UNLOCK);
+       /* WebDAV Versioning - RFC 3253 */
+       HTTP_LONG_CONSTANT("HTTP_VERSION_CONTROL", HTTP_VERSION_CONTROL);
+       HTTP_LONG_CONSTANT("HTTP_REPORT", HTTP_REPORT);
+       HTTP_LONG_CONSTANT("HTTP_CHECKOUT", HTTP_CHECKOUT);
+       HTTP_LONG_CONSTANT("HTTP_CHECKIN", HTTP_CHECKIN);
+       HTTP_LONG_CONSTANT("HTTP_UNCHECKOUT", HTTP_UNCHECKOUT);
+       HTTP_LONG_CONSTANT("HTTP_MKWORKSPACE", HTTP_MKWORKSPACE);
+       HTTP_LONG_CONSTANT("HTTP_UPDATE", HTTP_UPDATE);
+       HTTP_LONG_CONSTANT("HTTP_LABEL", HTTP_LABEL);
+       HTTP_LONG_CONSTANT("HTTP_MERGE", HTTP_MERGE);
+       HTTP_LONG_CONSTANT("HTTP_BASELINE_CONTROL", HTTP_BASELINE_CONTROL);
+       HTTP_LONG_CONSTANT("HTTP_MKACTIVITY", HTTP_MKACTIVITY);
+       /* WebDAV Access Control - RFC 3744 */
+       HTTP_LONG_CONSTANT("HTTP_ACL", HTTP_ACL);
 
-       PHP_ME(HttpRequest, setSslOptions, NULL, ZEND_ACC_PUBLIC)
 
-       PHP_ME(HttpRequest, getSslOptions, NULL, ZEND_ACC_PUBLIC)
+#      if LIBCURL_VERSION_NUM >= 0x070a05
+       HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC);
+       HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST);
+       HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM);
+#      endif /* LIBCURL_VERSION_NUM */
+}
 
-       PHP_ME(HttpRequest, unsetSslOptions, NULL, ZEND_ACC_PUBLIC)
+zend_object_value _http_request_object_new(zend_class_entry *ce 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->pool = NULL;
 
+       phpstr_init_ex(&o->response, HTTP_CURLBUF_SIZE, 0);
 
-       PHP_ME(HttpRequest, addHeaders, NULL, ZEND_ACC_PUBLIC)
+       ALLOC_HASHTABLE(OBJ_PROP(o));
+       zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
+       zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 
-       PHP_ME(HttpRequest, getHeaders, NULL, ZEND_ACC_PUBLIC)
+       ov.handle = zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, http_request_object_free, NULL TSRMLS_CC);
+       ov.handlers = &http_request_object_handlers;
 
-       PHP_ME(HttpRequest, unsetHeaders, NULL, ZEND_ACC_PUBLIC)
+       return ov;
+}
 
-       PHP_ME(HttpRequest, addCookies, NULL, ZEND_ACC_PUBLIC)
+static inline void _http_request_object_declare_default_properties(TSRMLS_D)
+{
+       zend_class_entry *ce = http_request_object_ce;
 
-       PHP_ME(HttpRequest, getCookies, NULL, ZEND_ACC_PUBLIC)
+       DCL_PROP_N(PROTECTED, options);
+       DCL_PROP_N(PROTECTED, responseInfo);
+       DCL_PROP_N(PROTECTED, responseData);
+       DCL_PROP_N(PROTECTED, responseCode);
+       DCL_PROP_N(PROTECTED, responseMessage);
+       DCL_PROP_N(PROTECTED, postFields);
+       DCL_PROP_N(PROTECTED, postFiles);
 
-       PHP_ME(HttpRequest, unsetCookies, NULL, ZEND_ACC_PUBLIC)
+       DCL_PROP(PROTECTED, long, method, HTTP_GET);
 
+       DCL_PROP(PROTECTED, string, url, "");
+       DCL_PROP(PROTECTED, string, contentType, "");
+       DCL_PROP(PROTECTED, string, queryData, "");
+       DCL_PROP(PROTECTED, string, putFile, "");
+}
 
+void _http_request_object_free(zend_object *object TSRMLS_DC)
+{
+       http_request_object *o = (http_request_object *) object;
 
-       PHP_ME(HttpRequest, setMethod, NULL, ZEND_ACC_PUBLIC)
+       if (OBJ_PROP(o)) {
+               zend_hash_destroy(OBJ_PROP(o));
+               FREE_HASHTABLE(OBJ_PROP(o));
+       }
+       if (o->ch) {
+               curl_easy_cleanup(o->ch);
+       }
+       phpstr_dtor(&o->response);
+       efree(o);
+}
 
-       PHP_ME(HttpRequest, getMethod, NULL, ZEND_ACC_PUBLIC)
+STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr, http_request_body *body TSRMLS_DC)
+{
+       zval *meth, *URL, *qdata, *opts;
+       char *request_uri;
+       STATUS status;
 
+       if (!body) {
+               return FAILURE;
+       }
+       if ((!obj->ch) && (!(obj->ch = curl_easy_init()))) {
+               http_error(E_WARNING, HTTP_E_CURL, "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);
 
-       PHP_ME(HttpRequest, setURL, NULL, ZEND_ACC_PUBLIC)
+       // 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;
+       }
 
-       PHP_ME(HttpRequest, getURL, NULL, ZEND_ACC_PUBLIC)
+       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));
+       }
 
+       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), &obj->response);
+               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)) {
+                               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), &obj->response);
+                       } else {
+                               status = FAILURE;
+                       }
+               }
+               break;
+
+               case HTTP_POST:
+               {
+                       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), &obj->response);
+                       }
+               }
+               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), &obj->response);
+               }
+               break;
+       }
 
+       /* clean previous response */
+       phpstr_dtor(&obj->response);
 
-       PHP_ME(HttpRequest, setContentType, NULL, ZEND_ACC_PUBLIC)
+       efree(request_uri);
+       return status;
+}
 
-       PHP_ME(HttpRequest, getContentType, NULL, ZEND_ACC_PUBLIC)
+STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this_ptr TSRMLS_DC)
+{
+       http_message *msg;
 
+       phpstr_fix(&obj->response);
 
+       if (msg = http_message_parse(PHPSTR_VAL(&obj->response), PHPSTR_LEN(&obj->response))) {
+               char *body;
+               size_t body_len;
+               zval *headers, *message, *resp = GET_PROP(obj, responseData), *info = GET_PROP(obj, responseInfo);
 
-       PHP_ME(HttpRequest, setQueryData, NULL, ZEND_ACC_PUBLIC)
+               UPD_PROP(obj, long, responseCode, msg->info.response.code);
 
-       PHP_ME(HttpRequest, getQueryData, NULL, ZEND_ACC_PUBLIC)
+               MAKE_STD_ZVAL(headers)
+               array_init(headers);
 
-       PHP_ME(HttpRequest, addQueryData, NULL, ZEND_ACC_PUBLIC)
+               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);
 
-       PHP_ME(HttpRequest, unsetQueryData, NULL, ZEND_ACC_PUBLIC)
+               add_assoc_zval(resp, "headers", 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);
+               SET_PROP(obj, responseMessage, message);
+               zval_ptr_dtor(&message);
 
+               http_request_info(obj->ch, Z_ARRVAL_P(info));
+               SET_PROP(obj, responseInfo, info);
 
-       PHP_ME(HttpRequest, setPostData, NULL, ZEND_ACC_PUBLIC)
+               return SUCCESS;
+       }
+       return FAILURE;
+}
 
-       PHP_ME(HttpRequest, getPostData, NULL, ZEND_ACC_PUBLIC)
+/* ### USERLAND ### */
 
-       PHP_ME(HttpRequest, addPostData, NULL, ZEND_ACC_PUBLIC)
+/* {{{ proto void HttpRequest::__construct([string url[, long request_method = HTTP_GET]])
+ *
+ * Instantiate a new HttpRequest object which can be used to issue HEAD, GET
+ * and POST (including posting files) HTTP requests.
+ */
+PHP_METHOD(HttpRequest, __construct)
+{
+       char *URL = NULL;
+       int URL_len;
+       long meth = -1;
+       getObject(http_request_object, obj);
+
+       SET_EH_THROW_HTTP();
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &URL, &URL_len, &meth)) {
+               INIT_PARR(obj, options);
+               INIT_PARR(obj, responseInfo);
+               INIT_PARR(obj, responseData);
+               INIT_PARR(obj, postFields);
+               INIT_PARR(obj, postFiles);
+
+               if (URL) {
+                       UPD_PROP(obj, string, url, URL);
+               }
+               if (meth > -1) {
+                       UPD_PROP(obj, long, method, meth);
+               }
+       }
+       SET_EH_NORMAL();
+}
+/* }}} */
 
-       PHP_ME(HttpRequest, unsetPostData, NULL, ZEND_ACC_PUBLIC)
+/* {{{ 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);
+}
+/* }}} */
 
-       PHP_ME(HttpRequest, addPostFile, NULL, ZEND_ACC_PUBLIC)
+/* {{{ proto bool HttpRequest::setOptions(array options)
+ *
+ * Set the request options to use.  See http_get() for a full list of available options.
+ */
+PHP_METHOD(HttpRequest, setOptions)
+{
+       char *key = NULL;
+       ulong idx = 0;
+       zval *opts, *old_opts, **opt;
+       getObject(http_request_object, obj);
 
-       PHP_ME(HttpRequest, getPostFiles, NULL, ZEND_ACC_PUBLIC)
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &opts)) {
+               RETURN_FALSE;
+       }
 
-       PHP_ME(HttpRequest, unsetPostFiles, NULL, ZEND_ACC_PUBLIC)
+       old_opts = GET_PROP(obj, options);
+
+       /* headers and cookies need extra attention -- thus cannot use array_merge() directly */
+       FOREACH_KEYVAL(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)) {
+                                       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)) {
+                                       array_merge(*opt, *cookies);
+                                       continue;
+                               }
+                       }
+                       zval_add_ref(opt);
+                       add_assoc_zval(old_opts, key, *opt);
+
+                       /* reset */
+                       key = NULL;
+               }
+       }
 
+       RETURN_TRUE;
+}
+/* }}} */
 
+/* {{{ proto array HttpRequest::getOptions()
+ *
+ * Get current set options.
+ */
+PHP_METHOD(HttpRequest, getOptions)
+{
+       NO_ARGS;
 
-       PHP_ME(HttpRequest, send, NULL, ZEND_ACC_PUBLIC)
+       IF_RETVAL_USED {
+               zval *opts;
+               getObject(http_request_object, obj);
 
+               opts = GET_PROP(obj, options);
+               array_init(return_value);
+               array_copy(opts, return_value);
+       }
+}
+/* }}} */
 
+/* {{{ proto void HttpRequest::unsetOptions()
+ *
+ * Unset all options/headers/cookies.
+ */
+PHP_METHOD(HttpRequest, unsetOptions)
+{
+       getObject(http_request_object, obj);
 
-       PHP_ME(HttpRequest, getResponseData, NULL, ZEND_ACC_PUBLIC)
+       NO_ARGS;
 
-       PHP_ME(HttpRequest, getResponseHeader, NULL, ZEND_ACC_PUBLIC)
+       FREE_PARR(obj, options);
+       INIT_PARR(obj, options);
+}
+/* }}} */
 
-       PHP_ME(HttpRequest, getResponseCookie, NULL, ZEND_ACC_PUBLIC)
+/* {{{ proto bool HttpRequest::setSslOptions(array options)
+ *
+ * Set additional SSL options.
+ */
+PHP_METHOD(HttpRequest, setSslOptions)
+{
+       zval *opts, *old_opts, **ssl_options;
+       getObject(http_request_object, obj);
 
-       PHP_ME(HttpRequest, getResponseCode, NULL, ZEND_ACC_PUBLIC)
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &opts)) {
+               RETURN_FALSE;
+       }
 
-       PHP_ME(HttpRequest, getResponseBody, NULL, ZEND_ACC_PUBLIC)
+       old_opts = GET_PROP(obj, options);
 
-       PHP_ME(HttpRequest, getResponseInfo, NULL, ZEND_ACC_PUBLIC)
+       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);
+       }
 
-       PHP_ME(HttpRequest, getResponseMessage, NULL, ZEND_ACC_PUBLIC)
+       RETURN_TRUE;
+}
+/* }}} */
 
+/* {{{ proto array HttpRequest::getSslOtpions()
+ *
+ * Get previously set SSL options.
+ */
+PHP_METHOD(HttpRequest, getSslOptions)
+{
+       NO_ARGS;
 
+       IF_RETVAL_USED {
+               zval *opts, **ssl_options;
+               getObject(http_request_object, obj);
 
-       {NULL, NULL, NULL}
+               opts = GET_PROP(obj, options);
 
-};
+               array_init(return_value);
 
-static zend_object_handlers http_request_object_handlers;
+               if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "ssl", sizeof("ssl"), (void **) &ssl_options)) {
+                       array_copy(*ssl_options, return_value);
+               }
+       }
+}
+/* }}} */
 
+/* {{{ proto void HttpRequest::unsetSslOptions()
+ *
+ * Unset previously set SSL options.
+ */
+PHP_METHOD(HttpRequest, unsetSslOptions)
+{
+       zval *opts;
+       getObject(http_request_object, obj);
 
+       NO_ARGS;
 
-void _http_request_object_init(INIT_FUNC_ARGS)
+       opts = GET_PROP(obj, options);
+       zend_hash_del(Z_ARRVAL_P(opts), "ssl", sizeof("ssl"));
+}
+/* }}} */
 
+/* {{{ proto bool HttpRequest::addHeaders(array headers)
+ *
+ * Add request header name/value pairs.
+ */
+PHP_METHOD(HttpRequest, addHeaders)
 {
+       zval *opts, **headers, *new_headers;
+       getObject(http_request_object, obj);
 
-       HTTP_REGISTER_CLASS_EX(HttpRequest, http_request_object, NULL, 0);
+       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);
+       }
 
-       /* HTTP/1.1 */
+       RETURN_TRUE;
+}
+/* }}} */
 
-       HTTP_LONG_CONSTANT("HTTP_GET", HTTP_GET);
+/* {{{ proto array HttpRequest::getHeaders()
+ *
+ * Get previously set request headers.
+ */
+PHP_METHOD(HttpRequest, getHeaders)
+{
+       NO_ARGS;
 
-       HTTP_LONG_CONSTANT("HTTP_HEAD", HTTP_HEAD);
+       IF_RETVAL_USED {
+               zval *opts, **headers;
+               getObject(http_request_object, obj);
 
-       HTTP_LONG_CONSTANT("HTTP_POST", HTTP_POST);
+               opts = GET_PROP(obj, options);
 
-       HTTP_LONG_CONSTANT("HTTP_PUT", HTTP_PUT);
+               array_init(return_value);
 
-       HTTP_LONG_CONSTANT("HTTP_DELETE", HTTP_DELETE);
+               if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) {
+                       array_copy(*headers, return_value);
+               }
+       }
+}
+/* }}} */
 
-       HTTP_LONG_CONSTANT("HTTP_OPTIONS", HTTP_OPTIONS);
+/* {{{ proto void HttpRequest::unsetHeaders()
+ *
+ * Unset previously set request headers.
+ */
+PHP_METHOD(HttpRequest, unsetHeaders)
+{
+       zval *opts;
+       getObject(http_request_object, obj);
 
-       HTTP_LONG_CONSTANT("HTTP_TRACE", HTTP_TRACE);
+       NO_ARGS;
 
-       HTTP_LONG_CONSTANT("HTTP_CONNECT", HTTP_CONNECT);
+       opts = GET_PROP(obj, options);
+       zend_hash_del(Z_ARRVAL_P(opts), "headers", sizeof("headers"));
+}
+/* }}} */
 
-       /* WebDAV - RFC 2518 */
+/* {{{ proto bool HttpRequest::addCookies(array cookies)
+ *
+ * Add cookies.
+ */
+PHP_METHOD(HttpRequest, addCookies)
+{
+       zval *opts, **cookies, *new_cookies;
+       getObject(http_request_object, obj);
 
-       HTTP_LONG_CONSTANT("HTTP_PROPFIND", HTTP_PROPFIND);
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &new_cookies)) {
+               RETURN_FALSE;
+       }
 
-       HTTP_LONG_CONSTANT("HTTP_PROPPATCH", HTTP_PROPPATCH);
+       opts = GET_PROP(obj, options);
 
-       HTTP_LONG_CONSTANT("HTTP_MKCOL", HTTP_MKCOL);
+       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);
+       }
 
-       HTTP_LONG_CONSTANT("HTTP_COPY", HTTP_COPY);
+       RETURN_TRUE;
+}
+/* }}} */
 
-       HTTP_LONG_CONSTANT("HTTP_MOVE", HTTP_MOVE);
+/* {{{ proto array HttpRequest::getCookies()
+ *
+ * Get previously set cookies.
+ */
+PHP_METHOD(HttpRequest, getCookies)
+{
+       NO_ARGS;
 
-       HTTP_LONG_CONSTANT("HTTP_LOCK", HTTP_LOCK);
+       IF_RETVAL_USED {
+               zval *opts, **cookies;
+               getObject(http_request_object, obj);
 
-       HTTP_LONG_CONSTANT("HTTP_UNLOCK", HTTP_UNLOCK);
+               opts = GET_PROP(obj, options);
 
-       /* WebDAV Versioning - RFC 3253 */
+               array_init(return_value);
 
-       HTTP_LONG_CONSTANT("HTTP_VERSION_CONTROL", HTTP_VERSION_CONTROL);
+               if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
+                       array_copy(*cookies, return_value);
+               }
+       }
+}
+/* }}} */
 
-       HTTP_LONG_CONSTANT("HTTP_REPORT", HTTP_REPORT);
+/* {{{ proto void HttpRequest::unsetCookies()
+ *
+ */
+PHP_METHOD(HttpRequest, unsetCookies)
+{
+       zval *opts;
+       getObject(http_request_object, obj);
 
-       HTTP_LONG_CONSTANT("HTTP_CHECKOUT", HTTP_CHECKOUT);
+       NO_ARGS;
 
-       HTTP_LONG_CONSTANT("HTTP_CHECKIN", HTTP_CHECKIN);
+       opts = GET_PROP(obj, options);
+       zend_hash_del(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"));
+}
+/* }}} */
 
-       HTTP_LONG_CONSTANT("HTTP_UNCHECKOUT", HTTP_UNCHECKOUT);
+/* {{{ proto bool HttpRequest::setUrl(string url)
+ *
+ * Set the request URL.
+ */
+PHP_METHOD(HttpRequest, setUrl)
+{
+       char *URL = NULL;
+       int URL_len;
+       getObject(http_request_object, obj);
 
-       HTTP_LONG_CONSTANT("HTTP_MKWORKSPACE", HTTP_MKWORKSPACE);
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &URL, &URL_len)) {
+               RETURN_FALSE;
+       }
 
-       HTTP_LONG_CONSTANT("HTTP_UPDATE", HTTP_UPDATE);
+       UPD_PROP(obj, string, url, URL);
+       RETURN_TRUE;
+}
+/* }}} */
 
-       HTTP_LONG_CONSTANT("HTTP_LABEL", HTTP_LABEL);
+/* {{{ proto string HttpRequest::getUrl()
+ *
+ * Get the previously set request URL.
+ */
+PHP_METHOD(HttpRequest, getUrl)
+{
+       NO_ARGS;
 
-       HTTP_LONG_CONSTANT("HTTP_MERGE", HTTP_MERGE);
+       IF_RETVAL_USED {
+               zval *URL;
+               getObject(http_request_object, obj);
 
-       HTTP_LONG_CONSTANT("HTTP_BASELINE_CONTROL", HTTP_BASELINE_CONTROL);
+               URL = GET_PROP(obj, url);
+               RETURN_STRINGL(Z_STRVAL_P(URL), Z_STRLEN_P(URL), 1);
+       }
+}
+/* }}} */
 
-       HTTP_LONG_CONSTANT("HTTP_MKACTIVITY", HTTP_MKACTIVITY);
+/* {{{ proto bool HttpRequest::setMethod(long request_method)
+ *
+ * Set the request methods; one of the <tt>HTTP_HEAD</tt>, <tt>HTTP_GET</tt> or
+ * <tt>HTTP_POST</tt> constants.
+ */
+PHP_METHOD(HttpRequest, setMethod)
+{
+       long meth;
+       getObject(http_request_object, obj);
 
-       /* WebDAV Access Control - RFC 3744 */
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &meth)) {
+               RETURN_FALSE;
+       }
 
-       HTTP_LONG_CONSTANT("HTTP_ACL", HTTP_ACL);
+       UPD_PROP(obj, long, method, meth);
+       RETURN_TRUE;
+}
+/* }}} */
 
+/* {{{ proto long HttpRequest::getMethod()
+ *
+ * Get the previously set request method.
+ */
+PHP_METHOD(HttpRequest, getMethod)
+{
+       NO_ARGS;
 
+       IF_RETVAL_USED {
+               zval *meth;
+               getObject(http_request_object, obj);
 
+               meth = GET_PROP(obj, method);
+               RETURN_LONG(Z_LVAL_P(meth));
+       }
+}
+/* }}} */
 
+/* {{{ proto bool HttpRequest::setContentType(string content_type)
+ *
+ * Set the content type the post request should have.
+ * Use this only if you know what you're doing.
+ */
+PHP_METHOD(HttpRequest, setContentType)
+{
+       char *ctype;
+       int ct_len;
+       getObject(http_request_object, obj);
 
-#      if LIBCURL_VERSION_NUM >= 0x070a05
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ctype, &ct_len)) {
+               RETURN_FALSE;
+       }
 
-       HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC);
+       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);
+               RETURN_FALSE;
+       }
 
-       HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST);
+       UPD_PROP(obj, string, contentType, ctype);
+       RETURN_TRUE;
+}
+/* }}} */
 
-       HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM);
+/* {{{ proto string HttpRequest::getContentType()
+ *
+ * Get the previously content type.
+ */
+PHP_METHOD(HttpRequest, getContentType)
+{
+       NO_ARGS;
 
-#      endif /* LIBCURL_VERSION_NUM */
+       IF_RETVAL_USED {
+               zval *ctype;
+               getObject(http_request_object, obj);
 
+               ctype = GET_PROP(obj, contentType);
+               RETURN_STRINGL(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+       }
 }
+/* }}} */
 
+/* {{{ proto bool HttpRequest::setQueryData(mixed query_data)
+ *
+ * Set the URL query parameters to use.
+ * Overwrites previously set query parameters.
+ * Affects any request types.
+ */
+PHP_METHOD(HttpRequest, setQueryData)
+{
+       zval *qdata;
+       char *query_data = NULL;
+       getObject(http_request_object, obj);
 
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &qdata)) {
+               RETURN_FALSE;
+       }
 
-zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC)
+       if ((Z_TYPE_P(qdata) == IS_ARRAY) || (Z_TYPE_P(qdata) == IS_OBJECT)) {
+               if (SUCCESS != http_urlencode_hash(HASH_OF(qdata), &query_data)) {
+                       RETURN_FALSE;
+               }
+               UPD_PROP(obj, string, queryData, query_data);
+               efree(query_data);
+               RETURN_TRUE;
+       }
+
+       convert_to_string(qdata);
+       UPD_PROP(obj, string, queryData, Z_STRVAL_P(qdata));
+       RETURN_TRUE;
+}
+/* }}} */
 
+/* {{{ proto string HttpRequest::getQueryData()
+ *
+ * Get the current query data in form of an urlencoded query string.
+ */
+PHP_METHOD(HttpRequest, getQueryData)
 {
+       NO_ARGS;
 
-       zend_object_value ov;
-
-       http_request_object *o;
+       IF_RETVAL_USED {
+               zval *qdata;
+               getObject(http_request_object, obj);
 
+               qdata = GET_PROP(obj, queryData);
+               RETURN_STRINGL(Z_STRVAL_P(qdata), Z_STRLEN_P(qdata), 1);
+       }
+}
+/* }}} */
 
+/* {{{ proto bool HttpRequest::addQueryData(array query_params)
+ *
+ * Add parameters to the query parameter list.
+ * Affects any request type.
+ */
+PHP_METHOD(HttpRequest, addQueryData)
+{
+       zval *qdata, *old_qdata;
+       char *query_data = NULL;
+       getObject(http_request_object, obj);
 
-       o = ecalloc(1, sizeof(http_request_object));
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &qdata)) {
+               RETURN_FALSE;
+       }
 
-       o->zo.ce = ce;
+       old_qdata = GET_PROP(obj, queryData);
 
-       o->ch = curl_easy_init();
+       if (SUCCESS != http_urlencode_hash_ex(HASH_OF(qdata), 1, Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata), &query_data, NULL)) {
+               RETURN_FALSE;
+       }
 
+       UPD_PROP(obj, string, queryData, query_data);
+       efree(query_data);
 
+       RETURN_TRUE;
+}
+/* }}} */
 
-       phpstr_init_ex(&o->response, HTTP_CURLBUF_SIZE, 0);
+/* {{{ 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, "");
+}
+/* }}} */
 
-       ALLOC_HASHTABLE(OBJ_PROP(o));
+/* {{{ proto bool HttpRequest::addPostFields(array post_data)
+ *
+ * Adds POST data entries.
+ * Affects only POST requests.
+ */
+PHP_METHOD(HttpRequest, addPostFields)
+{
+       zval *post, *post_data;
+       getObject(http_request_object, obj);
 
-       zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &post_data)) {
+               RETURN_FALSE;
+       }
 
-       zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+       post = GET_PROP(obj, postFields);
+       array_merge(post_data, post);
 
+       RETURN_TRUE;
+}
+/* }}} */
 
+/* {{{ proto bool HttpRequest::setPostFields(array post_data)
+ *
+ * Set the POST data entries.
+ * Overwrites previously set POST data.
+ * Affects only POST requests.
+ */
+PHP_METHOD(HttpRequest, setPostFields)
+{
+       zval *post, *post_data;
+       getObject(http_request_object, obj);
 
-       ov.handle = zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, http_request_object_free, NULL TSRMLS_CC);
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &post_data)) {
+               RETURN_FALSE;
+       }
 
-       ov.handlers = &http_request_object_handlers;
+       post = GET_PROP(obj, postFields);
+       zend_hash_clean(Z_ARRVAL_P(post));
+       array_copy(post_data, post);
 
+       RETURN_TRUE;
+}
+/* }}}*/
 
+/* {{{ proto array HttpRequest::getPostFields()
+ *
+ * Get previously set POST data.
+ */
+PHP_METHOD(HttpRequest, getPostFields)
+{
+       NO_ARGS;
 
-       return ov;
+       IF_RETVAL_USED {
+               zval *post_data;
+               getObject(http_request_object, obj);
 
+               post_data = GET_PROP(obj, postFields);
+               array_init(return_value);
+               array_copy(post_data, return_value);
+       }
 }
+/* }}} */
 
+/* {{{ proto void HttpRequest::unsetPostFields()
+ *
+ * Clean POST data entires.
+ * Affects only POST requests.
+ */
+PHP_METHOD(HttpRequest, unsetPostFields)
+{
+       zval *post_data;
+       getObject(http_request_object, obj);
 
+       NO_ARGS;
 
-static inline void _http_request_object_declare_default_properties(TSRMLS_D)
+       post_data = GET_PROP(obj, postFields);
+       zend_hash_clean(Z_ARRVAL_P(post_data));
+}
+/* }}} */
 
+/* {{{ proto bool HttpRequest::addPostFile(string name, string file[, string content_type = "application/x-octetstream"])
+ *
+ * Add a file to the POST request.
+ * Affects only POST requests.
+ */
+PHP_METHOD(HttpRequest, addPostFile)
 {
+       zval *files, *entry;
+       char *name, *file, *type = NULL;
+       int name_len, file_len, type_len = 0;
+       getObject(http_request_object, obj);
 
-       zend_class_entry *ce = http_request_object_ce;
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s", &name, &name_len, &file, &file_len, &type, &type_len)) {
+               RETURN_FALSE;
+       }
 
+       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);
+                       RETURN_FALSE;
+               }
+       } else {
+               type = "application/x-octetstream";
+               type_len = sizeof("application/x-octetstream") - 1;
+       }
 
+       MAKE_STD_ZVAL(entry);
+       array_init(entry);
 
-       DCL_PROP_N(PROTECTED, options);
+       add_assoc_stringl(entry, "name", name, name_len, 1);
+       add_assoc_stringl(entry, "type", type, type_len, 1);
+       add_assoc_stringl(entry, "file", file, file_len, 1);
 
-       DCL_PROP_N(PROTECTED, responseInfo);
+       files  = GET_PROP(obj, postFiles);
+       add_next_index_zval(files, entry);
 
-       DCL_PROP_N(PROTECTED, responseData);
+       RETURN_TRUE;
+}
+/* }}} */
 
-       DCL_PROP_N(PROTECTED, responseCode);
+/* {{{ proto bool HttpRequest::setPostFiles(array post_files)
+ *
+ * Set files to post.
+ * Overwrites previously set post files.
+ * Affects only POST requests.
+ */
+PHP_METHOD(HttpRequest, setPostFiles)
+{
+       zval *files, *pFiles;
+       getObject(http_request_object, obj);
 
-       DCL_PROP_N(PROTECTED, responseMessage);
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &files)) {
+               RETURN_FALSE;
+       }
 
-       DCL_PROP_N(PROTECTED, postData);
+       pFiles = GET_PROP(obj, postFiles);
+       zend_hash_clean(Z_ARRVAL_P(pFiles));
+       array_copy(files, pFiles);
 
-       DCL_PROP_N(PROTECTED, postFiles);
+       RETURN_TRUE;
+}
+/* }}} */
 
+/* {{{ proto array HttpRequest::getPostFiles()
+ *
+ * Get all previously added POST files.
+ */
+PHP_METHOD(HttpRequest, getPostFiles)
+{
+       NO_ARGS;
 
+       IF_RETVAL_USED {
+               zval *files;
+               getObject(http_request_object, obj);
 
-       DCL_PROP(PROTECTED, long, method, HTTP_GET);
+               files = GET_PROP(obj, postFiles);
 
+               array_init(return_value);
+               array_copy(files, return_value);
+       }
+}
+/* }}} */
 
+/* {{{ proto void HttpRequest::unsetPostFiles()
+ *
+ * Unset the POST files list.
+ * Affects only POST requests.
+ */
+PHP_METHOD(HttpRequest, unsetPostFiles)
+{
+       zval *files;
+       getObject(http_request_object, obj);
 
-       DCL_PROP(PROTECTED, string, url, "");
+       NO_ARGS;
 
-       DCL_PROP(PROTECTED, string, contentType, "");
+       files = GET_PROP(obj, postFiles);
+       zend_hash_clean(Z_ARRVAL_P(files));
+}
+/* }}} */
 
-       DCL_PROP(PROTECTED, string, queryData, "");
+/* {{{ proto bool HttpRequest::SetPutFile(string file)
+ *
+ * Set file to put.
+ * Affects only PUT requests.
+ */
+PHP_METHOD(HttpRequest, setPutFile)
+{
+       char *file;
+       int file_len;
+       getObject(http_request_object, obj);
 
-       DCL_PROP(PROTECTED, string, postData, "");
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &file, &file_len)) {
+               RETURN_FALSE;
+       }
 
+       UPD_PROP(obj, string, putFile, file);
+       RETURN_TRUE;
 }
+/* }}} */
 
+/* {{{ proto string HttpRequest::getPutFile()
+ *
+ * Get previously set put file.
+ */
+PHP_METHOD(HttpRequest, getPutFile)
+{
+       NO_ARGS;
 
+       IF_RETVAL_USED {
+               zval *putfile;
+               getObject(http_request_object, obj);
 
-void _http_request_object_free(zend_object *object TSRMLS_DC)
+               putfile = GET_PROP(obj, putFile);
+               RETVAL_STRINGL(Z_STRVAL_P(putfile), Z_STRLEN_P(putfile), 1);
+       }
+}
+/* }}} */
 
+/* {{{ proto void HttpRequest::unsetPutFile()
+ *
+ * Unset file to put.
+ * Affects only PUT requests.
+ */
+PHP_METHOD(HttpRequest, unsetPutFile)
 {
+       getObject(http_request_object, obj);
 
-       http_request_object *o = (http_request_object *) object;
+       NO_ARGS;
 
+       UPD_PROP(obj, string, putFile, "");
+}
+/* }}} */
 
+/* {{{ proto array HttpRequest::getResponseData()
+ *
+ * Get all response data after the request has been sent.
+ */
+PHP_METHOD(HttpRequest, getResponseData)
+{
+       NO_ARGS;
 
-       if (OBJ_PROP(o)) {
+       IF_RETVAL_USED {
+               zval *data;
+               getObject(http_request_object, obj);
 
-               zend_hash_destroy(OBJ_PROP(o));
+               data = GET_PROP(obj, responseData);
+               array_init(return_value);
+               array_copy(data, return_value);
+       }
+}
+/* }}} */
 
-               FREE_HASHTABLE(OBJ_PROP(o));
+/* {{{ proto mixed HttpRequest::getResponseHeader([string name])
+ *
+ * Get response header(s) after the request has been sent.
+ */
+PHP_METHOD(HttpRequest, getResponseHeader)
+{
+       IF_RETVAL_USED {
+               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 = GET_PROP(obj, responseData);
+               if (SUCCESS != zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) {
+                       RETURN_FALSE;
+               }
+
+               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_STRINGL(Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1);
+               } else {
+                       RETURN_FALSE;
+               }
+       }
+}
+/* }}} */
 
+/* {{{ proto array HttpRequest::getResponseCookie([string name])
+ *
+ * Get response cookie(s) after the request has been sent.
+ */
+PHP_METHOD(HttpRequest, getResponseCookie)
+{
+       IF_RETVAL_USED {
+               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;
+               }
+
+               array_init(return_value);
+
+               data = 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;
+
+                       FOREACH_HASH_KEYVAL(Z_ARRVAL_PP(headers), key, idx, header) {
+                               if (key && !strcasecmp(key, "Set-Cookie")) {
+                                       /* several cookies? */
+                                       if (Z_TYPE_PP(header) == IS_ARRAY) {
+                                               zval **cookie;
+
+                                               FOREACH_HASH_VAL(Z_ARRVAL_PP(header), cookie) {
+                                                       zval *cookie_hash;
+                                                       MAKE_STD_ZVAL(cookie_hash);
+                                                       array_init(cookie_hash);
+
+                                                       if (SUCCESS == http_parse_cookie(Z_STRVAL_PP(cookie), Z_ARRVAL_P(cookie_hash))) {
+                                                               if (!cookie_len) {
+                                                                       add_next_index_zval(return_value, cookie_hash);
+                                                               } else {
+                                                                       zval **name;
+
+                                                                       if (    (SUCCESS == zend_hash_find(Z_ARRVAL_P(cookie_hash), "name", sizeof("name"), (void **) &name)) &&
+                                                                                       (!strcmp(Z_STRVAL_PP(name), cookie_name))) {
+                                                                               add_next_index_zval(return_value, cookie_hash);
+                                                                               return; /* <<< FOUND >>> */
+                                                                       } else {
+                                                                               zval_dtor(cookie_hash);
+                                                                               efree(cookie_hash);
+                                                                       }
+                                                               }
+                                                       } else {
+                                                               zval_dtor(cookie_hash);
+                                                               efree(cookie_hash);
+                                                       }
+                                               }
+                                       } else {
+                                               zval *cookie_hash;
+                                               MAKE_STD_ZVAL(cookie_hash);
+                                               array_init(cookie_hash);
+
+                                               if (SUCCESS == http_parse_cookie(Z_STRVAL_PP(header), Z_ARRVAL_P(cookie_hash))) {
+                                                       if (!cookie_len) {
+                                                               add_next_index_zval(return_value, cookie_hash);
+                                                       } else {
+                                                               zval **name;
+
+                                                               if (    (SUCCESS == zend_hash_find(Z_ARRVAL_P(cookie_hash), "name", sizeof("name"), (void **) &name)) &&
+                                                                               (!strcmp(Z_STRVAL_PP(name), cookie_name))) {
+                                                                       add_next_index_zval(return_value, cookie_hash);
+                                                               } else {
+                                                                       zval_dtor(cookie_hash);
+                                                                       efree(cookie_hash);
+                                                               }
+                                                       }
+                                               } else {
+                                                       zval_dtor(cookie_hash);
+                                                       efree(cookie_hash);
+                                               }
+                                       }
+                                       break;
+                               }
+                               /* reset key */
+                               key = NULL;
+                       }
+               }
        }
+}
+/* }}} */
 
-       if (o->ch) {
+/* {{{ proto string HttpRequest::getResponseBody()
+ *
+ * Get the response body after the request has been sent.
+ */
+PHP_METHOD(HttpRequest, getResponseBody)
+{
+       NO_ARGS;
+
+       IF_RETVAL_USED {
+               zval *data, **body;
+               getObject(http_request_object, obj);
+
+               data = GET_PROP(obj, responseData);
+               if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "body", sizeof("body"), (void **) &body)) {
+                       RETURN_STRINGL(Z_STRVAL_PP(body), Z_STRLEN_PP(body), 1);
+               } else {
+                       RETURN_FALSE;
+               }
+       }
+}
+/* }}} */
 
-               curl_easy_cleanup(o->ch);
+/* {{{ proto int HttpRequest::getResponseCode()
+ *
+ * Get the response code after the request has been sent.
+ */
+PHP_METHOD(HttpRequest, getResponseCode)
+{
+       NO_ARGS;
 
-       }
+       IF_RETVAL_USED {
+               zval *code;
+               getObject(http_request_object, obj);
 
-       phpstr_dtor(&o->response);
+               code = GET_PROP(obj, responseCode);
+               RETURN_LONG(Z_LVAL_P(code));
+       }
+}
+/* }}} */
 
-       efree(o);
+/* {{{ proto array HttpRequest::getResponseInfo([string name])
+ *
+ * Get response info after the request has been sent.
+ * See http_get() for a full list of returned info.
+ */
+PHP_METHOD(HttpRequest, getResponseInfo)
+{
+       IF_RETVAL_USED {
+               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 = 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)) {
+                               RETURN_ZVAL(*infop, 1, ZVAL_PTR_DTOR);
+                       } else {
+                               http_error_ex(E_NOTICE, HTTP_E_PARAM, "Could not find response info named %s", info_name);
+                               RETURN_FALSE;
+                       }
+               } else {
+                       array_init(return_value);
+                       array_copy(info, return_value);
+               }
+       }
+}
+/* }}}*/
 
+/* {{{ proto HttpMessage HttpRequest::getResponseMessage()
+ *
+ * Get the full response as HttpMessage object.
+ */
+PHP_METHOD(HttpRequest, getResponseMessage)
+{
+       NO_ARGS;
+
+       IF_RETVAL_USED {
+               zval *message;
+               getObject(http_request_object, obj);
+
+               message = GET_PROP(obj, responseMessage);
+               if (Z_TYPE_P(message) == IS_OBJECT) {
+                       RETVAL_OBJECT(message);
+               } else {
+                       RETURN_NULL();
+               }
+       }
 }
+/* }}} */
+
+/* {{{ proto bool HttpRequest::send()
+ *
+ * Send the HTTP request.
+ *
+ * GET example:
+ * <pre>
+ * <?php
+ * $r = new HttpRequest('http://example.com/feed.rss', HTTP_GET);
+ * $r->setOptions(array('lastmodified' => filemtime('local.rss')));
+ * $r->addQueryData(array('category' => 3));
+ * try {
+ *     $r->send();
+ *     if ($r->getResponseCode() == 200) {
+ *         file_put_contents('local.rss', $r->getResponseBody());
+ *    }
+ * } catch (HttpException $ex) {
+ *     echo $ex;
+ * }
+ * ?>
+ * </pre>
+ *
+ * POST example:
+ * <pre>
+ * <?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->addPostFile('image', 'profile.jpg', 'image/jpeg');
+ * if ($r->send()) {
+ *     echo $r->getResponseBody();
+ * }
+ * ?>
+ * </pre>
+ */
+PHP_METHOD(HttpRequest, send)
+{
+       STATUS status = FAILURE;
+       http_request_body body = {0};
+       getObject(http_request_object, obj);
+
+       NO_ARGS;
 
+       SET_EH_THROW_HTTP();
 
+       if (obj->pool) {
+               http_error(E_WARNING, HTTP_E_CURL, "Cannot perform HttpRequest::send() while attached to an HttpRequestPool");
+               SET_EH_NORMAL();
+               RETURN_FALSE;
+       }
 
-#endif /* HTTP_HAVE_CURL */
+       if (SUCCESS == (status = http_request_object_requesthandler(obj, getThis(), &body))) {
+               status = http_request_exec(obj->ch, NULL);
+       }
+       http_request_body_dtor(&body);
 
-#endif /* ZEND_ENGINE_2 */
+       /* final data handling */
+       if (SUCCESS == status) {
+               status = http_request_object_responsehandler(obj, getThis());
+       }
 
+       SET_EH_NORMAL();
+       RETURN_SUCCESS(status);
+}
+/* }}} */
 
+#endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */
 
 /*
-
  * Local variables:
-
  * tab-width: 4
-
  * c-basic-offset: 4
-
  * End:
-
  * vim600: noet sw=4 ts=4 fdm=marker
-
  * vim<600: noet sw=4 ts=4
-
  */
 
-
-