* do the dtor dance the right way
[m6w6/ext-http] / http.c
diff --git a/http.c b/http.c
index 847e7d1da1768af15e97060686105b2338d988f6..e174ba11f241aa21e7efe0d2dd24a6173b1dad89 100644 (file)
--- a/http.c
+++ b/http.c
@@ -14,7 +14,7 @@
 */
 
 /* $Id$ */
-#define ZEND_ENGINE_2
+
 #define _WINSOCKAPI_
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -85,12 +85,12 @@ function_entry http_functions[] = {
        PHP_FE(http_redirect, NULL)
        PHP_FE(http_send_status, NULL)
        PHP_FE(http_send_last_modified, NULL)
+       PHP_FE(http_send_content_type, NULL)
+       PHP_FE(http_send_content_disposition, NULL)
        PHP_FE(http_match_modified, NULL)
        PHP_FE(http_match_etag, NULL)
        PHP_FE(http_cache_last_modified, NULL)
        PHP_FE(http_cache_etag, NULL)
-       PHP_FE(http_content_type, NULL)
-       PHP_FE(http_content_disposition, NULL)
        PHP_FE(http_send_data, NULL)
        PHP_FE(http_send_file, NULL)
        PHP_FE(http_send_stream, NULL)
@@ -116,6 +116,12 @@ function_entry http_functions[] = {
 
 #define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v))
 #define HASH_ORNULL(z) ((z) ? Z_ARRVAL_P(z) : NULL)
+#define NO_ARGS if (ZEND_NUM_ARGS()) WRONG_PARAM_COUNT
+#define HTTP_URL_ARGSEP_OVERRIDE zend_alter_ini_entry("arg_separator.output", sizeof("arg_separator.output") - 1, "&", 1, ZEND_INI_ALL, ZEND_INI_STAGE_RUNTIME)
+#define HTTP_URL_ARGSEP_RESTORE zend_restore_ini_entry("arg_separator.output", sizeof("arg_separator.output") - 1, ZEND_INI_STAGE_RUNTIME)
+
+#define array_copy(src, dst) zend_hash_copy(Z_ARRVAL_P(dst), Z_ARRVAL_P(src), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *))
+#define array_merge(src, dst) zend_hash_merge(Z_ARRVAL_P(dst), Z_ARRVAL_P(src), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *), 1)
 
 #ifdef ZEND_ENGINE_2
 
@@ -143,9 +149,30 @@ function_entry http_functions[] = {
 #      define getObject(t, o) t * o = ((t *) zend_object_store_get_object(getThis() TSRMLS_CC))
 #      define OBJ_PROP(o) o->zo.properties
 #      define DCL_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a) TSRMLS_CC)
+#      define DCL_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a) TSRMLS_CC)
+#      define DCL_PROP_N(a, n) zend_declare_property_null(ce, (#n), sizeof(#n), (ZEND_ACC_ ##a) TSRMLS_CC)
 #      define UPD_PROP(o, t, n, v) zend_update_property_ ##t(o->zo.ce, getThis(), (#n), sizeof(#n), (v) TSRMLS_CC)
+#      define SET_PROP(o, n, z) zend_update_property(o->zo.ce, getThis(), (#n), sizeof(#n), (z) TSRMLS_CC)
 #      define GET_PROP(o, n) zend_read_property(o->zo.ce, getThis(), (#n), sizeof(#n), 0 TSRMLS_CC)
 
+#      define INIT_PARR(o, n) \
+       { \
+               zval *__tmp; \
+               MAKE_STD_ZVAL(__tmp); \
+               array_init(__tmp); \
+               SET_PROP(o, n, __tmp); \
+       }
+
+#      define FREE_PARR(o, p) \
+       { \
+               zval *__tmp = NULL; \
+               if (__tmp = GET_PROP(o, p)) { \
+                       zval_dtor(__tmp); \
+                       FREE_ZVAL(__tmp); \
+                       __tmp = NULL; \
+               } \
+       }
+
 /* {{{ HTTPi */
 
 zend_class_entry *httpi_ce;
@@ -160,6 +187,8 @@ zend_function_entry httpi_class_methods[] = {
        HTTPi_ME(redirect, http_redirect, NULL)
        HTTPi_ME(sendStatus, http_send_status, NULL)
        HTTPi_ME(sendLastModified, http_send_last_modified, NULL)
+       HTTPi_ME(sendContentType, http_send_content_type, NULL)
+       HTTPi_ME(sendContentDisposition, http_send_content_disposition, NULL)
        HTTPi_ME(matchModified, http_match_modified, NULL)
        HTTPi_ME(matchEtag, http_match_etag, NULL)
        HTTPi_ME(cacheLastModified, http_cache_last_modified, NULL)
@@ -196,12 +225,16 @@ static inline void _httpi_response_declare_default_properties(zend_class_entry *
        DCL_PROP(PROTECTED, string, eTag, "");
        DCL_PROP(PROTECTED, string, dispoFile, "");
        DCL_PROP(PROTECTED, string, cacheControl, "public");
+       DCL_PROP(PROTECTED, string, data, "");
+       DCL_PROP(PROTECTED, string, file, "");
+       DCL_PROP(PROTECTED, long, stream, 0);
        DCL_PROP(PROTECTED, long, lastModified, 0);
        DCL_PROP(PROTECTED, long, dispoInline, 0);
        DCL_PROP(PROTECTED, long, cache, 0);
        DCL_PROP(PROTECTED, long, gzip, 0);
-       
+
        DCL_PROP(PRIVATE, long, raw_cache_header, 0);
+       DCL_PROP(PRIVATE, long, send_mode, -1);
 }
 
 #define httpi_response_destroy_object _httpi_response_destroy_object
@@ -212,6 +245,7 @@ void _httpi_response_destroy_object(void *object, zend_object_handle handle TSRM
                zend_hash_destroy(OBJ_PROP(o));
                FREE_HASHTABLE(OBJ_PROP(o));
        }
+       efree(o);
 }
 
 #define httpi_response_new_object _httpi_response_new_object
@@ -219,16 +253,17 @@ zend_object_value _httpi_response_new_object(zend_class_entry *ce TSRMLS_DC)
 {
        zend_object_value ov;
        httpi_response_object *o;
-       
+
        o = ecalloc(sizeof(httpi_response_object), 1);
        o->zo.ce = ce;
-       
-       ALLOC_HASHTABLE(o->zo.properties);
-       zend_hash_init(o->zo.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
-       
+
+       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 *));
+
        ov.handle = zend_objects_store_put(o, httpi_response_destroy_object, NULL, NULL TSRMLS_CC);
        ov.handlers = &httpi_response_object_handlers;
-       
+
        return ov;
 }
 
@@ -253,7 +288,7 @@ zend_function_entry httpi_response_class_methods[] = {
 
        PHP_ME(HTTPi_Response, setGzip, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HTTPi_Response, getGzip, NULL, ZEND_ACC_PUBLIC)
-/*
+
        PHP_ME(HTTPi_Response, setData, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HTTPi_Response, getData, NULL, ZEND_ACC_PUBLIC)
 
@@ -263,8 +298,8 @@ zend_function_entry httpi_response_class_methods[] = {
        PHP_ME(HTTPi_Response, setStream, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HTTPi_Response, getStream, NULL, ZEND_ACC_PUBLIC)
 
-       PHP_ME(HTTPi_Response, send, NULL, ZEND_ACC_PUBLIC)*/
-       
+       PHP_ME(HTTPi_Response, send, NULL, ZEND_ACC_PUBLIC)
+
        {NULL, NULL, NULL}
 };
 
@@ -275,12 +310,12 @@ PHP_METHOD(HTTPi_Response, __construct)
 {
        zend_bool do_cache = 0, do_gzip = 0;
        getObject(httpi_response_object, obj);
-       
+
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bb", &do_cache, &do_gzip)) {
                // throw exception
                return;
        }
-       
+
        UPD_PROP(obj, long, cache, do_cache);
        UPD_PROP(obj, long, gzip, do_gzip);
 }
@@ -293,11 +328,11 @@ PHP_METHOD(HTTPi_Response, setCache)
 {
        zend_bool do_cache = 0;
        getObject(httpi_response_object, obj);
-       
+
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &do_cache)) {
                RETURN_FALSE;
        }
