* HTTPi_Response mostly done
[m6w6/ext-http] / http.c
diff --git a/http.c b/http.c
index 608586c5df337cf56bee79ea2414d3d7e56b55d6..bdc64601245b9c18e9309a8612b2dec4e9d0dfe7 100644 (file)
--- a/http.c
+++ b/http.c
@@ -76,7 +76,6 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
 ZEND_GET_MODULE(http)
 #endif
 
-
 /* {{{ http_functions[] */
 function_entry http_functions[] = {
        PHP_FE(http_date, NULL)
@@ -115,6 +114,687 @@ function_entry http_functions[] = {
 };
 /* }}} */
 
+#define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v))
+#define HASH_ORNULL(z) ((z) ? Z_ARRVAL_P(z) : NULL)
+
+#ifdef ZEND_ENGINE_2
+
+#      define HTTP_REGISTER_CLASS_EX(classname, name, parent, flags) \
+       { \
+               zend_class_entry ce; \
+               INIT_CLASS_ENTRY(ce, #classname, name## _class_methods); \
+               ce.create_object = name## _new_object; \
+               name## _ce = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
+               name## _ce->ce_flags |= flags;  \
+               memcpy(& name## _object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \
+               name## _object_handlers.clone_obj = NULL; \
+               name## _declare_default_properties(name## _ce); \
+       }
+
+#      define HTTP_REGISTER_CLASS(classname, name, parent, flags) \
+       { \
+               zend_class_entry ce; \
+               INIT_CLASS_ENTRY(ce, #classname, name## _class_methods); \
+               ce.create_object = NULL; \
+               name## _ce = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
+               name## _ce->ce_flags |= flags;  \
+       }
+
+#      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 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)
+
+/* {{{ HTTPi */
+
+zend_class_entry *httpi_ce;
+
+#define HTTPi_ME(me, al, ai) ZEND_FENTRY(me, ZEND_FN(al), ai, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
+
+zend_function_entry httpi_class_methods[] = {
+       HTTPi_ME(date, http_date, NULL)
+       HTTPi_ME(absoluteURI, http_absolute_uri, NULL)
+       HTTPi_ME(negotiateLanguage, http_negotiate_language, NULL)
+       HTTPi_ME(negotiateCharset, http_negotiate_charset, NULL)
+       HTTPi_ME(redirect, http_redirect, NULL)
+       HTTPi_ME(sendStatus, http_send_status, NULL)
+       HTTPi_ME(sendLastModified, http_send_last_modified, NULL)
+       HTTPi_ME(matchModified, http_match_modified, NULL)
+       HTTPi_ME(matchEtag, http_match_etag, NULL)
+       HTTPi_ME(cacheLastModified, http_cache_last_modified, NULL)
+       HTTPi_ME(cacheEtag, http_cache_etag, NULL)
+       HTTPi_ME(chunkedDecode, http_chunked_decode, NULL)
+       HTTPi_ME(splitResponse, http_split_response, NULL)
+       HTTPi_ME(parseHeaders, http_parse_headers, NULL)
+       HTTPi_ME(getRequestHeaders, http_get_request_headers, NULL)
+#ifdef HTTP_HAVE_CURL
+       HTTPi_ME(get, http_get, http_request_info_ref_3)
+       HTTPi_ME(head, http_head, http_request_info_ref_3)
+       HTTPi_ME(postData, http_post_data, http_request_info_ref_4)
+       HTTPi_ME(postArray, http_post_array, http_request_info_ref_4)
+#endif
+       HTTPi_ME(authBasic, http_auth_basic, NULL)
+       HTTPi_ME(authBasicCallback, http_auth_basic_cb, NULL)
+       {NULL, NULL, NULL}
+};
+/* }}} HTTPi */
+
+/* {{{ HTTPi_Response */
+
+zend_class_entry *httpi_response_ce;
+static zend_object_handlers httpi_response_object_handlers;
+
+typedef struct {
+       zend_object     zo;
+} httpi_response_object;
+
+#define httpi_response_declare_default_properties(ce) _httpi_response_declare_default_properties(ce TSRMLS_CC)
+static inline void _httpi_response_declare_default_properties(zend_class_entry *ce TSRMLS_DC)
+{
+       DCL_PROP(PROTECTED, string, contentType, "application/x-octetstream");
+       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, size, 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
+void _httpi_response_destroy_object(void *object, zend_object_handle handle TSRMLS_DC)
+{
+       httpi_response_object *o = object;
+       if (OBJ_PROP(o)) {
+               zend_hash_destroy(OBJ_PROP(o));
+               FREE_HASHTABLE(OBJ_PROP(o));
+       }
+}
+
+#define httpi_response_new_object _httpi_response_new_object
+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);
+
+       ov.handle = zend_objects_store_put(o, httpi_response_destroy_object, NULL, NULL TSRMLS_CC);
+       ov.handlers = &httpi_response_object_handlers;
+
+       return ov;
+}
+
+zend_function_entry httpi_response_class_methods[] = {
+       PHP_ME(HTTPi_Response, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+/*     PHP_ME(HTTPi_Response, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
+*/
+       PHP_ME(HTTPi_Response, setETag, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Response, getETag, NULL, ZEND_ACC_PUBLIC)
+
+       PHP_ME(HTTPi_Response, setContentDisposition, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Response, getContentDisposition, NULL, ZEND_ACC_PUBLIC)
+
+       PHP_ME(HTTPi_Response, setContentType, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Response, getContentType, NULL, ZEND_ACC_PUBLIC)
+
+       PHP_ME(HTTPi_Response, setCache, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Response, getCache, NULL, ZEND_ACC_PUBLIC)
+
+       PHP_ME(HTTPi_Response, setCacheControl, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Response, getCacheControl, NULL, ZEND_ACC_PUBLIC)
+
+       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)
+
+       PHP_ME(HTTPi_Response, setFile, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HTTPi_Response, getFile, NULL, ZEND_ACC_PUBLIC)
+
+       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, getSize, NULL, ZEND_ACC_PUBLIC)
+
+       {NULL, NULL, NULL}
+};
+
+/* {{{ proto void HTTPi_Response::__construct(bool cache, bool gzip)
+ *
+ */
+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);
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi_Response::setCache(bool cache)
+ *
+ */
+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;
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi_Response::getCache()
+ *
+ */
+PHP_METHOD(HTTPi_Response, getCache)
+{
+       zval *do_cache = NULL;
+       getObject(httpi_response_object, obj);
+
+       if (ZEND_NUM_ARGS()) {
+               WRONG_PARAM_COUNT;
+       }
+
+       do_cache = GET_PROP(obj, cache);
+       RETURN_BOOL(Z_LVAL_P(do_cache));
+}
+/* }}}*/
+
+/* {{{ proto bool HTTPi_Response::setGzip(bool gzip)
+ *
+ */
+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;
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi_Response::getGzip()
+ *
+ */
+PHP_METHOD(HTTPi_Response, getGzip)
+{
+       zval *do_gzip = NULL;
+       getObject(httpi_response_object, obj);
+
+       if (ZEND_NUM_ARGS()) {
+               WRONG_PARAM_COUNT;
+       }
+
+       do_gzip = GET_PROP(obj, gzip);
+       RETURN_BOOL(Z_LVAL_P(do_gzip));
+}
+/* }}} */
+
+/* {{{ proto bool HTTPi_Response::setCacheControl(string control[, bool raw = false])
+ *
+ */
+PHP_METHOD(HTTPi_Response, setCacheControl)
+{
+       char *ccontrol;
+       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;
+       }
+
+       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);
+
+       if (ZEND_NUM_ARGS()) {
+               WRONG_PARAM_COUNT;
+       }
+
+       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 secondary part", ctype);
+               RETURN_FALSE;
+       }
+
+       UPD_PROP(obj, string, contentType, ctype);
+       if (HTTP_G(ctype)) {
+               efree(HTTP_G(ctype));
+       }
+       HTTP_G(ctype) = estrndup(ctype, ctype_len);
+       RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string HTTPi_Response::getContentType()
+ *
+ */
+PHP_METHOD(HTTPi_Response, getContentType)
+{
+       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);
+}
+/* }}} */
+
+/* {{{ 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);
+
+       if (ZEND_NUM_ARGS()) {
+               WRONG_PARAM_COUNT;
+       }
+
+       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;
+       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, string, eTag, http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA));
+       UPD_PROP(obj, long, size, Z_STRLEN_P(the_data));
+       UPD_PROP(obj, long, lastModified, time(NULL));
+       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);
+       
+       if (ZEND_NUM_ARGS()) {
+               WRONG_PARAM_COUNT;
+       }
+       
+       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;
+       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, string, eTag, http_etag(the_real_stream, 0, SEND_RSRC));
+       UPD_PROP(obj, long, size, HTTP_G(ssb).sb.st_size);
+       UPD_PROP(obj, long, lastModified, HTTP_G(ssb).sb.st_mtime);
+       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);
+       
+       if (ZEND_NUM_ARGS()) {
+               WRONG_PARAM_COUNT;
+       }
+       
+       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)
+{
+       char *the_file;
+       int file_len;
+       zval fmtime, fsize;
+       getObject(httpi_response_object, obj);
+       
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &the_file, &file_len)) {
+               RETURN_FALSE;
+       }
+       
+       php_stat(the_file, file_len, FS_SIZE, &fsize TSRMLS_CC);
+       php_stat(the_file, file_len, FS_MTIME, &fmtime TSRMLS_CC);
+       
+       UPD_PROP(obj, string, file, the_file);
+       UPD_PROP(obj, long, size, Z_LVAL(fsize));
+       UPD_PROP(obj, long, lastModified, Z_LVAL(fmtime));
+       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);
+       
+       if (ZEND_NUM_ARGS()) {
+               WRONG_PARAM_COUNT;
+       }
+       
+       the_file = GET_PROP(obj, file);
+       RETURN_STRINGL(Z_STRVAL_P(the_file), Z_STRLEN_P(the_file), 1);
+}
+/* }}} */
+
+/* {{{ proto int HTTPi_Response::getSize()
+ *
+ */
+PHP_METHOD(HTTPi_Response, getSize)
+{
+       zval *the_size;
+       getObject(httpi_response_object, obj);
+       
+       if (ZEND_NUM_ARGS()) {
+               WRONG_PARAM_COUNT;
+       }
+       
+       the_size = GET_PROP(obj, size);
+       RETURN_LONG(Z_LVAL_P(the_size));
+}
+/* }}} */
+
+PHP_METHOD(HTTPi_Response, send)
+{
+       zval *do_cache;
+       getObject(httpi_response_object, obj);
+       
+       do_cache = GET_PROP(obj, cache);
+       
+       /* caching */
+       if (Z_LVAL_P(do_cache)) {
+               /* cache header */
+               {
+                       zval *ccontrol = GET_PROP(obj, cacheControl);
+                       if (Z_STRLEN_P(ccontrol)) {
+                               char *cc_header;
+                               zval *cc_raw = GET_PROP(obj, raw_cache_control);
+                               if (Z_LVAL_P(cc_raw)) {
+                                       cc_header = ecalloc(sizeof("Cache-Control: ") + Z_STRLEN_P(ccontrol), 1);
+                                       sprintf(cc_header, "Cache-Control: %s", Z_STRVAL_P(ccontrol));
+                               } else {
+                                       cc_header = ecalloc(sizeof("Cache-Control: , must-revalidate, max-age=0") + Z_STRLEN_P(ccontrol), 1);
+                                       sprintf(cc_header, "Cache-Control: %s, must-revalidate, max-age=0", Z_STRVAL_P(ccontrol));
+                               }
+                               http_send_header(cc_header);
+                               efree(cc_header);
+                       } else {
+                               http_send_header("Cache-Control: public, must-revalidate, max-age=0");
+                       }
+               }
+               /* etag */
+               {
+                       zval *etag = GET_PROP(obj, eTag);
+                       if (Z_STRLEN_P(etag)) {
+                               if ((!http_is_range_request()) && http_etag_match("HTTP_IF_NONE_MATCH", Z_STRVAL_P(etag))) {
+                                       http_send_status(304);
+                                       RETURN_TRUE;
+                               }
+                               http_send_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag));
+                               if (HTTP_G(etag)) {
+                                       efree(HTTP_G(etag));
+                               }
+                               HTTP_G(etag) = estrndup(Z_STRVAL_P(etag), Z_STRLEN_P(etag));
+                       }
+               }
+               /* last modified */
+               {
+                       zval *lmod = GET_PROP(obj, lastModified);
+                       if (Z_LVAL_P(lmod)) {
+                               if (http_modified_match("HTTP_IF_MODIFIED_SINCE", Z_LVAL_P(lmod))) {
+                                       http_send_status(304);
+                                       RETURN_TRUE;
+                               }
+                               http_send_last_modified(Z_LVAL_P(lmod));
+                               HTTP_G(lmod) = Z_LVAL_P(lmod);
+                       } else {
+                               time_t t = time(NULL);
+                               http_send_last_modified(t);
+                               HTTP_G(lmod) = t;
+                       }
+               }
+       } /* caching done */
+       
+       /* gzip */
+       /* ... */
+       
+       /* content type */
+       {
+               zval *ctype = GET_PROP(obj, contentType);
+               if (Z_STRLEN_P(ctype)) {
+                       char *ctype_header = ecalloc(sizeof("Content-Type: ") + Z_STRLEN_P(ctype), 1);
+                       sprintf(ctype_header, "Content-Type: %s", Z_STRVAL_P(ctype));
+                       http_send_header(ctype_header);
+                       efree(ctype_header);
+                       if (HTTP_G(ctype)) {
+                               efree(HTTP_G(ctype));
+                       }
+                       HTTP_G(ctype) = estrndup(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype));
+               } else {
+                       http_send_header("Content-Type: application/x-octetstream");
+                       if (HTTP_G(ctype)) {
+                               efree(HTTP_G(ctype));
+                       }
+                       HTTP_G(ctype) = estrdup("application/x-octetstream");
+               }
+       }
+       
+       /* content disposition */
+       {
+               zval *dispo_file = GET_PROP(obj, dispoFile);
+               if (Z_STRLEN_P(dispo_file)) {
+                       char *dispo_header;
+                       zval *dispo_inline = GET_PROP(obj, dispoInline);
+                       if (Z_LVAL_P(dispo_inline)) {
+                               dispo_header = ecalloc(sizeof("Content-Disposition: inline; filename=\"\"") + Z_STRLEN_P(dispo_file), 1);
+                               sprintf(dispo_header, "Content-Disposition: inline; filename=\"%s\"", Z_STRVAL_P(dispo_file));
+                       } else {
+                               dispo_header = ecalloc(sizeof("Content-Disposition: attachment; filename=\"\"") + Z_STRLEN_P(dispo_file), 1);
+                               sprintf(dispo_header, "Content-Disposition: attachment; filename=\"%s\"", Z_STRVAL_P(dispo_file));
+                       }
+                       http_send_header(dispo_header);
+                       efree(dispo_header);
+               }
+       }
+       
+       /* 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)));
+                       }
+               }
+       }
+}
+
+#endif /* ZEND_ENGINE_2 */
+
 /* {{{ http_module_entry */
 zend_module_entry http_module_entry = {
 #if ZEND_MODULE_API_NO >= 20010901
@@ -123,8 +803,8 @@ zend_module_entry http_module_entry = {
        "http",
        http_functions,
        PHP_MINIT(http),
-       NULL,
-       NULL,
+       PHP_MSHUTDOWN(http),
+       PHP_RINIT(http),
        PHP_RSHUTDOWN(http),
        PHP_MINFO(http),
 #if ZEND_MODULE_API_NO >= 20010901
@@ -134,9 +814,6 @@ zend_module_entry http_module_entry = {
 };
 /* }}} */
 
-#define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v))
-#define HASH_ORNULL(z) ((z) ? Z_ARRVAL_P(z) : NULL)
-
 /* {{{ proto string http_date([int timestamp])
  *
  * This function returns a valid HTTP date regarding RFC 822/1123
@@ -465,7 +1142,9 @@ PHP_FUNCTION(http_cache_etag)
 
 /* {{{ proto string ob_httpetaghandler(string data, int mode)
  *
- * For use with ob_start(). Note that this has to be started as first output buffer.
+ * For use with ob_start().
+ * Note that this has to be started as first output buffer.
+ * WARNING: Don't use with http_send_*().
  */
 PHP_FUNCTION(ob_httpetaghandler)
 {
@@ -479,17 +1158,18 @@ PHP_FUNCTION(ob_httpetaghandler)
 
        if (mode & PHP_OUTPUT_HANDLER_START) {
                if (HTTP_G(etag_started)) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "ob_etaghandler can only be used once");
-                       RETURN_FALSE;
-               }
-               if (OG(ob_nesting_level)) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "must be started prior to other output buffers");
-                       RETURN_FALSE;
+                       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_G(etag_started) = 1;
        }
 
+    if (OG(ob_nesting_level) > 1) {
+        php_error_docref(NULL TSRMLS_CC, E_WARNING, "ob_httpetaghandler must be started prior to other output buffers");
+        RETURN_STRINGL(data, data_len, 1);
+    }
+
        Z_TYPE_P(return_value) = IS_STRING;
        http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), mode);
 }
@@ -1132,11 +1812,22 @@ PHP_MINIT_FUNCTION(http)
 {
        ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL);
        REGISTER_INI_ENTRIES();
+
 #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);
        REGISTER_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM, CONST_CS | CONST_PERSISTENT);
 #endif
+
+#ifdef ZEND_ENGINE_2
+       /*
+       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);
+       */
+       HTTP_REGISTER_CLASS(HTTPi, httpi, NULL, ZEND_ACC_FINAL_CLASS);
+       HTTP_REGISTER_CLASS_EX(HTTPi_Response, httpi_response, NULL, 0);
+#endif
        return SUCCESS;
 }
 /* }}} */