remove superfluous buffer macros
[m6w6/ext-http] / php_http_env_response.c
index a374b425c74932ecd09642b034015ea6e2a53a39..b64aefd1e74d05ee6709d7f1b923e409b4eed8d5 100644 (file)
@@ -6,18 +6,11 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id $ */
-
-#include "php_http.h"
-
-#include <main/SAPI.h>
-#include <ext/date/php_date.h>
-#include <ext/standard/php_string.h>
-
+#include "php_http_api.h"
 
 static void set_option(zval *options, const char *name_str, size_t name_len, int type, const void *value_ptr, size_t value_len TSRMLS_DC)
 {
@@ -84,20 +77,19 @@ static zval *get_option(zval *options, const char *name_str, size_t name_len TSR
 
 PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_etag(zval *options, const char *header_str, size_t header_len TSRMLS_DC)
 {
-       int ret, free_etag = 0;
-       char *header, *etag;
+       php_http_cache_status_t ret = PHP_HTTP_CACHE_NO;
+       int free_etag = 0;
+       char *header = NULL, *etag;
        zval *zetag, *zbody = NULL;
 
-       if (    !(header = php_http_env_get_request_header(header_str, header_len TSRMLS_CC))
-       ||              !(zbody = get_option(options, ZEND_STRL("body") TSRMLS_CC))
+       if (    !(zbody = get_option(options, ZEND_STRL("body") TSRMLS_CC))
        ||              !(Z_TYPE_P(zbody) == IS_OBJECT)
-       ||              !instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_class_entry TSRMLS_CC)
+       ||              !instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_get_class_entry() TSRMLS_CC)
        ) {
-               STR_FREE(header);
                if (zbody) {
                        zval_ptr_dtor(&zbody);
                }
-               return PHP_HTTP_CACHE_NO;
+               return ret;
        }
 
        if ((zetag = get_option(options, ZEND_STRL("etag") TSRMLS_CC))) {
@@ -108,8 +100,7 @@ PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_etag(zva
 
        if (zetag && Z_STRLEN_P(zetag)) {
                etag = Z_STRVAL_P(zetag);
-       } else {
-               etag = php_http_message_body_etag(((php_http_message_body_object_t *) zend_object_store_get_object(zbody TSRMLS_CC))->body);
+       } else if ((etag = php_http_message_body_etag(((php_http_message_body_object_t *) zend_object_store_get_object(zbody TSRMLS_CC))->body))) {
                set_option(options, ZEND_STRL("etag"), IS_STRING, etag, strlen(etag) TSRMLS_CC);
                free_etag = 1;
        }
@@ -122,14 +113,16 @@ PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_etag(zva
                zval_ptr_dtor(&zetag);
        }
 
-       ret = php_http_match(header, etag, PHP_HTTP_MATCH_WORD);
+       if (etag && (header = php_http_env_get_request_header(header_str, header_len, NULL TSRMLS_CC))) {
+               ret = php_http_match(header, etag, PHP_HTTP_MATCH_WORD)  ? PHP_HTTP_CACHE_HIT : PHP_HTTP_CACHE_MISS;
+       }
 
        if (free_etag) {
                efree(etag);
        }
-       efree(header);
+       STR_FREE(header);
 
-       return ret ? PHP_HTTP_CACHE_HIT : PHP_HTTP_CACHE_MISS;
+       return ret;
 }
 
 PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_last_modified(zval *options, const char *header_str, size_t header_len TSRMLS_DC)
@@ -138,12 +131,10 @@ PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_last_mod
        time_t ums, lm = 0;
        zval *zbody = NULL, *zlm;
 
-       if (    !(header = php_http_env_get_request_header(header_str, header_len TSRMLS_CC))
-       ||              !(zbody = get_option(options, ZEND_STRL("body") TSRMLS_CC))
+       if (    !(zbody = get_option(options, ZEND_STRL("body") TSRMLS_CC))
        ||              !(Z_TYPE_P(zbody) == IS_OBJECT)
-       ||              !instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_class_entry TSRMLS_CC)
+       ||              !instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_get_class_entry() TSRMLS_CC)
        ) {
-               STR_FREE(header);
                if (zbody) {
                        zval_ptr_dtor(&zbody);
                }
@@ -163,21 +154,26 @@ PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_last_mod
                set_option(options, ZEND_STRL("lastModified"), IS_LONG, &lm, 0 TSRMLS_CC);
        }
 
+       zval_ptr_dtor(&zbody);
        if (zlm) {
                zval_ptr_dtor(&zlm);
        }
 
+       if (!(header = php_http_env_get_request_header(header_str, header_len, NULL TSRMLS_CC))) {
+               return PHP_HTTP_CACHE_NO;
+       }
+
        ums = php_parse_date(header, NULL);
        efree(header);
 
-       if (ums > 0 && ums <= lm) {
+       if (ums > 0 && ums >= lm) {
                return PHP_HTTP_CACHE_HIT;
        } else {
                return PHP_HTTP_CACHE_MISS;
        }
 }
 
-static size_t output(void *context, const char *buf, size_t len TSRMLS_DC)
+static size_t output(void *context, char *buf, size_t len TSRMLS_DC)
 {
        php_http_env_response_t *r = context;
 
@@ -186,12 +182,17 @@ static size_t output(void *context, const char *buf, size_t len TSRMLS_DC)
        /*      we really only need to flush when throttling is enabled,
                because we push the data as fast as possible anyway if not */
        if (r->throttle.delay >= PHP_HTTP_DIFFSEC) {
+#if PHP_VERSION_ID >= 50400
                if (php_output_get_level(TSRMLS_C)) {
                        php_output_flush_all(TSRMLS_C);
                }
                if (!(php_output_get_status(TSRMLS_C) & PHP_OUTPUT_IMPLICITFLUSH)) {
                        sapi_flush(TSRMLS_C);
                }
+#else
+               php_end_ob_buffer(1, 1 TSRMLS_CC);
+               sapi_flush(TSRMLS_C);
+#endif
                php_http_sleep(r->throttle.delay);
        }
        return len;
@@ -200,8 +201,8 @@ static size_t output(void *context, const char *buf, size_t len TSRMLS_DC)
 #define php_http_env_response_send_done(r) php_http_env_response_send_data((r), NULL, 0)
 static STATUS php_http_env_response_send_data(php_http_env_response_t *r, const char *buf, size_t len)
 {
-       TSRMLS_FETCH_FROM_CTX(r->ts);
        size_t chunk = r->throttle.chunk ? r->throttle.chunk : PHP_HTTP_SENDBUF_SIZE;
+       TSRMLS_FETCH_FROM_CTX(r->ts);
 
        if (r->content.encoder) {
                char *enc_str = NULL;
@@ -350,16 +351,15 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r)
                if (zend_hash_num_elements(&r->range.values) == 1) {
                        zval **range, **begin, **end;
 
-                       if (SUCCESS != zend_hash_index_find(&r->range.values, 0, (void *) &range)
-                       ||      SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void *) &begin)
-                       ||      SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void *) &end)
+                       if (    1 == php_http_array_list(&r->range.values TSRMLS_CC, 1, &range)
+                               &&      2 == php_http_array_list(Z_ARRVAL_PP(range) TSRMLS_CC, 2, &begin, &end)
                        ) {
+                               ret = php_http_env_set_response_header_format(206, 1 TSRMLS_CC, "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), r->content.length);
+                       } else {
                                /* this should never happen */
                                zend_hash_destroy(&r->range.values);
                                php_http_env_set_response_code(500 TSRMLS_CC);
                                ret = FAILURE;
-                       } else {
-                               ret = php_http_env_set_response_header_format(206, 1 TSRMLS_CC, "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), r->content.length);
                        }
                } else {
                        php_http_boundary(r->range.boundary, sizeof(r->range.boundary) TSRMLS_CC);
@@ -382,47 +382,16 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r)
 
                if ((zoption = get_option(options, ZEND_STRL("contentDisposition") TSRMLS_CC))) {
                        zval *zoption_copy = php_http_ztyp(IS_ARRAY, zoption);
-                       zval **zdisposition, **zfilename = NULL;
-
-                       zval_ptr_dtor(&zoption);
-                       if (SUCCESS == zend_hash_find(Z_ARRVAL_P(zoption_copy), ZEND_STRS("disposition"), (void *) &zdisposition)) {
-                               zval *zdisposition_copy = php_http_ztyp(IS_LONG, *zdisposition);
-                               char *tmp = NULL;
-
-                               switch (Z_LVAL_P(zdisposition_copy)) {
-                                       case PHP_HTTP_CONTENT_DISPOSITION_NONE:
-                                               ret = php_http_env_set_response_header_value(0, ZEND_STRL("Content-Disposition"), NULL, 1 TSRMLS_CC);
-                                               break;
-                                       case PHP_HTTP_CONTENT_DISPOSITION_INLINE:
-                                               tmp = "inline";
-                                               break;
-                                       case PHP_HTTP_CONTENT_DISPOSITION_ATTACHMENT:
-                                               tmp = "attachment";
-                                               break;
-                               }
-
-                               if (tmp) {
-                                       if (SUCCESS != zend_hash_find(Z_ARRVAL_P(zoption_copy), ZEND_STRS("filename"), (void *) &zfilename)) {
-                                               ret = php_http_env_set_response_header_format(0, 1 TSRMLS_CC, "Content-Disposition: %s", tmp);
-                                       } else {
-                                               zval *zfilename_copy = php_http_ztyp(IS_STRING, *zfilename);
-
-                                               if (!Z_STRLEN_P(zfilename_copy)) {
-                                                       ret = php_http_env_set_response_header_format(0, 1 TSRMLS_CC, "Content-Disposition: %s", tmp);
-                                               } else {
-                                                       int new_f_len;
-                                                       char *new_f_str = php_addslashes(estrndup(Z_STRVAL_P(zfilename_copy), Z_STRLEN_P(zfilename_copy)), Z_STRLEN_P(zfilename_copy), &new_f_len, 0 TSRMLS_CC);
+                       php_http_buffer_t buf;
 
-                                                       ret = php_http_env_set_response_header_format(0, 1 TSRMLS_CC, "Content-Disposition: %s; filename=\"%.*s\"", tmp, new_f_len, new_f_str);
-                                                       STR_FREE(new_f_str);
-                                               }
-
-                                               zval_ptr_dtor(&zfilename_copy);
-                                       }
-                               }
-                               zval_ptr_dtor(&zdisposition_copy);
+                       php_http_buffer_init(&buf);
+                       if (php_http_params_to_string(&buf, Z_ARRVAL_P(zoption_copy), ZEND_STRL(","), ZEND_STRL(";"), ZEND_STRL("="), PHP_HTTP_PARAMS_DEFAULT TSRMLS_CC)) {
+                               ret = php_http_env_set_response_header_format(0, 1 TSRMLS_CC, "Content-Disposition: %s", buf.data);
                        }
+
+                       php_http_buffer_dtor(&buf);
                        zval_ptr_dtor(&zoption_copy);
+                       zval_ptr_dtor(&zoption);
                }
 
                if (ret != SUCCESS) {
@@ -489,38 +458,52 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r)
                        return ret;
                }
 
-               switch (php_http_env_is_response_cached_by_etag(options, ZEND_STRL("If-None-Match") TSRMLS_CC)) {
-                       case PHP_HTTP_CACHE_MISS:
-                               break;
-
-                       case PHP_HTTP_CACHE_NO:
-                               if (PHP_HTTP_CACHE_HIT != php_http_env_is_response_cached_by_last_modified(options, ZEND_STRL("If-Modified-Since") TSRMLS_CC)) {
+               if (php_http_env_get_response_code(TSRMLS_C) < 400 && !php_http_env_got_request_header(ZEND_STRL("Authorization") TSRMLS_CC)
+               &&      (       !SG(request_info).request_method
+                       ||      !strcasecmp(SG(request_info).request_method, "GET")
+                       ||      !strcasecmp(SG(request_info).request_method, "HEAD")
+                       )
+               ) {
+                       switch (php_http_env_is_response_cached_by_etag(options, ZEND_STRL("If-None-Match") TSRMLS_CC)) {
+                               case PHP_HTTP_CACHE_MISS:
                                        break;
-                               }
-                               /*  fallthrough */
 
-                       case PHP_HTTP_CACHE_HIT:
-                               ret = php_http_env_set_response_code(304 TSRMLS_CC);
-                               r->done = 1;
-                               break;
-               }
+                               case PHP_HTTP_CACHE_NO:
+                                       if (PHP_HTTP_CACHE_HIT != php_http_env_is_response_cached_by_last_modified(options, ZEND_STRL("If-Modified-Since") TSRMLS_CC)) {
+                                               break;
+                                       }
+                                       /*  no break */
 
-               if ((zoption = get_option(options, ZEND_STRL("etag") TSRMLS_CC))) {
-                       ret = php_http_env_set_response_header_value(0, ZEND_STRL("ETag"), zoption, 1 TSRMLS_CC);
-                       zval_ptr_dtor(&zoption);
-               }
-               if ((zoption = get_option(options, ZEND_STRL("lastModified") TSRMLS_CC))) {
-                       zval *zoption_copy = php_http_ztyp(IS_LONG, zoption);
+                               case PHP_HTTP_CACHE_HIT:
+                                       ret = php_http_env_set_response_code(304 TSRMLS_CC);
+                                       r->done = 1;
+                                       break;
+                       }
 
-                       zval_ptr_dtor(&zoption);
-                       if (Z_LVAL_P(zoption_copy)) {
-                               char *date = php_format_date(ZEND_STRL(PHP_HTTP_DATE_FORMAT), Z_LVAL_P(zoption_copy), 0 TSRMLS_CC);
-                               if (date) {
-                                       ret = php_http_env_set_response_header_format(0, 1 TSRMLS_CC, "Last-Modified: %s", date);
-                                       efree(date);
+                       if ((zoption = get_option(options, ZEND_STRL("etag") TSRMLS_CC))) {
+                               zval *zoption_copy = php_http_ztyp(IS_STRING, zoption);
+
+                               zval_ptr_dtor(&zoption);
+                               if (*Z_STRVAL_P(zoption_copy) != '"' && strncmp(Z_STRVAL_P(zoption_copy), "W/\"", 3)) {
+                                       ret = php_http_env_set_response_header_format(0, 1 TSRMLS_CC, "ETag: \"%s\"", Z_STRVAL_P(zoption_copy));
+                               } else {
+                                       ret = php_http_env_set_response_header_value(0, ZEND_STRL("ETag"), zoption_copy, 1 TSRMLS_CC);
                                }
+                               zval_ptr_dtor(&zoption_copy);
+                       }
+                       if ((zoption = get_option(options, ZEND_STRL("lastModified") TSRMLS_CC))) {
+                               zval *zoption_copy = php_http_ztyp(IS_LONG, zoption);
+
+                               zval_ptr_dtor(&zoption);
+                               if (Z_LVAL_P(zoption_copy)) {
+                                       char *date = php_format_date(ZEND_STRL(PHP_HTTP_DATE_FORMAT), Z_LVAL_P(zoption_copy), 0 TSRMLS_CC);
+                                       if (date) {
+                                               ret = php_http_env_set_response_header_format(0, 1 TSRMLS_CC, "Last-Modified: %s", date);
+                                               efree(date);
+                                       }
+                               }
+                               zval_ptr_dtor(&zoption_copy);
                        }
-                       zval_ptr_dtor(&zoption_copy);
                }
        }
 
@@ -530,7 +513,7 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r)
 static STATUS php_http_env_response_send_body(php_http_env_response_t *r)
 {
        STATUS ret = SUCCESS;
-       zval *zbody;
+       zval *zbody, *zoption;
        TSRMLS_FETCH_FROM_CTX(r->ts);
 
        if (r->done) {
@@ -539,30 +522,44 @@ static STATUS php_http_env_response_send_body(php_http_env_response_t *r)
 
        if (    (zbody = get_option(r->options, ZEND_STRL("body") TSRMLS_CC))
        &&              (Z_TYPE_P(zbody) == IS_OBJECT)
-       &&              instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_class_entry TSRMLS_CC)
+       &&              instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_get_class_entry() TSRMLS_CC)
        ) {
                php_http_message_body_object_t *obj = zend_object_store_get_object(zbody TSRMLS_CC);
 
+               if ((zoption = get_option(r->options, ZEND_STRL("throttleDelay") TSRMLS_CC))) {
+                       if (Z_TYPE_P(zoption) == IS_DOUBLE) {
+                               r->throttle.delay =  Z_DVAL_P(zoption);
+                       }
+                       zval_ptr_dtor(&zoption);
+               }
+               if ((zoption = get_option(r->options, ZEND_STRL("throttleChunk") TSRMLS_CC))) {
+                       if (Z_TYPE_P(zoption) == IS_LONG) {
+                               r->throttle.chunk = Z_LVAL_P(zoption);
+                       }
+                       zval_ptr_dtor(&zoption);
+               }
+
                if (r->range.status == PHP_HTTP_RANGE_OK) {
                        if (zend_hash_num_elements(&r->range.values) == 1) {
                                /* single range */
                                zval **range, **begin, **end;
 
-                               if (SUCCESS != zend_hash_index_find(&r->range.values, 0, (void *) &range)
-                               ||      SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void *) &begin)
-                               ||      SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void *) &end)
+                               if (    1 == php_http_array_list(&r->range.values TSRMLS_CC, 1, &range)
+                                       &&      2 == php_http_array_list(Z_ARRVAL_PP(range) TSRMLS_CC, 2, &begin, &end)
                                ) {
-                                       /* this should never happen */
-                                       zend_hash_destroy(&r->range.values);
-                                       php_http_env_set_response_code(500 TSRMLS_CC);
-                                       ret = FAILURE;
-                               } else {
                                        /* send chunk */
                                        php_http_message_body_to_callback(obj->body, (php_http_pass_callback_t) php_http_env_response_send_data, r, Z_LVAL_PP(begin), Z_LVAL_PP(end) - Z_LVAL_PP(begin) + 1);
                                        php_http_env_response_send_done(r);
                                        zend_hash_destroy(&r->range.values);
                                        ret = SUCCESS;
+                               } else {
+                                       fprintf(stderr, "wut?");
+                                       /* this should never happen */
+                                       zend_hash_destroy(&r->range.values);
+                                       php_http_env_set_response_code(500 TSRMLS_CC);
+                                       ret = FAILURE;
                                }
+
                        } else {
                                /* send multipart/byte-ranges message */
                                HashPosition pos;
@@ -571,12 +568,7 @@ static STATUS php_http_env_response_send_body(php_http_env_response_t *r)
                                FOREACH_HASH_VAL(pos, &r->range.values, chunk) {
                                        zval **begin, **end;
 
-                                       if (IS_ARRAY == Z_TYPE_PP(chunk)
-                                       &&      SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(chunk), 0, (void *) &begin)
-                                       &&      IS_LONG == Z_TYPE_PP(begin)
-                                       &&      SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(chunk), 1, (void *) &end)
-                                       &&      IS_LONG == Z_TYPE_PP(end)
-                                       ) {
+                                       if (2 == php_http_array_list(Z_ARRVAL_PP(chunk) TSRMLS_CC, 2, &begin, &end)) {
                                                php_http_buffer_appendf(r->buffer,
                                                                PHP_HTTP_CRLF
                                                                "--%s" PHP_HTTP_CRLF
@@ -616,7 +608,7 @@ PHP_HTTP_API STATUS php_http_env_response_send(php_http_env_response_t *r)
        /* check for ranges */
        if (    (zbody = get_option(r->options, ZEND_STRL("body") TSRMLS_CC))
        &&              (Z_TYPE_P(zbody) == IS_OBJECT)
-       &&              instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_class_entry TSRMLS_CC)
+       &&              instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_get_class_entry() TSRMLS_CC)
        ) {
                php_http_message_body_object_t *obj = zend_object_store_get_object(zbody TSRMLS_CC);
 
@@ -684,8 +676,6 @@ PHP_HTTP_API STATUS php_http_env_response_send(php_http_env_response_t *r)
        return SUCCESS;
 }
 
-zend_class_entry *php_http_env_response_class_entry;
-
 #undef PHP_HTTP_BEGIN_ARGS
 #undef PHP_HTTP_EMPTY_ARGS
 #define PHP_HTTP_BEGIN_ARGS(method, req_args)                  PHP_HTTP_BEGIN_ARGS_EX(HttpEnvResponse, method, 0, req_args)
@@ -694,6 +684,11 @@ zend_class_entry *php_http_env_response_class_entry;
 
 PHP_HTTP_EMPTY_ARGS(__construct);
 
+PHP_HTTP_BEGIN_ARGS(__invoke, 1)
+       PHP_HTTP_ARG_VAL(ob_string, 0)
+       PHP_HTTP_ARG_VAL(ob_flags, 0)
+PHP_HTTP_END_ARGS;
+
 PHP_HTTP_BEGIN_ARGS(setContentType, 1)
        PHP_HTTP_ARG_VAL(content_type, 0)
 PHP_HTTP_END_ARGS;
@@ -703,8 +698,7 @@ PHP_HTTP_BEGIN_ARGS(setContentEncoding, 1)
 PHP_HTTP_END_ARGS;
 
 PHP_HTTP_BEGIN_ARGS(setContentDisposition, 1)
-       PHP_HTTP_ARG_VAL(content_disposition, 0)
-       PHP_HTTP_ARG_VAL(filename, 0)
+       PHP_HTTP_ARG_ARR(disposition_params, 1, 0)
 PHP_HTTP_END_ARGS;
 
 PHP_HTTP_BEGIN_ARGS(setCacheControl, 1)
@@ -734,9 +728,16 @@ PHP_HTTP_END_ARGS;
 
 PHP_HTTP_EMPTY_ARGS(send);
 
+static zend_class_entry *php_http_env_response_class_entry;
+
+zend_class_entry *php_http_env_response_get_class_entry(void)
+{
+       return php_http_env_response_class_entry;
+}
 
-zend_function_entry php_http_env_response_method_entry[] = {
+static zend_function_entry php_http_env_response_method_entry[] = {
        PHP_HTTP_ENV_RESPONSE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_HTTP_ENV_RESPONSE_ME(__invoke, ZEND_ACC_PUBLIC)
        PHP_HTTP_ENV_RESPONSE_ME(setContentType, ZEND_ACC_PUBLIC)
        PHP_HTTP_ENV_RESPONSE_ME(setContentDisposition, ZEND_ACC_PUBLIC)
        PHP_HTTP_ENV_RESPONSE_ME(setContentEncoding, ZEND_ACC_PUBLIC)
@@ -755,11 +756,11 @@ zend_function_entry php_http_env_response_method_entry[] = {
 
 PHP_METHOD(HttpEnvResponse, __construct)
 {
-       with_error_handling(EH_THROW, php_http_exception_class_entry) {
+       with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
                if (SUCCESS == zend_parse_parameters_none()) {
                        php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-                       with_error_handling(EH_THROW, php_http_exception_class_entry) {
+                       with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
                                obj->message = php_http_message_init_env(obj->message, PHP_HTTP_RESPONSE TSRMLS_CC);
                        } end_error_handling();
                }
@@ -767,6 +768,23 @@ PHP_METHOD(HttpEnvResponse, __construct)
 
 }
 
+PHP_METHOD(HttpEnvResponse, __invoke)
+{
+       char *ob_str;
+       int ob_len;
+       long ob_flags = 0;
+
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &ob_str, &ob_len, &ob_flags)) {
+               php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->body.handle || SUCCESS == php_http_new(&obj->body, php_http_message_body_get_class_entry(), (php_http_new_t) php_http_message_body_object_new_ex, NULL, (void *) php_http_message_body_copy(&obj->message->body, NULL, 0), NULL TSRMLS_CC)) {
+                       php_http_message_body_append(&obj->message->body, ob_str, ob_len);
+                       RETURN_TRUE;
+               }
+               RETURN_FALSE;
+       }
+}
+
 PHP_METHOD(HttpEnvResponse, setContentType)
 {
        char *ct_str = NULL;
@@ -779,21 +797,10 @@ PHP_METHOD(HttpEnvResponse, setContentType)
 
 PHP_METHOD(HttpEnvResponse, setContentDisposition)
 {
-       long cd;
-       char *file_str = NULL;
-       int file_len = 0;
-
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|s!", &cd, &file_str, &file_len)) {
-               zval *arr;
-
-               MAKE_STD_ZVAL(arr);
-               array_init(arr);
-               add_assoc_long_ex(arr, ZEND_STRS("disposition"), cd);
-               if (file_len) {
-                       add_assoc_stringl_ex(arr, ZEND_STRS("filename"), file_str, file_len, 1);
-               }
-               zend_update_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL("contentDisposition"), arr TSRMLS_CC);
-               zval_ptr_dtor(&arr);
+       zval *zdisposition;
+
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &zdisposition)) {
+               zend_update_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL("contentDisposition"), zdisposition TSRMLS_CC);
        }
 }
 
@@ -871,10 +878,8 @@ PHP_METHOD(HttpEnvResponse, setThrottleRate)
        double delay = 1;
 
        if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|d", &chunk_size, &delay)) {
-               long chunk_size_long = (long) chunk_size;
-
                set_option(getThis(), ZEND_STRL("throttleDelay"), IS_DOUBLE, &delay, 0 TSRMLS_CC);
-               set_option(getThis(), ZEND_STRL("throttleChunk"), IS_LONG, &chunk_size_long, 0 TSRMLS_CC);
+               set_option(getThis(), ZEND_STRL("throttleChunk"), IS_LONG, &chunk_size, 0 TSRMLS_CC);
                RETURN_TRUE;
        }
        RETURN_FALSE;
@@ -897,11 +902,7 @@ PHP_METHOD(HttpEnvResponse, send)
 
 PHP_MINIT_FUNCTION(http_env_response)
 {
-       PHP_HTTP_REGISTER_CLASS(http\\Env, Response, http_env_response, php_http_message_class_entry, 0);
-
-       zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_DISPOSITION_NONE"), PHP_HTTP_CONTENT_DISPOSITION_NONE TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_DISPOSITION_INLINE"), PHP_HTTP_CONTENT_DISPOSITION_INLINE TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_DISPOSITION_ATTACHMENT"), PHP_HTTP_CONTENT_DISPOSITION_ATTACHMENT TSRMLS_CC);
+       PHP_HTTP_REGISTER_CLASS(http\\Env, Response, http_env_response, php_http_message_get_class_entry(), 0);
 
        zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_ENCODING_NONE"), PHP_HTTP_CONTENT_ENCODING_NONE TSRMLS_CC);
        zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_ENCODING_GZIP"), PHP_HTTP_CONTENT_ENCODING_GZIP TSRMLS_CC);