-       
+
        UPD_PROP(obj, long, cache, do_cache);
        RETURN_TRUE;
 }
@@ -310,11 +345,9 @@ PHP_METHOD(HTTPi_Response, getCache)
 {
        zval *do_cache = NULL;
        getObject(httpi_response_object, obj);
-       
-       if (ZEND_NUM_ARGS()) {
-               WRONG_PARAM_COUNT;
-       }
-       
+
+       NO_ARGS;
+
        do_cache = GET_PROP(obj, cache);
        RETURN_BOOL(Z_LVAL_P(do_cache));
 }
@@ -327,11 +360,11 @@ PHP_METHOD(HTTPi_Response, setGzip)
 {
        zend_bool do_gzip = 0;
        getObject(httpi_response_object, obj);
-       
+
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &do_gzip)) {
                RETURN_FALSE;
        }
-       
+
        UPD_PROP(obj, long, gzip, do_gzip);
        RETURN_TRUE;
 }
@@ -344,11 +377,9 @@ PHP_METHOD(HTTPi_Response, getGzip)
 {
        zval *do_gzip = NULL;
        getObject(httpi_response_object, obj);
-       
-       if (ZEND_NUM_ARGS()) {
-               WRONG_PARAM_COUNT;
-       }
-       
+
+       NO_ARGS;
+
        do_gzip = GET_PROP(obj, gzip);
        RETURN_BOOL(Z_LVAL_P(do_gzip));
 }
@@ -363,156 +394,913 @@ PHP_METHOD(HTTPi_Response, setCacheControl)
        int cc_len;
        zend_bool raw = 0;
        getObject(httpi_response_object, obj);
-       
+
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &ccontrol, &cc_len, &raw)) {
                RETURN_FALSE;
        }
-       
-       if ((!raw) && (strcmp(ccontrol, "public") && strcmp(ccontrol, "private") && strcmp(ccontrol, "no-cache"))) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cache-Control '%s' doesn't match public, private or no-cache", ccontrol);
-               RETURN_FALSE;
+
+       if ((!raw) && (strcmp(ccontrol, "public") && strcmp(ccontrol, "private") && strcmp(ccontrol, "no-cache"))) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cache-Control '%s' doesn't match public, private or no-cache", ccontrol);
+               RETURN_FALSE;
+       }
+
+       UPD_PROP(obj, long, raw_cache_header, raw);
+       UPD_PROP(obj, string, cacheControl, ccontrol);
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string HTTPi_Response::getCacheControl()
+ *
+ */
+PHP_METHOD(HTTPi_Response, getCacheControl)
+{
+       zval *ccontrol;
+       getObject(httpi_response_object, obj);
+
+       NO_ARGS;
+
+       ccontrol = GET_PROP(obj, cacheControl);
+       RETURN_STRINGL(Z_STRVAL_P(ccontrol), Z_STRLEN_P(ccontrol), 1);
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi::setContentType(string content_type)
+ *
+ */
+PHP_METHOD(HTTPi_Response, setContentType)
+{
+       char *ctype;
+       int ctype_len;
+       getObject(httpi_response_object, obj);
+
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ctype, &ctype_len)) {
+               RETURN_FALSE;
+       }
+
+       if (!strchr(ctype, '/')) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                       "Content type '%s' doesn't seem to contain a primary and a secondary part", ctype);
+               RETURN_FALSE;
+       }
+
+       UPD_PROP(obj, string, contentType, ctype);
+
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string HTTPi_Response::getContentType()
+ *
+ */
+PHP_METHOD(HTTPi_Response, getContentType)
+{
+       zval *ctype;
+       getObject(httpi_response_object, obj);
+
+       NO_ARGS;
+
+       ctype = GET_PROP(obj, contentType);
+       RETURN_STRINGL(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi_Response::setContentDisposition(string filename[, bool inline = false])
+ *
+ */
+PHP_METHOD(HTTPi_Response, setContentDisposition)
+{
+       char *file;
+       int file_len;
+       zend_bool is_inline = 0;
+       getObject(httpi_response_object, obj);
+
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &file, &file_len, &is_inline)) {
+               RETURN_FALSE;
+       }
+
+       UPD_PROP(obj, string, dispoFile, file);
+       UPD_PROP(obj, long, dispoInline, is_inline);
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto array HTTPi_Response::getContentDisposition()
+ *
+ */
+PHP_METHOD(HTTPi_Response, getContentDisposition)
+{
+       zval *file;
+       zval *is_inline;
+       getObject(httpi_response_object, obj);
+
+       if (ZEND_NUM_ARGS()) {
+               WRONG_PARAM_COUNT;
+       }
+
+       file = GET_PROP(obj, dispoFile);
+       is_inline = GET_PROP(obj, dispoInline);
+
+       array_init(return_value);
+       add_assoc_stringl(return_value, "filename", Z_STRVAL_P(file), Z_STRLEN_P(file), 1);
+       add_assoc_bool(return_value, "inline", Z_LVAL_P(is_inline));
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi_Response::setETag(string etag)
+ *
+ */
+PHP_METHOD(HTTPi_Response, setETag)
+{
+       char *etag;
+       int etag_len;
+       getObject(httpi_response_object, obj);
+
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &etag, &etag_len)) {
+               RETURN_FALSE;
+       }
+
+       UPD_PROP(obj, string, eTag, etag);
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string HTTPi_Response::getETag()
+ *
+ */
+PHP_METHOD(HTTPi_Response, getETag)
+{
+       zval *etag;
+       getObject(httpi_response_object, obj);
+
+       NO_ARGS;
+
+       etag = GET_PROP(obj, eTag);
+       RETURN_STRINGL(Z_STRVAL_P(etag), Z_STRLEN_P(etag), 1);
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi_Response::setData(string data)
+ *
+ */
+PHP_METHOD(HTTPi_Response, setData)
+{
+       zval *the_data;
+       char *etag;
+       getObject(httpi_response_object, obj);
+
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_data)) {
+               RETURN_FALSE;
+       }
+
+       convert_to_string_ex(&the_data);
+       SET_PROP(obj, data, the_data);
+       UPD_PROP(obj, long, lastModified, http_lmod(the_data, SEND_DATA));
+       UPD_PROP(obj, long, send_mode, SEND_DATA);
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string HTTPi_Response::getData()
+ *
+ */
+PHP_METHOD(HTTPi_Response, getData)
+{
+       zval *the_data;
+       getObject(httpi_response_object, obj);
+
+       NO_ARGS;
+
+       the_data = GET_PROP(obj, data);
+       RETURN_STRINGL(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), 1);
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi_Response::setStream(resource stream)
+ *
+ */
+PHP_METHOD(HTTPi_Response, setStream)
+{
+       zval *the_stream;
+       php_stream *the_real_stream;
+       char *etag;
+       getObject(httpi_response_object, obj);
+
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &the_stream)) {
+               RETURN_FALSE;
+       }
+
+       php_stream_from_zval(the_real_stream, &the_stream);
+
+       SET_PROP(obj, stream, the_stream);
+       UPD_PROP(obj, long, lastModified, http_lmod(the_real_stream, SEND_RSRC));
+       UPD_PROP(obj, long, send_mode, SEND_RSRC);
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto resource HTTPi_Response::getStream()
+ *
+ */
+PHP_METHOD(HTTPi_Response, getStream)
+{
+       zval *the_stream;
+       getObject(httpi_response_object, obj);
+
+       NO_ARGS;
+
+       the_stream = GET_PROP(obj, stream);
+       RETURN_RESOURCE(Z_LVAL_P(the_stream));
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi_Response::setFile(string file)
+ *
+ */
+PHP_METHOD(HTTPi_Response, setFile)
+{
+       zval *the_file;
+       getObject(httpi_response_object, obj);
+
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_file)) {
+               RETURN_FALSE;
+       }
+
+       convert_to_string_ex(&the_file);
+
+       UPD_PROP(obj, string, file, Z_STRVAL_P(the_file));
+       UPD_PROP(obj, long, lastModified, http_lmod(the_file, -1));
+       UPD_PROP(obj, long, send_mode, -1);
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string HTTPi_Response::getFile()
+ *
+ */
+PHP_METHOD(HTTPi_Response, getFile)
+{
+       zval *the_file;
+       getObject(httpi_response_object, obj);
+
+       NO_ARGS;
+
+       the_file = GET_PROP(obj, file);
+       RETURN_STRINGL(Z_STRVAL_P(the_file), Z_STRLEN_P(the_file), 1);
+}
+/* }}} */
+
+PHP_METHOD(HTTPi_Response, send)
+{
+       zval *do_cache, *do_gzip;
+       getObject(httpi_response_object, obj);
+
+       do_cache = GET_PROP(obj, cache);
+       do_gzip  = GET_PROP(obj, gzip);
+
+       /* caching */
+       if (Z_LVAL_P(do_cache)) {
+               zval *cctrl, *etag, *lmod, *ccraw;
+
+               etag  = GET_PROP(obj, eTag);
+               lmod  = GET_PROP(obj, lastModified);
+               cctrl = GET_PROP(obj, cacheControl);
+               ccraw = GET_PROP(obj, raw_cache_header);
+
+               if (Z_LVAL_P(ccraw)) {
+                       http_cache_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag), Z_STRVAL_P(cctrl), Z_STRLEN_P(cctrl));
+                       http_cache_last_modified(Z_LVAL_P(lmod), Z_LVAL_P(lmod) ? Z_LVAL_P(lmod) : time(NULL), Z_STRVAL_P(cctrl), Z_STRLEN_P(cctrl));
+               } else {
+                       char cc_header[42] = {0};
+                       sprintf(cc_header, "%s, must-revalidate, max-age=0", Z_STRVAL_P(cctrl));
+                       http_cache_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag), cc_header, strlen(cc_header));
+                       http_cache_last_modified(Z_LVAL_P(lmod), Z_LVAL_P(lmod) ? Z_LVAL_P(lmod) : time(NULL), cc_header, strlen(cc_header));
+               }
+       }
+
+       /* gzip */
+       if (Z_LVAL_P(do_gzip)) {
+               /* ... */
+       }
+
+       /* content type */
+       {
+               zval *ctype = GET_PROP(obj, contentType);
+               if (Z_STRLEN_P(ctype)) {
+                       http_send_content_type(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype));
+               } else {
+                       http_send_content_type("application/x-octetstream", sizeof("application/x-octetstream") - 1);
+               }
+       }
+
+       /* content disposition */
+       {
+               zval *dispo_file = GET_PROP(obj, dispoFile);
+               if (Z_STRLEN_P(dispo_file)) {
+                       zval *dispo_inline = GET_PROP(obj, dispoInline);
+                       http_send_content_disposition(Z_STRVAL_P(dispo_file), Z_STRLEN_P(dispo_file), Z_LVAL_P(dispo_inline));
+               }
+       }
+
+       /* send */
+       {
+               zval *send_mode = GET_PROP(obj, send_mode);
+               switch (Z_LVAL_P(send_mode))
+               {
+                       case SEND_DATA:
+                       {
+                               RETURN_SUCCESS(http_send_data(GET_PROP(obj, data)));
+                       }
+
+                       case SEND_RSRC:
+                       {
+                               php_stream *the_real_stream;
+                               zval *the_stream = GET_PROP(obj, stream);
+                               php_stream_from_zval(the_real_stream, &the_stream);
+                               RETURN_SUCCESS(http_send_stream(the_real_stream));
+                       }
+
+                       default:
+                       {
+                               RETURN_SUCCESS(http_send_file(GET_PROP(obj, file)));
+                       }
+               }
+       }
+}
+/* }}} */
+
+/* {{{ HTTPi_Request */
+#ifdef HTTP_HAVE_CURL
+
+zend_class_entry *httpi_request_ce;
+static zend_object_handlers httpi_request_object_handlers;
+
+typedef struct {
+       zend_object zo;
+       CURL *ch;
+} httpi_request_object;
+
+#define httpi_request_declare_default_properties(ce) _httpi_request_declare_default_properties(ce TSRMLS_CC)
+static inline void _httpi_request_declare_default_properties(zend_class_entry *ce TSRMLS_DC)
+{
+       DCL_PROP_N(PROTECTED, options);
+       DCL_PROP_N(PROTECTED, responseInfo);
+       DCL_PROP_N(PROTECTED, responseData);
+
+       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, postData, "");
+}
+
+#define httpi_request_destroy_object _httpi_request_destroy_object
+void _httpi_request_destroy_object(void *object, zend_object_handle handle TSRMLS_DC)
+{
+       zend_objects_destroy_object(object, handle TSRMLS_CC);
+}
+
+#define httpi_request_free_object _httpi_request_free_object
+void _httpi_request_free_object(zend_object /* void */ *object TSRMLS_DC)
+{
+       httpi_request_object *o = (httpi_request_object *) object;
+       
+       if (OBJ_PROP(o)) {
+               zend_hash_destroy(OBJ_PROP(o));
+               FREE_HASHTABLE(OBJ_PROP(o));
+       }
+       if (o->ch) {
+               curl_easy_cleanup(o->ch);
+               o->ch = NULL;
+       }
+       efree(o);
+}
+
+#define httpi_request_new_object _httpi_request_new_object
+zend_object_value _httpi_request_new_object(zend_class_entry *ce TSRMLS_DC)
+{
+       zend_object_value ov;
+       httpi_request_object *o;
+
+       o = ecalloc(sizeof(httpi_request_object), 1);
+       o->zo.ce = ce;
+       o->ch = curl_easy_init();
+
+       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 *));
+
+       ov.handle = zend_objects_store_put(o, httpi_request_destroy_object, httpi_request_free_object, NULL TSRMLS_CC);
+       ov.handlers = &httpi_request_object_handlers;
+
+       return ov;
+}
+
+zend_function_entry httpi_request_class_methods[] = {
+       PHP_ME(HTTPi_Request, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(HTTPi_Request, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
+
+       PHP_ME(HTTPi_Request, setOptions, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Request, getOptions, NULL, ZEND_ACC_PUBLIC)
+
+       PHP_ME(HTTPi_Request, setMethod, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Request, getMethod, NULL, ZEND_ACC_PUBLIC)
+
+       PHP_ME(HTTPi_Request, setURL, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Request, getURL, NULL, ZEND_ACC_PUBLIC)
+
+       PHP_ME(HTTPi_Request, setContentType, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Request, getContentType, NULL, ZEND_ACC_PUBLIC)
+
+       PHP_ME(HTTPi_Request, setQueryData, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Request, getQueryData, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Request, addQueryData, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Request, unsetQueryData, NULL, ZEND_ACC_PUBLIC)
+/*
+       PHP_ME(HTTPi_Request, setPostData, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Request, addPostData, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Request, unsetPostData, NULL, ZEND_ACC_PUBLIC)
+
+       PHP_ME(HTTPi_Request, addPostFile, NULL, ZEND_ACC_PUBLIC)
+*/
+       PHP_ME(HTTPi_Request, send, NULL, ZEND_ACC_PUBLIC)
+
+       PHP_ME(HTTPi_Request, getResponseData, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Request, getResponseHeaders, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Request, getResponseBody, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Request, getResponseInfo, NULL, ZEND_ACC_PUBLIC)
+
+       {NULL, NULL, NULL}
+};
+
+/* {{{ proto void HTTPi_Request::__construct([string url[, long request_method = HTTP_GET]])
+ *
+ */
+PHP_METHOD(HTTPi_Request, __construct)
+{
+       char *URL = NULL;
+       int URL_len;
+       long meth = -1;
+       zval *info, *opts, *resp;
+       getObject(httpi_request_object, obj);
+
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &URL, &URL_len, &meth)) {
+               return;
+       }
+
+       INIT_PARR(obj, options);
+       INIT_PARR(obj, responseInfo);
+       INIT_PARR(obj, responseData);
+
+       if (URL) {
+               UPD_PROP(obj, string, url, URL);
+       }
+       if (meth > -1) {
+               UPD_PROP(obj, long, method, meth);
+       }
+}
+/* }}} */
+
+/* {{{ proto void HTTPi_Request::__destruct()
+ *
+ */
+PHP_METHOD(HTTPi_Request, __destruct)
+{
+       getObject(httpi_request_object, obj);
+       
+       NO_ARGS;
+       
+       FREE_PARR(obj, options);
+       FREE_PARR(obj, responseInfo);
+       FREE_PARR(obj, responseData);
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi_Request::setOptions(array options)
+ *
+ */
+PHP_METHOD(HTTPi_Request, setOptions)
+{
+       zval *opts, *old_opts, **opt;
+       getObject(httpi_request_object, obj);
+
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &opts)) {
+               RETURN_FALSE;
+       }
+
+       old_opts = GET_PROP(obj, options);
+
+       /* headers and cookies need extra attention -- thus cannot use zend_hash_merge() or php_array_merge() directly */
+       for (   zend_hash_internal_pointer_reset(Z_ARRVAL_P(opts));
+                       zend_hash_get_current_data(Z_ARRVAL_P(opts), (void **) &opt) == SUCCESS;
+                       zend_hash_move_forward(Z_ARRVAL_P(opts))) {
+               char *key;
+               long idx;
+               if (HASH_KEY_IS_STRING == zend_hash_get_current_key(Z_ARRVAL_P(opts), &key, &idx, 0)) {
+                       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);
+               }
+       }
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto array HTTPi_Request::getOptions()
+ *
+ */
+PHP_METHOD(HTTPi_Request, getOptions)
+{
+       zval *opts;
+       getObject(httpi_request_object, obj);
+
+       NO_ARGS;
+
+       opts = GET_PROP(obj, options);
+       array_init(return_value);
+       array_copy(opts, return_value);
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi_Request::setURL(string url)
+ *
+ */
+PHP_METHOD(HTTPi_Request, setURL)
+{
+       char *URL = NULL;
+       int URL_len;
+       getObject(httpi_request_object, obj);
+
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &URL, &URL_len)) {
+               RETURN_FALSE;
+       }
+
+       UPD_PROP(obj, string, url, URL);
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string HTTPi_Request::getUrl()
+ *
+ */
+PHP_METHOD(HTTPi_Request, getURL)
+{
+       zval *URL;
+       getObject(httpi_request_object, obj);
+
+       NO_ARGS;
+
+       URL = GET_PROP(obj, url);
+       RETURN_STRINGL(Z_STRVAL_P(URL), Z_STRLEN_P(URL), 1);
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi_Request::setMethod(long request_method)
+ *
+ */
+PHP_METHOD(HTTPi_Request, setMethod)
+{
+       long meth;
+       getObject(httpi_request_object, obj);
+
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &meth)) {
+               RETURN_FALSE;
+       }
+
+       UPD_PROP(obj, long, method, meth);
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto long HTTPi_Request::getMethod()
+ *
+ */
+PHP_METHOD(HTTPi_Request, getMethod)
+{
+       zval *meth;
+       getObject(httpi_request_object, obj);
+
+       NO_ARGS;
+
+       meth = GET_PROP(obj, method);
+       RETURN_LONG(Z_LVAL_P(meth));
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi_Request::setContentType(string content_type)
+ *
+ */
+PHP_METHOD(HTTPi_Request, setContentType)
+{
+       char *ctype;
+       int ct_len;
+       getObject(httpi_request_object, obj);
+
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ctype, &ct_len)) {
+               RETURN_FALSE;
+       }
+
+       if (!strchr(ctype, '/')) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                       "Content-Type '%s' doesn't seem to contain a primary and a secondary part",
+                       ctype);
+               RETURN_FALSE;
+       }
+
+       UPD_PROP(obj, string, contentType, ctype);
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string HTTPi_Request::getContentType()
+ *
+ */
+PHP_METHOD(HTTPi_Request, getContentType)
+{
+       zval *ctype;
+       getObject(httpi_request_object, obj);
+
+       NO_ARGS;
+
+       ctype = GET_PROP(obj, contentType);
+       RETURN_STRINGL(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi_Request::setQueryData(mixed query_data)
+ *
+ */
+PHP_METHOD(HTTPi_Request, setQueryData)
+{
+       zval *qdata;
+       getObject(httpi_request_object, obj);
+
+       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)) {
+               smart_str qstr = {0};
+               HTTP_URL_ARGSEP_OVERRIDE;
+               if (SUCCESS != php_url_encode_hash_ex(HASH_OF(qdata), &qstr, NULL, 0, NULL, 0, NULL, 0, NULL TSRMLS_CC)) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't encode query data");
+                       if (qstr.c) {
+                               efree(qstr.c);
+                       }
+                       HTTP_URL_ARGSEP_RESTORE;
+                       RETURN_FALSE;
+               }
+               HTTP_URL_ARGSEP_RESTORE;
+               smart_str_0(&qstr);
+               UPD_PROP(obj, string, queryData, qstr.c);
+               efree(qstr.c);
+               RETURN_TRUE;
        }
-       
-       UPD_PROP(obj, long, raw_cache_header, raw);
-       UPD_PROP(obj, string, cacheControl, ccontrol);
+
+       convert_to_string(qdata);
+       UPD_PROP(obj, string, queryData, Z_STRVAL_P(qdata));
        RETURN_TRUE;
 }
 /* }}} */
 
-/* {{{ proto string HTTPi_Response::getCacheControl()
+/* {{{ proto string HTTPi_Request::getQueryData()
  *
  */
-PHP_METHOD(HTTPi_Response, getCacheControl)
+PHP_METHOD(HTTPi_Request, getQueryData)
 {
-       zval *ccontrol;
-       getObject(httpi_response_object, obj);
-       
-       if (ZEND_NUM_ARGS()) {
-               WRONG_PARAM_COUNT;
-       }
-       
-       ccontrol = GET_PROP(obj, cacheControl);
-       RETURN_STRINGL(Z_STRVAL_P(ccontrol), Z_STRLEN_P(ccontrol), 1);
+       zval *qdata;
+       getObject(httpi_request_object, obj);
+
+       NO_ARGS;
+
+       qdata = GET_PROP(obj, queryData);
+       RETURN_STRINGL(Z_STRVAL_P(qdata), Z_STRLEN_P(qdata), 1);
 }
 /* }}} */
 
-/* {{{ proto bool HTTPi::setContentType(string content_type)
+/* {{{ proto bool HTTPi_Request::addQueryData(array query_params)
  *
  */
-PHP_METHOD(HTTPi_Response, setContentType)
+PHP_METHOD(HTTPi_Request, addQueryData)
 {
-       char *ctype;
-       int ctype_len;
-       getObject(httpi_response_object, obj);
-       
-       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ctype, &ctype_len)) {
+       zval *qdata, *old_qdata;
+       smart_str qstr = {0};
+       char *separator;
+       getObject(httpi_request_object, obj);
+
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &qdata)) {
                RETURN_FALSE;
        }
-       
-       if (!strchr(ctype, '/')) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Content type '%s' doesn't seem to contain a primary and secondary part", ctype);
+
+       old_qdata = GET_PROP(obj, queryData);
+       if (Z_STRLEN_P(old_qdata)) {
+               smart_str_appendl(&qstr, Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata));
+       }
+
+       HTTP_URL_ARGSEP_OVERRIDE;
+       if (SUCCESS != php_url_encode_hash_ex(HASH_OF(qdata), &qstr, NULL, 0, NULL, 0, NULL, 0, NULL TSRMLS_CC)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't encode query data");
+               if (qstr.c) {
+                       efree(qstr.c);
+               }
+               HTTP_URL_ARGSEP_RESTORE;
                RETURN_FALSE;
        }
-       
-       UPD_PROP(obj, string, contentType, ctype);
+       HTTP_URL_ARGSEP_RESTORE;
+
+       smart_str_0(&qstr);
+
+       UPD_PROP(obj, string, queryData, qstr.c);
+       efree(qstr.c);
        RETURN_TRUE;
 }
 /* }}} */
 
-/* {{{ proto string HTTPi_Response::getContentType()
+/* {{{ proto void HTTPi_Request::unsetQueryData()
  *
  */
-PHP_METHOD(HTTPi_Response, getContentType)
+PHP_METHOD(HTTPi_Request, unsetQueryData)
 {
-       zval *ctype;
-       getObject(httpi_response_object, obj);
-       
-       if (ZEND_NUM_ARGS()) {
-               WRONG_PARAM_COUNT;
-       }
-       
-       ctype = GET_PROP(obj, contentType);
-       RETURN_STRINGL(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+       getObject(httpi_request_object, obj);
+
+       NO_ARGS;
+
+       UPD_PROP(obj, string, queryData, "");
 }
 /* }}} */
 
-/* {{{ proto bool HTTPi_Response::setContentDisposition(string filename[, bool inline = false])
+/* {{{ proto array HTTPi_Request::getResponseData()
  *
  */
-PHP_METHOD(HTTPi_Response, setContentDisposition)
+PHP_METHOD(HTTPi_Request, getResponseData)
 {
-       char *file;
-       int file_len;
-       zend_bool is_inline = 0;
-       getObject(httpi_response_object, obj);
-       
-       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &file, &file_len, &is_inline)) {
-               RETURN_FALSE;
-       }
-       
-       UPD_PROP(obj, string, dispoFile, file);
-       UPD_PROP(obj, long, dispoInline, is_inline);
-       RETURN_TRUE;
+       zval *data;
+       getObject(httpi_request_object, obj);
+
+       NO_ARGS;
+
+       data = GET_PROP(obj, responseData);
+       array_init(return_value);
+       array_copy(data, return_value);
 }
 /* }}} */
 
-/* {{{ proto array HTTPi_Response::getContentDisposition()
+/* {{{ proto array HTTPi_Request::getResponseHeaders()
  *
  */
-PHP_METHOD(HTTPi_Response, getContentDisposition)
+PHP_METHOD(HTTPi_Request, getResponseHeaders)
 {
-       zval *file;
-       zval *is_inline;
-       getObject(httpi_response_object, obj);
-       
-       if (ZEND_NUM_ARGS()) {
-               WRONG_PARAM_COUNT;
-       }
-       
-       file = GET_PROP(obj, dispoFile);
-       is_inline = GET_PROP(obj, dispoInline);
-       
+       zval *data, **headers;
+       getObject(httpi_request_object, obj);
+
+       NO_ARGS;
+
        array_init(return_value);
-       add_assoc_stringl(return_value, "filename", Z_STRVAL_P(file), Z_STRLEN_P(file), 1);
-       add_assoc_bool(return_value, "inline", Z_LVAL_P(is_inline));
+       data = GET_PROP(obj, responseData);
+       if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) {
+               array_copy(*headers, return_value);
+       }
 }
 /* }}} */
 
-/* {{{ proto bool HTTPi_Response::setETag(string etag)
+/* {{{ proto string HTTPi_Request::getResponseBody()
  *
  */
-PHP_METHOD(HTTPi_Response, setETag)
+PHP_METHOD(HTTPi_Request, getResponseBody)
 {
-       char *etag;
-       int etag_len;
-       getObject(httpi_response_object, obj);
-       
-       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &etag, &etag_len)) {
-               RETURN_FALSE;
+       zval *data, **body;
+       getObject(httpi_request_object, obj);
+
+       NO_ARGS;
+
+       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 {
+               Z_TYPE_P(return_value) = IS_NULL;
        }
-       
-       UPD_PROP(obj, string, eTag, etag);
-       RETURN_TRUE;
 }
 /* }}} */
 
-/* {{{ proto string HTTPi_Response::getETag()
+/* {{{ proto array HTTPi_Request::getResponseInfo()
  *
  */
-PHP_METHOD(HTTPi_Response, getETag)
+PHP_METHOD(HTTPi_Request, getResponseInfo)
 {
-       zval *etag;
-       getObject(httpi_response_object, obj);
-       
-       if (ZEND_NUM_ARGS()) {
-               WRONG_PARAM_COUNT;
+       zval *info;
+       getObject(httpi_request_object, obj);
+
+       NO_ARGS;
+
+       info = GET_PROP(obj, responseInfo);
+       array_init(return_value);
+       array_copy(info, return_value);
+}
+/* }}}*/
+
+/* {{{ proto bool HTTPi_Request::send()
+ *
+ */
+PHP_METHOD(HTTPi_Request, send)
+{
+       STATUS status = FAILURE;
+       zval *meth, *URL, *qdata, *opts, *info, *resp;
+       char *response_data, *request_uri, *uri;
+       size_t response_len;
+       getObject(httpi_request_object, obj);
+
+       NO_ARGS;
+
+       if ((!obj->ch) && (!(obj->ch = curl_easy_init()))) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initilaize cURL");
+               RETURN_FALSE;
        }
-       
-       etag = GET_PROP(obj, eTag);
-       RETURN_STRINGL(Z_STRVAL_P(etag), Z_STRLEN_P(etag), 1);
+
+       meth  = GET_PROP(obj, method);
+       URL   = GET_PROP(obj, url);
+       qdata = GET_PROP(obj, queryData);
+       opts  = GET_PROP(obj, options);
+       info  = GET_PROP(obj, responseInfo);
+       resp  = GET_PROP(obj, responseData);
+
+       uri = http_absolute_uri(Z_STRVAL_P(URL), NULL);
+       request_uri = ecalloc(HTTP_URI_MAXLEN + 1, 1);
+       strcpy(request_uri, uri);
+       efree(uri);
+
+       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:
+                       status = http_get_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &response_data, &response_len);
+               break;
+
+               case HTTP_HEAD:
+                       status = http_head_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &response_data, &response_len);
+               break;
+
+               case HTTP_POST:
+               break;
+
+               default:
+               break;
+       }
+
+       efree(request_uri);
+
+       /* final data handling */
+       if (status != SUCCESS) {
+               RETURN_FALSE;
+       } else {
+               zval *zheaders, *zbody;
+
+               MAKE_STD_ZVAL(zbody);
+               MAKE_STD_ZVAL(zheaders)
+               array_init(zheaders);
+
+               if (SUCCESS != http_split_response_ex(response_data, response_len, zheaders, zbody)) {
+                       zval_dtor(zheaders);
+                       efree(zheaders),
+                       efree(zbody);
+                       efree(response_data);
+                       RETURN_FALSE;
+               }
+
+               add_assoc_zval(resp, "headers", zheaders);
+               add_assoc_zval(resp, "body", zbody);
+
+               efree(response_data);
+
+               RETURN_TRUE;
+       }
+       /* */
 }
 /* }}} */
 
+#endif /* HTTP_HAVE_CURL */
+/* }}} */
+
 #endif /* ZEND_ENGINE_2 */
 
 /* {{{ http_module_entry */
@@ -723,6 +1511,47 @@ PHP_FUNCTION(http_send_last_modified)
 }
 /* }}} */
 
+/* {{{ proto bool http_send_content_type([string content_type = 'application/x-octetstream'])
+ *
+ * Sets the content type.
+ *
+ */
+PHP_FUNCTION(http_send_content_type)
+{
+       char *ct;
+       int ct_len = 0;
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &ct, &ct_len) != SUCCESS) {
+               RETURN_FALSE;
+       }
+
+       if (!ct_len) {
+               RETURN_SUCCESS(http_send_content_type("application/x-octetstream", sizeof("application/x-octetstream") - 1));
+       }
+       RETURN_SUCCESS(http_send_content_type(ct, ct_len));
+}
+/* }}} */
+
+/* {{{ proto bool http_send_content_disposition(string filename[, bool inline = false])
+ *
+ * Set the Content Disposition.  The Content-Disposition header is very useful
+ * if the data actually sent came from a file or something similar, that should
+ * be "saved" by the client/user (i.e. by browsers "Save as..." popup window).
+ *
+ */
+PHP_FUNCTION(http_send_content_disposition)
+{
+       char *filename;
+       int f_len;
+       zend_bool send_inline = 0;
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &filename, &f_len, &send_inline) != SUCCESS) {
+               RETURN_FALSE;
+       }
+       RETURN_SUCCESS(http_send_content_disposition(filename, f_len, send_inline));
+}
+/* }}} */
+
 /* {{{ proto bool http_match_modified([int timestamp])
  *
  * Matches the given timestamp against the clients "If-Modified-Since" resp.
@@ -804,17 +1633,7 @@ PHP_FUNCTION(http_cache_last_modified)
                send_modified = last_modified;
        }
 
-       http_send_header("Cache-Control: private, must-revalidate, max-age=0");
-
-       if (http_modified_match("HTTP_IF_MODIFIED_SINCE", last_modified)) {
-               if (SUCCESS == http_send_status(304)) {
-                       zend_bailout();
-               } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified");
-                       RETURN_FALSE;
-               }
-       }
-       RETURN_SUCCESS(http_send_last_modified(send_modified));
+       RETURN_SUCCESS(http_cache_last_modified(last_modified, send_modified, HTTP_DEFAULT_CACHECONTROL, sizeof(HTTP_DEFAULT_CACHECONTROL) - 1));
 }
 /* }}} */
 
@@ -838,25 +1657,7 @@ PHP_FUNCTION(http_cache_etag)
                RETURN_FALSE;
        }
 
-       http_send_header("Cache-Control: private, must-revalidate, max-age=0");
-
-       if (etag_len) {
-               http_send_etag(etag, etag_len);
-               if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
-                       if (SUCCESS == http_send_status(304)) {
-                               zend_bailout();
-                       } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified");
-                               RETURN_FALSE;
-                       }
-               }
-       }
-
-       /* if no etag is given and we didn't already start ob_etaghandler -- start it */
-       if (!HTTP_G(etag_started)) {
-               RETURN_BOOL(HTTP_G(etag_started) = (SUCCESS == http_start_ob_handler(_http_ob_etaghandler, "ob_etaghandler", 4096, 1)));
-       }
-       RETURN_TRUE;
+       RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, sizeof(HTTP_DEFAULT_CACHECONTROL) - 1));
 }
 /* }}} */
 
@@ -881,7 +1682,7 @@ PHP_FUNCTION(ob_httpetaghandler)
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "ob_httpetaghandler can only be used once");
                        RETURN_STRINGL(data, data_len, 1);
                }
-               http_send_header("Cache-Control: private, must-revalidate, max-age=0");
+               http_send_header("Cache-Control: " HTTP_DEFAULT_CACHECONTROL);
                HTTP_G(etag_started) = 1;
        }
 
@@ -1021,68 +1822,6 @@ PHP_FUNCTION(http_send_stream)
 }
 /* }}} */
 
-/* {{{ proto bool http_content_type([string content_type = 'application/x-octetstream'])
- *
- * Sets the content type.
- *
- */
-PHP_FUNCTION(http_content_type)
-{
-       char *ct, *content_type;
-       int ct_len = 0;
-
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &ct, &ct_len) != SUCCESS) {
-               RETURN_FALSE;
-       }
-
-       if (!ct_len) {
-               RETURN_SUCCESS(http_send_header("Content-Type: application/x-octetstream"));
-       }
-
-       /* remember for multiple ranges */
-       if (HTTP_G(ctype)) {
-               efree(HTTP_G(ctype));
-       }
-       HTTP_G(ctype) = estrndup(ct, ct_len);
-
-       content_type = (char *) emalloc(strlen("Content-Type: ") + ct_len + 1);
-       sprintf(content_type, "Content-Type: %s", ct);
-
-       RETVAL_BOOL(SUCCESS == http_send_header(content_type));
-       efree(content_type);
-}
-/* }}} */
-
-/* {{{ proto bool http_content_disposition(string filename[, bool inline = false])
- *
- * Set the Content Disposition.  The Content-Disposition header is very useful
- * if the data actually sent came from a file or something similar, that should
- * be "saved" by the client/user (i.e. by browsers "Save as..." popup window).
- *
- */
-PHP_FUNCTION(http_content_disposition)
-{
-       char *filename, *header;
-       int f_len;
-       zend_bool send_inline = 0;
-
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &filename, &f_len, &send_inline) != SUCCESS) {
-               RETURN_FALSE;
-       }
-
-       if (send_inline) {
-               header = (char *) emalloc(strlen("Content-Disposition: inline; filename=\"\"") + f_len + 1);
-               sprintf(header, "Content-Disposition: inline; filename=\"%s\"", filename);
-       } else {
-               header = (char *) emalloc(strlen("Content-Disposition: attachment; filename=\"\"") + f_len + 1);
-               sprintf(header, "Content-Disposition: attachment; filename=\"%s\"", filename);
-       }
-
-       RETVAL_BOOL(SUCCESS == http_send_header(header));
-       efree(header);
-}
-/* }}} */
-
 /* {{{ proto string http_chunked_decode(string encoded)
  *
  * This function decodes a string that was HTTP-chunked encoded.
@@ -1532,11 +2271,7 @@ PHP_MINIT_FUNCTION(http)
 {
        ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL);
        REGISTER_INI_ENTRIES();
-       /*
-       REGISTER_LONG_CONSTANT("HTTP_GET", HTTP_GET, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("HTTP_HEAD", HTTP_HEAD, CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("HTTP_POST", HTTP_POST, CONST_CS | CONST_PERSISTENT);
-       */
+
 #ifdef HTTP_HAVE_CURL
        REGISTER_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST, CONST_CS | CONST_PERSISTENT);
@@ -1546,7 +2281,13 @@ PHP_MINIT_FUNCTION(http)
 #ifdef ZEND_ENGINE_2
        HTTP_REGISTER_CLASS(HTTPi, httpi, NULL, ZEND_ACC_FINAL_CLASS);
        HTTP_REGISTER_CLASS_EX(HTTPi_Response, httpi_response, NULL, 0);
-#endif
+#      ifdef HTTP_HAVE_CURL
+       HTTP_REGISTER_CLASS_EX(HTTPi_Request, httpi_request, NULL, 0);
+       REGISTER_LONG_CONSTANT("HTTP_GET", HTTP_GET, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("HTTP_HEAD", HTTP_HEAD, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("HTTP_POST", HTTP_POST, CONST_CS | CONST_PERSISTENT);
+#      endif /* HTTP_HAVE_CURL */
+#endif /* ZEND_ENGINE_2 */
        return SUCCESS;
 }
 /* }}} */