X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_response_object.c;h=c8d45cca997de2f9327f51a0f78ec5681b4678cb;hp=30f5abaf8ba6f023df72c919c038e0d4239cc080;hb=refs%2Fheads%2Fv1.7.x;hpb=1f4974565dc58da9c7bfbde278896a5e06e9d669 diff --git a/http_response_object.c b/http_response_object.c index 30f5aba..c8d45cc 100644 --- a/http_response_object.c +++ b/http_response_object.c @@ -1,63 +1,39 @@ /* - +----------------------------------------------------------------------+ - | PECL :: http | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, that | - | is bundled with this package in the file LICENSE, and is available | - | through the world-wide-web at http://www.php.net/license/3_0.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Copyright (c) 2004-2005 Michael Wallner | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2010, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif -#include "php.h" - -#include "missing.h" +#define HTTP_WANT_SAPI +#define HTTP_WANT_MAGIC +#include "php_http.h" /* broken static properties in PHP 5.0 */ #if defined(ZEND_ENGINE_2) && !defined(WONKY) -#include "SAPI.h" #include "php_ini.h" -#include "php_http.h" #include "php_http_api.h" -#include "php_http_std_defs.h" -#include "php_http_response_object.h" -#include "php_http_exception_object.h" -#include "php_http_send_api.h" #include "php_http_cache_api.h" +#include "php_http_exception_object.h" #include "php_http_headers_api.h" - -#ifdef HTTP_HAVE_MHASH -# include -#endif -#ifdef HTTP_HAVE_MAGIC -# include -#endif - -ZEND_EXTERN_MODULE_GLOBALS(http); - -#define GET_STATIC_PROP(n) *GET_STATIC_PROP_EX(http_response_object_ce, n) -#define UPD_STATIC_PROP(t, n, v) UPD_STATIC_PROP_EX(http_response_object_ce, t, n, v) -#define SET_STATIC_PROP(n, v) SET_STATIC_PROP_EX(http_response_object_ce, n, v) -#define UPD_STATIC_STRL(n, v, l) UPD_STATIC_STRL_EX(http_response_object_ce, n, v, l) +#include "php_http_response_object.h" +#include "php_http_send_api.h" #define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpResponse, method, 0, req_args) -#define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpResponse, method, ret_ref) +#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpResponse, method, 0) #define HTTP_RESPONSE_ME(method, visibility) PHP_ME(HttpResponse, method, HTTP_ARGS(HttpResponse, method), visibility|ZEND_ACC_STATIC) #define HTTP_RESPONSE_ALIAS(method, func) HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpResponse, method)) -HTTP_BEGIN_ARGS(setHeader, 2) +HTTP_BEGIN_ARGS(setHeader, 1) HTTP_ARG_VAL(name, 0) HTTP_ARG_VAL(value, 0) HTTP_ARG_VAL(replace, 0) @@ -67,33 +43,34 @@ HTTP_BEGIN_ARGS(getHeader, 0) HTTP_ARG_VAL(name, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getETag, 0); +HTTP_EMPTY_ARGS(getETag); HTTP_BEGIN_ARGS(setETag, 1) HTTP_ARG_VAL(etag, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getLastModified, 0); +HTTP_EMPTY_ARGS(getLastModified); HTTP_BEGIN_ARGS(setLastModified, 1) HTTP_ARG_VAL(timestamp, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getCache, 0); +HTTP_EMPTY_ARGS(getCache); HTTP_BEGIN_ARGS(setCache, 1) HTTP_ARG_VAL(cache, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getGzip, 0); +HTTP_EMPTY_ARGS(getGzip); HTTP_BEGIN_ARGS(setGzip, 1) HTTP_ARG_VAL(gzip, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getCacheControl, 0); +HTTP_EMPTY_ARGS(getCacheControl); HTTP_BEGIN_ARGS(setCacheControl, 1) HTTP_ARG_VAL(cache_control, 0) HTTP_ARG_VAL(max_age, 0) + HTTP_ARG_VAL(must_revalidate, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getContentType, 0); +HTTP_EMPTY_ARGS(getContentType); HTTP_BEGIN_ARGS(setContentType, 1) HTTP_ARG_VAL(content_type, 0) HTTP_END_ARGS; @@ -103,33 +80,33 @@ HTTP_BEGIN_ARGS(guessContentType, 1) HTTP_ARG_VAL(magic_mode, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getContentDisposition, 0); +HTTP_EMPTY_ARGS(getContentDisposition); HTTP_BEGIN_ARGS(setContentDisposition, 1) HTTP_ARG_VAL(filename, 0) HTTP_ARG_VAL(send_inline, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getThrottleDelay, 0); +HTTP_EMPTY_ARGS(getThrottleDelay); HTTP_BEGIN_ARGS(setThrottleDelay, 1) HTTP_ARG_VAL(seconds, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getBufferSize, 0); +HTTP_EMPTY_ARGS(getBufferSize); HTTP_BEGIN_ARGS(setBufferSize, 1) HTTP_ARG_VAL(bytes, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getData, 0); +HTTP_EMPTY_ARGS(getData); HTTP_BEGIN_ARGS(setData, 1) HTTP_ARG_VAL(data, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getStream, 0); +HTTP_EMPTY_ARGS(getStream); HTTP_BEGIN_ARGS(setStream, 1) HTTP_ARG_VAL(stream, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getFile, 0); +HTTP_EMPTY_ARGS(getFile); HTTP_BEGIN_ARGS(setFile, 1) HTTP_ARG_VAL(filepath, 0) HTTP_END_ARGS; @@ -138,7 +115,7 @@ HTTP_BEGIN_ARGS(send, 0) HTTP_ARG_VAL(clean_ob, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(capture, 0); +HTTP_EMPTY_ARGS(capture); HTTP_BEGIN_ARGS(redirect, 0) HTTP_ARG_VAL(url, 0) @@ -151,14 +128,11 @@ HTTP_BEGIN_ARGS(status, 1) HTTP_ARG_VAL(code, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getRequestHeaders, 0); -HTTP_EMPTY_ARGS(getRequestBody, 0); - -#define http_response_object_declare_default_properties() _http_response_object_declare_default_properties(TSRMLS_C) -static inline void _http_response_object_declare_default_properties(TSRMLS_D); -#define http_grab_response_headers _http_grab_response_headers -static void _http_grab_response_headers(void *data, void *arg TSRMLS_DC); +HTTP_EMPTY_ARGS(getRequestHeaders); +HTTP_EMPTY_ARGS(getRequestBody); +HTTP_EMPTY_ARGS(getRequestBodyStream); +#define THIS_CE http_response_object_ce zend_class_entry *http_response_object_ce; zend_function_entry http_response_object_fe[] = { @@ -210,86 +184,47 @@ zend_function_entry http_response_object_fe[] = { HTTP_RESPONSE_ALIAS(status, http_send_status) HTTP_RESPONSE_ALIAS(getRequestHeaders, http_get_request_headers) HTTP_RESPONSE_ALIAS(getRequestBody, http_get_request_body) + HTTP_RESPONSE_ALIAS(getRequestBodyStream, http_get_request_body_stream) EMPTY_FUNCTION_ENTRY }; -void _http_response_object_init(INIT_FUNC_ARGS) +PHP_MINIT_FUNCTION(http_response_object) { HTTP_REGISTER_CLASS(HttpResponse, http_response_object, NULL, 0); - http_response_object_declare_default_properties(); -} - -static inline void _http_response_object_declare_default_properties(TSRMLS_D) -{ - zend_class_entry *ce = http_response_object_ce; - - DCL_STATIC_PROP(PRIVATE, bool, sent, 0); - DCL_STATIC_PROP(PRIVATE, bool, catch, 0); - DCL_STATIC_PROP(PRIVATE, long, mode, -1); - DCL_STATIC_PROP(PRIVATE, long, stream, 0); - DCL_STATIC_PROP_N(PRIVATE, file); - DCL_STATIC_PROP_N(PRIVATE, data); - DCL_STATIC_PROP(PROTECTED, bool, cache, 0); - DCL_STATIC_PROP(PROTECTED, bool, gzip, 0); - DCL_STATIC_PROP_N(PROTECTED, eTag); - DCL_STATIC_PROP(PROTECTED, long, lastModified, 0); - DCL_STATIC_PROP_N(PROTECTED, cacheControl); - DCL_STATIC_PROP_N(PROTECTED, contentType); - DCL_STATIC_PROP_N(PROTECTED, contentDisposition); - DCL_STATIC_PROP(PROTECTED, long, bufferSize, HTTP_SENDBUF_SIZE); - DCL_STATIC_PROP(PROTECTED, double, throttleDelay, 0.0); + + zend_declare_property_bool(THIS_CE, ZEND_STRS("sent")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); + zend_declare_property_bool(THIS_CE, ZEND_STRS("catch")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); + zend_declare_property_long(THIS_CE, ZEND_STRS("mode")-1, -1, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); + zend_declare_property_long(THIS_CE, ZEND_STRS("stream")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("file")-1, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("data")-1, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); + zend_declare_property_bool(THIS_CE, ZEND_STRS("cache")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_bool(THIS_CE, ZEND_STRS("gzip")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("eTag")-1, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_long(THIS_CE, ZEND_STRS("lastModified")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("cacheControl")-1, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("contentType")-1, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("contentDisposition")-1, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_long(THIS_CE, ZEND_STRS("bufferSize")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); + zend_declare_property_double(THIS_CE, ZEND_STRS("throttleDelay")-1, 0.0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); #ifndef WONKY - DCL_CONST(long, "REDIRECT", HTTP_REDIRECT); - DCL_CONST(long, "REDIRECT_PERM", HTTP_REDIRECT_PERM); - DCL_CONST(long, "REDIRECT_POST", HTTP_REDIRECT_POST); - DCL_CONST(long, "REDIRECT_TEMP", HTTP_REDIRECT_TEMP); - - DCL_CONST(long, "ETAG_MD5", HTTP_ETAG_MD5); - DCL_CONST(long, "ETAG_SHA1", HTTP_ETAG_SHA1); - DCL_CONST(long, "ETAG_CRC32", HTTP_ETAG_CRC32); - -# ifdef HTTP_HAVE_MHASH - { - int l, i, c = mhash_count(); - - for (i = 0; i <= c; ++i) { - char const_name[256] = {0}; - const char *hash_name = mhash_get_hash_name_static(i); - - if (hash_name) { - l = snprintf(const_name, 255, "ETAG_MHASH_%s", hash_name); - zend_declare_class_constant_long(ce, const_name, l, i TSRMLS_CC); - } - } - } -# endif /* HTTP_HAVE_MHASH */ + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT")-1, HTTP_REDIRECT TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_PERM")-1, HTTP_REDIRECT_PERM TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_FOUND")-1, HTTP_REDIRECT_FOUND TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_POST")-1, HTTP_REDIRECT_POST TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_PROXY")-1, HTTP_REDIRECT_PROXY TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_TEMP")-1, HTTP_REDIRECT_TEMP TSRMLS_CC); #endif /* WONKY */ -} - -static void _http_grab_response_headers(void *data, void *arg TSRMLS_DC) -{ - phpstr_appendl(PHPSTR(arg), ((sapi_header_struct *)data)->header); - phpstr_appends(PHPSTR(arg), HTTP_CRLF); + + return SUCCESS; } /* ### USERLAND ### */ -/* {{{ proto static bool HttpResponse::setHeader(string name, mixed value[, bool replace = true]) - * - * Send an HTTP header. - * - * Expects a string parameter containing the name of the header and a mixed - * parameter containing the value of the header, which will be converted to - * a string. Additionally accepts an optional boolean parameter, which - * specifies whether an existing header should be replaced. If the second - * parameter is unset no header with this name will be sent. - * - * Returns TRUE on success, or FALSE on failure. - * - * Throws HttpHeaderException if http.only_exceptions is TRUE. - */ +/* {{{ proto static bool HttpResponse::setHeader(string name[, mixed value[, bool replace = true]]) + Send an HTTP header. */ PHP_METHOD(HttpResponse, setHeader) { zend_bool replace = 1; @@ -297,7 +232,7 @@ PHP_METHOD(HttpResponse, setHeader) int name_len = 0; zval *value = NULL; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/!|b", &name, &name_len, &value, &replace)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z/!b", &name, &name_len, &value, &replace)) { RETURN_FALSE; } if (SG(headers_sent)) { @@ -308,63 +243,29 @@ PHP_METHOD(HttpResponse, setHeader) http_error(HE_WARNING, HTTP_E_HEADER, "Cannot send anonymous headers"); RETURN_FALSE; } - - /* delete header if value == null */ - if (!value || Z_TYPE_P(value) == IS_NULL) { - RETURN_SUCCESS(http_send_header_ex(name, name_len, "", 0, replace, NULL)); - } - /* send multiple header if replace is false and value is an array */ - if (!replace && Z_TYPE_P(value) == IS_ARRAY) { - zval **data; - - FOREACH_VAL(value, data) { - convert_to_string_ex(data); - if (SUCCESS != http_send_header_ex(name, name_len, Z_STRVAL_PP(data), Z_STRLEN_PP(data), 0, NULL)) { - RETURN_FALSE; - } - } - RETURN_TRUE; - } - /* send standard header */ - if (Z_TYPE_P(value) != IS_STRING) { - convert_to_string_ex(&value); - } - RETURN_SUCCESS(http_send_header_ex(name, name_len, Z_STRVAL_P(value), Z_STRLEN_P(value), replace, NULL)); + http_send_header_zval_ex(name, name_len, &value, replace); + RETURN_TRUE; } /* }}} */ /* {{{ proto static mixed HttpResponse::getHeader([string name]) - * - * Get header(s) about to be sent. - * - * Accepts a string as optional parameter which specifies the name of the - * header to read. If the parameter is empty or omitted, an associative array - * with all headers will be returned. - * - * Returns either a string containing the value of the header matching name, - * FALSE on failure, or an associative array with all headers. - */ + Get header(s) about to be sent. */ PHP_METHOD(HttpResponse, getHeader) { char *name = NULL; int name_len = 0; - phpstr headers; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &name, &name_len)) { RETURN_FALSE; } - phpstr_init(&headers); - zend_llist_apply_with_argument(&SG(sapi_headers).headers, http_grab_response_headers, &headers TSRMLS_CC); - phpstr_fix(&headers); - if (name && name_len) { zval **header; HashTable headers_ht; zend_hash_init(&headers_ht, sizeof(zval *), NULL, ZVAL_PTR_DTOR, 0); - if ( (SUCCESS == http_parse_headers_ex(PHPSTR_VAL(&headers), &headers_ht, 1)) && - (SUCCESS == zend_hash_find(&headers_ht, name, name_len + 1, (void **) &header))) { + if ( (SUCCESS == http_get_response_headers(&headers_ht)) && + (SUCCESS == zend_hash_find(&headers_ht, name, name_len + 1, (void *) &header))) { RETVAL_ZVAL(*header, 1, 0); } else { RETVAL_NULL(); @@ -372,27 +273,13 @@ PHP_METHOD(HttpResponse, getHeader) zend_hash_destroy(&headers_ht); } else { array_init(return_value); - http_parse_headers_ex(PHPSTR_VAL(&headers), Z_ARRVAL_P(return_value), 1); + http_get_response_headers(Z_ARRVAL_P(return_value)); } - - phpstr_dtor(&headers); } /* }}} */ /* {{{ proto static bool HttpResponse::setCache(bool cache) - * - * Whether it sould be attempted to cache the entitity. - * This will result in necessary caching headers and checks of clients - * "If-Modified-Since" and "If-None-Match" headers. If one of those headers - * matches a "304 Not Modified" status code will be issued. - * - * NOTE: If you're using sessions, be shure that you set session.cache_limiter - * to something more appropriate than "no-cache"! - * - * Expects a boolean as parameter specifying whether caching should be attempted. - * - * Returns TRUE ons success, or FALSE on failure. - */ + Whether it should be attempted to cache the entity. */ PHP_METHOD(HttpResponse, setCache) { zend_bool do_cache = 0; @@ -401,36 +288,25 @@ PHP_METHOD(HttpResponse, setCache) RETURN_FALSE; } - RETURN_SUCCESS(UPD_STATIC_PROP(bool, cache, do_cache)); + RETURN_SUCCESS(zend_update_static_property_bool(THIS_CE, ZEND_STRS("cache")-1, do_cache TSRMLS_CC)); } /* }}} */ /* {{{ proto static bool HttpResponse::getCache() - * - * Get current caching setting. - * - * Returns TRUE if caching should be attempted, else FALSE. - */ + Get current caching setting. */ PHP_METHOD(HttpResponse, getCache) { NO_ARGS; - IF_RETVAL_USED { - zval *cache = convert_to_type_ex(IS_BOOL, GET_STATIC_PROP(cache)); - - RETURN_ZVAL(cache, 1, 0); + if (return_value_used) { + zval *cache = http_zsep(IS_BOOL, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("cache")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(cache, 1, 1); } } /* }}}*/ /* {{{ proto static bool HttpResponse::setGzip(bool gzip) - * - * Enable on-thy-fly gzipping of the sent entity. - * - * Expects a boolean as parameter indicating if GZip compression should be enabled. - * - * Returns TRUE on success, or FALSE on failure. - */ + Enable on-thy-fly gzipping of the sent entity. */ PHP_METHOD(HttpResponse, setGzip) { zend_bool do_gzip = 0; @@ -439,48 +315,33 @@ PHP_METHOD(HttpResponse, setGzip) RETURN_FALSE; } - RETURN_SUCCESS(UPD_STATIC_PROP(bool, gzip, do_gzip)); + RETURN_SUCCESS(zend_update_static_property_bool(THIS_CE, ZEND_STRS("gzip")-1, do_gzip TSRMLS_CC)); } /* }}} */ /* {{{ proto static bool HttpResponse::getGzip() - * - * Get current gzipping setting. - * - * Returns TRUE if GZip compression is enabled, else FALSE. - */ + Get current gzipping setting. */ PHP_METHOD(HttpResponse, getGzip) { NO_ARGS; - IF_RETVAL_USED { - zval *gzip = convert_to_type_ex(IS_BOOL, GET_STATIC_PROP(gzip)); - - RETURN_ZVAL(gzip, 1, 0); + if (return_value_used) { + zval *gzip = http_zsep(IS_BOOL, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("gzip")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(gzip, 1, 1); } } /* }}} */ -/* {{{ proto static bool HttpResponse::setCacheControl(string control[, int max_age = 0]) - * - * Set a custom cache-control header, usually being "private" or "public"; - * The max_age parameter controls how long the cache entry is valid on the client side. - * - * Expects a string parameter containing the primary cache control setting. - * Addtitionally accepts an int parameter specifying the max-age setting. - * - * Returns TRUE on success, or FALSE if control does not match one of - * "public" , "private" or "no-cache". - * - * Throws HttpInvalidParamException if http.only_exceptions is TRUE. - */ +/* {{{ proto static bool HttpResponse::setCacheControl(string control[, int max_age = 0[, bool must_revalidate = true]]) + Set a custom cache-control header, usually being "private" or "public"; The max_age parameter controls how long the cache entry is valid on the client side. */ PHP_METHOD(HttpResponse, setCacheControl) { char *ccontrol, *cctl; int cc_len; long max_age = 0; + zend_bool must_revalidate = 1; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &ccontrol, &cc_len, &max_age)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lb", &ccontrol, &cc_len, &max_age, &must_revalidate)) { RETURN_FALSE; } @@ -488,42 +349,28 @@ PHP_METHOD(HttpResponse, setCacheControl) http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Cache-Control '%s' doesn't match public, private or no-cache", ccontrol); RETURN_FALSE; } else { - size_t cctl_len = spprintf(&cctl, 0, "%s, must-revalidate, max_age=%ld", ccontrol, max_age); - RETVAL_SUCCESS(UPD_STATIC_STRL(cacheControl, cctl, cctl_len)); + size_t cctl_len = spprintf(&cctl, 0, "%s,%s max-age=%ld", ccontrol, must_revalidate?" must-revalidate,":"", max_age); + RETVAL_SUCCESS(zend_update_static_property_stringl(THIS_CE, ZEND_STRS("cacheControl")-1, cctl, cctl_len TSRMLS_CC)); efree(cctl); } } /* }}} */ /* {{{ proto static string HttpResponse::getCacheControl() - * - * Get current Cache-Control header setting. - * - * Returns the current cache control setting as a string like sent in a header. - */ + Get current Cache-Control header setting. */ PHP_METHOD(HttpResponse, getCacheControl) { NO_ARGS; - IF_RETVAL_USED { - zval *ccontrol = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(cacheControl)); - - RETURN_ZVAL(ccontrol, 1, 0); + if (return_value_used) { + zval *cctl = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("cacheControl")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(cctl, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::setContentType(string content_type) - * - * Set the content-type of the sent entity. - * - * Expects a string as parameter specifying the content type of the sent entity. - * - * Returns TRUE on success, or FALSE if the content type does not seem to - * contain a primary and secondary content type part. - * - * Throws HttpInvalidParamException if http.only_exceptions is TRUE. - */ + Set the content-type of the sent entity. */ PHP_METHOD(HttpResponse, setContentType) { char *ctype; @@ -533,107 +380,73 @@ PHP_METHOD(HttpResponse, setContentType) RETURN_FALSE; } - if (!strchr(ctype, '/')) { - http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Content type '%s' doesn't seem to contain a primary and a secondary part", ctype); - RETURN_FALSE; - } - - RETURN_SUCCESS(UPD_STATIC_STRL(contentType, ctype, ctype_len)); + HTTP_CHECK_CONTENT_TYPE(ctype, RETURN_FALSE); + RETURN_SUCCESS(zend_update_static_property_stringl(THIS_CE, ZEND_STRS("contentType")-1, ctype, ctype_len TSRMLS_CC)); } /* }}} */ /* {{{ proto static string HttpResponse::getContentType() - * - * Get current Content-Type header setting. - * - * Returns the currently set content type as string. - */ + Get current Content-Type header setting. */ PHP_METHOD(HttpResponse, getContentType) { NO_ARGS; - IF_RETVAL_USED { - zval *ctype = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(contentType)); - - RETURN_ZVAL(ctype, 1, 0); + if (return_value_used) { + zval *ctype = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("contentType")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(ctype, 1, 1); } } /* }}} */ -/* {{{ proto static string HttpResponse::guessContentType(string magic_file[, long magic_mode = MAGIC_MIME]) - * - * Attempts to guess the content type of supplied payload through libmagic. - * If the attempt is successful, the guessed content type will automatically - * be set as response content type. - * - * Expects a string parameter specifying the magic.mime database to use. - * Additionally accepts an optional int parameter, being flags for libmagic. - * - * Returns the guessed content type on success, or FALSE on failure. - * - * Throws HttpRuntimeException, HttpInvalidParamException - * if http.only_exceptions is TRUE. - */ +/* {{{ proto static string HttpResponse::guessContentType(string magic_file[, int magic_mode = MAGIC_MIME]) + Attempts to guess the content type of supplied payload through libmagic. */ PHP_METHOD(HttpResponse, guessContentType) { +#ifdef HTTP_HAVE_MAGIC char *magic_file, *ct = NULL; int magic_file_len; - long magic_mode = 0; + long magic_mode = MAGIC_MIME; RETVAL_FALSE; - -#ifdef HTTP_HAVE_MAGIC - magic_mode = MAGIC_MIME; - SET_EH_THROW_HTTP(); if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &magic_file, &magic_file_len, &magic_mode)) { - switch (Z_LVAL_P(GET_STATIC_PROP(mode))) { + switch (Z_LVAL_P(*zend_std_get_static_property(THIS_CE, ZEND_STRS("mode")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))) { case SEND_DATA: { - zval *data = GET_STATIC_PROP(data); + zval *data = *zend_std_get_static_property(THIS_CE, ZEND_STRS("data")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(data), Z_STRLEN_P(data), SEND_DATA); + break; } - break; case SEND_RSRC: { php_stream *s; - zval *z = GET_STATIC_PROP(stream); + zval *z = *zend_std_get_static_property(THIS_CE, ZEND_STRS("stream")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); z->type = IS_RESOURCE; php_stream_from_zval(s, &z); ct = http_guess_content_type(magic_file, magic_mode, s, 0, SEND_RSRC); + break; } - break; default: - ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(GET_STATIC_PROP(file)), 0, -1); - break; + ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(*zend_std_get_static_property(THIS_CE, ZEND_STRS("file")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC)), 0, -1); + break; } if (ct) { - UPD_STATIC_PROP(string, contentType, ct); + zend_update_static_property_string(THIS_CE, ZEND_STRS("contentType")-1, ct TSRMLS_CC); RETVAL_STRING(ct, 0); } } SET_EH_NORMAL(); #else http_error(HE_THROW, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available"); + RETURN_FALSE; #endif } /* }}} */ /* {{{ proto static bool HttpResponse::setContentDisposition(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). - * - * Expects a string parameter specifying the file name the "Save as..." dialogue - * should display. Optionally accepts a bool parameter, which, if set to true - * and the user agent knows how to handle the content type, will probably not - * cause the popup window to be shown. - * - * Returns TRUE on success or FALSE on failure. - */ + Set the Content-Disposition. */ PHP_METHOD(HttpResponse, setContentDisposition) { char *file, *cd; @@ -646,37 +459,26 @@ PHP_METHOD(HttpResponse, setContentDisposition) } cd_len = spprintf(&cd, 0, "%s; filename=\"%s\"", send_inline ? "inline" : "attachment", file); - RETVAL_SUCCESS(UPD_STATIC_STRL(contentDisposition, cd, cd_len)); + RETVAL_SUCCESS(zend_update_static_property_stringl(THIS_CE, ZEND_STRS("contentDisposition")-1, cd, cd_len TSRMLS_CC)); efree(cd); } /* }}} */ /* {{{ proto static string HttpResponse::getContentDisposition() - * - * Get current Content-Disposition setting. - * - * Returns the current content disposition as string like sent in a header. - */ + Get current Content-Disposition setting. */ PHP_METHOD(HttpResponse, getContentDisposition) { NO_ARGS; - IF_RETVAL_USED { - zval *cd = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(contentDisposition)); - - RETURN_ZVAL(cd, 1, 0); + if (return_value_used) { + zval *cdisp = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("contentDisposition")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(cdisp, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::setETag(string etag) - * - * Set a custom ETag. Use this only if you know what you're doing. - * - * Expects an unquoted string as parameter containing the ETag. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set a custom ETag. Use this only if you know what you're doing. */ PHP_METHOD(HttpResponse, setETag) { char *etag; @@ -686,37 +488,25 @@ PHP_METHOD(HttpResponse, setETag) RETURN_FALSE; } - RETURN_SUCCESS(UPD_STATIC_STRL(eTag, etag, etag_len)); + RETURN_SUCCESS(zend_update_static_property_stringl(THIS_CE, ZEND_STRS("eTag")-1, etag, etag_len TSRMLS_CC)); } /* }}} */ /* {{{ proto static string HttpResponse::getETag() - * - * Get calculated or previously set custom ETag. - * - * Returns the calculated or previously set ETag as unquoted string. - */ + Get calculated or previously set custom ETag. */ PHP_METHOD(HttpResponse, getETag) { NO_ARGS; - IF_RETVAL_USED { - zval *etag = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag)); - - RETURN_ZVAL(etag, 1, 0); + if (return_value_used) { + zval *etag = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("eTag")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(etag, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::setLastModified(int timestamp) - * - * Set a custom Last-Modified date. - * - * Expects an unix timestamp as parameter representing the last modification - * time of the sent entity. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set a custom Last-Modified date. */ PHP_METHOD(HttpResponse, setLastModified) { long lm; @@ -725,42 +515,25 @@ PHP_METHOD(HttpResponse, setLastModified) RETURN_FALSE; } - RETURN_SUCCESS(UPD_STATIC_PROP(long, lastModified, lm)); + RETURN_SUCCESS(zend_update_static_property_long(THIS_CE, ZEND_STRS("lastModified")-1, lm TSRMLS_CC)); } /* }}} */ /* {{{ proto static int HttpResponse::getLastModified() - * - * Get calculated or previously set custom Last-Modified date. - * - * Returns the calculated or previously set unix timestamp. - */ + Get calculated or previously set custom Last-Modified date. */ PHP_METHOD(HttpResponse, getLastModified) { NO_ARGS; - IF_RETVAL_USED { - zval *lm = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified)); - - RETURN_ZVAL(lm, 1, 0); + if (return_value_used) { + zval *lmod = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("lastModified")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(lmod, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::setThrottleDelay(double seconds) - * - * Sets the throttle delay for use with HttpResponse::setBufferSize(). - * - * Provides a basic throttling mechanism, which will yield the current process - * resp. thread until the entity has been completely sent, though. - * - * Note: This doesn't really work with the FastCGI SAPI. - * - * Expects a double parameter specifying the seconds too sleep() after - * each chunk sent. - * - * Returns TRUE on success, or FALSE on failure. - */ + Sets the throttle delay for use with HttpResponse::setBufferSize(). */ PHP_METHOD(HttpResponse, setThrottleDelay) { double seconds; @@ -768,41 +541,25 @@ PHP_METHOD(HttpResponse, setThrottleDelay) if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &seconds)) { RETURN_FALSE; } - RETURN_SUCCESS(UPD_STATIC_PROP(double, throttleDelay, seconds)); + RETURN_SUCCESS(zend_update_static_property_double(THIS_CE, ZEND_STRS("throttleDelay")-1, seconds TSRMLS_CC)); } /* }}} */ /* {{{ proto static double HttpResponse::getThrottleDelay() - * - * Get the current throttle delay. - * - * Returns a double representing the throttle delay in seconds. - */ + Get the current throttle delay. */ PHP_METHOD(HttpResponse, getThrottleDelay) { NO_ARGS; - IF_RETVAL_USED { - zval *delay = convert_to_type_ex(IS_DOUBLE, GET_STATIC_PROP(throttleDelay)); - - RETURN_ZVAL(delay, 1, 0); + if (return_value_used) { + zval *tdel = http_zsep(IS_DOUBLE, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("throttleDelay")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(tdel, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::setBufferSize(int bytes) - * - * Sets the send buffer size for use with HttpResponse::setThrottleDelay(). - * - * Provides a basic throttling mechanism, which will yield the current process - * resp. thread until the entity has been completely sent, though. - * - * Note: This doesn't really work with the FastCGI SAPI. - * - * Expects an int parameter representing the chunk size in bytes. - * - * Returns TRUE on success, or FALSE on failure. - */ + Sets the send buffer size for use with HttpResponse::setThrottleDelay(). */ PHP_METHOD(HttpResponse, setBufferSize) { long bytes; @@ -810,62 +567,46 @@ PHP_METHOD(HttpResponse, setBufferSize) if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &bytes)) { RETURN_FALSE; } - RETURN_SUCCESS(UPD_STATIC_PROP(long, bufferSize, bytes)); + RETURN_SUCCESS(zend_update_static_property_long(THIS_CE, ZEND_STRS("bufferSize")-1, bytes TSRMLS_CC)); } /* }}} */ /* {{{ proto static int HttpResponse::getBufferSize() - * - * Get current buffer size. - * - * Returns an int representing the current buffer size in bytes. - */ + Get current buffer size. */ PHP_METHOD(HttpResponse, getBufferSize) { NO_ARGS; - IF_RETVAL_USED { - zval *size = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(bufferSize)); - - RETURN_ZVAL(size, 1, 0); + if (return_value_used) { + zval *bsize = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("bufferSize")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(bsize, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::setData(mixed data) - * - * Set the data to be sent. - * - * Expects one parameter, which will be converted to a string and contains - * the data to send. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set the data to be sent. */ PHP_METHOD(HttpResponse, setData) { + char *etag; zval *the_data; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_data)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &the_data)) { RETURN_FALSE; } if (Z_TYPE_P(the_data) != IS_STRING) { - convert_to_string_ex(&the_data); + convert_to_string(the_data); } - if ( (SUCCESS != SET_STATIC_PROP(data, the_data)) || - (SUCCESS != UPD_STATIC_PROP(long, mode, SEND_DATA))) { + if ( (SUCCESS != zend_update_static_property(THIS_CE, ZEND_STRS("data")-1, the_data TSRMLS_CC)) || + (SUCCESS != zend_update_static_property_long(THIS_CE, ZEND_STRS("mode")-1, SEND_DATA TSRMLS_CC))) { RETURN_FALSE; } - if (!(Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified))) > 0)) { - UPD_STATIC_PROP(long, lastModified, http_last_modified(the_data, SEND_DATA)); - } - if (!Z_STRLEN_P(convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag)))) { - char *etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA); - if (etag) { - UPD_STATIC_PROP(string, eTag, etag); - efree(etag); - } + zend_update_static_property_long(THIS_CE, ZEND_STRS("lastModified")-1, http_last_modified(the_data, SEND_DATA) TSRMLS_CC); + if ((etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA))) { + zend_update_static_property_string(THIS_CE, ZEND_STRS("eTag")-1, etag TSRMLS_CC); + efree(etag); } RETURN_TRUE; @@ -873,17 +614,13 @@ PHP_METHOD(HttpResponse, setData) /* }}} */ /* {{{ proto static string HttpResponse::getData() - * - * Get the previously set data to be sent. - * - * Returns a string containing the previously set data to send. - */ + Get the previously set data to be sent. */ PHP_METHOD(HttpResponse, getData) { NO_ARGS; - IF_RETVAL_USED { - zval *the_data = GET_STATIC_PROP(data); + if (return_value_used) { + zval *the_data = *zend_std_get_static_property(THIS_CE, ZEND_STRS("data")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); RETURN_ZVAL(the_data, 1, 0); } @@ -891,16 +628,10 @@ PHP_METHOD(HttpResponse, getData) /* }}} */ /* {{{ proto static bool HttpResponse::setStream(resource stream) - * - * Set the resource to be sent. - * - * Expects a resource parameter referencing an already opened stream from - * which the data to send will be read. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set the resource to be sent. */ PHP_METHOD(HttpResponse, setStream) { + char *etag; zval *the_stream; php_stream *the_real_stream; php_stream_statbuf ssb; @@ -914,21 +645,16 @@ PHP_METHOD(HttpResponse, setStream) RETURN_FALSE; } - if ( (SUCCESS != UPD_STATIC_PROP(long, stream, Z_LVAL_P(the_stream))) || - (SUCCESS != UPD_STATIC_PROP(long, mode, SEND_RSRC))) { + if ( (SUCCESS != zend_update_static_property_long(THIS_CE, ZEND_STRS("stream")-1, Z_LVAL_P(the_stream) TSRMLS_CC)) || + (SUCCESS != zend_update_static_property_long(THIS_CE, ZEND_STRS("mode")-1, SEND_RSRC TSRMLS_CC))) { RETURN_FALSE; } zend_list_addref(Z_LVAL_P(the_stream)); - if (!(Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified))) > 0)) { - UPD_STATIC_PROP(long, lastModified, http_last_modified(the_real_stream, SEND_RSRC)); - } - if (!Z_STRLEN_P(convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag)))) { - char *etag = http_etag(the_real_stream, 0, SEND_RSRC); - if (etag) { - UPD_STATIC_PROP(string, eTag, etag); - efree(etag); - } + zend_update_static_property_long(THIS_CE, ZEND_STRS("lastModified")-1, http_last_modified(the_real_stream, SEND_RSRC) TSRMLS_CC); + if ((etag = http_etag(the_real_stream, 0, SEND_RSRC))) { + zend_update_static_property_string(THIS_CE, ZEND_STRS("eTag")-1, etag TSRMLS_CC); + efree(etag); } RETURN_TRUE; @@ -936,32 +662,24 @@ PHP_METHOD(HttpResponse, setStream) /* }}} */ /* {{{ proto static resource HttpResponse::getStream() - * - * Get the previously set resource to be sent. - * - * Returns the previously set resource. - */ + Get the previously set resource to be sent. */ PHP_METHOD(HttpResponse, getStream) { NO_ARGS; - IF_RETVAL_USED { - RETURN_RESOURCE(Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_STATIC_PROP(stream)))); + if (return_value_used) { + zval *stream = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("stream")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_RESOURCE(Z_LVAL_P(stream)); + zval_ptr_dtor(&stream); } } /* }}} */ /* {{{ proto static bool HttpResponse::setFile(string file) - * - * Set the file to be sent. - * - * Expects a string as parameter, specifying the path to the file to send. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set the file to be sent. */ PHP_METHOD(HttpResponse, setFile) { - char *the_file; + char *the_file, *etag; int file_len; php_stream_statbuf ssb; @@ -973,20 +691,15 @@ PHP_METHOD(HttpResponse, setFile) RETURN_FALSE; } - if ( (SUCCESS != UPD_STATIC_STRL(file, the_file, file_len)) || - (SUCCESS != UPD_STATIC_PROP(long, mode, -1))) { + if ( (SUCCESS != zend_update_static_property_stringl(THIS_CE, ZEND_STRS("file")-1, the_file, file_len TSRMLS_CC)) || + (SUCCESS != zend_update_static_property_long(THIS_CE, ZEND_STRS("mode")-1, -1 TSRMLS_CC))) { RETURN_FALSE; } - if (!(Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified))) > 0)) { - UPD_STATIC_PROP(long, lastModified, http_last_modified(the_file, -1)); - } - if (!Z_STRLEN_P(convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag)))) { - char *etag = http_etag(the_file, 0, -1); - if (etag) { - UPD_STATIC_PROP(string, eTag, etag); - efree(etag); - } + zend_update_static_property_long(THIS_CE, ZEND_STRS("lastModified")-1, http_last_modified(the_file, -1) TSRMLS_CC); + if ((etag = http_etag(the_file, 0, -1))) { + zend_update_static_property_string(THIS_CE, ZEND_STRS("eTag")-1, etag TSRMLS_CC); + efree(etag); } RETURN_TRUE; @@ -994,47 +707,20 @@ PHP_METHOD(HttpResponse, setFile) /* }}} */ /* {{{ proto static string HttpResponse::getFile() - * - * Get the previously set file to be sent. - * - * Returns the previously set path to the file to send as string. - */ + Get the previously set file to be sent. */ PHP_METHOD(HttpResponse, getFile) { NO_ARGS; - IF_RETVAL_USED { - zval *the_file = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(file)); - - RETURN_ZVAL(the_file, 1, 0); + if (return_value_used) { + zval *file = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("file")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_ZVAL(file, 1, 1); } } /* }}} */ /* {{{ proto static bool HttpResponse::send([bool clean_ob = true]) - * - * Finally send the entity. - * - * Accepts an optional boolean parameter, specifying wheter the ouput - * buffers should be discarded prior sending. A successful caching attempt - * will cause a script termination, and write a log entry if the INI setting - * http.cache_log is set. - * - * Returns TRUE on success, or FALSE on failure. - * - * Throws HttpHeaderException, HttpResponseException if http.onyl_excpetions is TRUE. - * - * Example: - * 
- * 
- *
- */ + Finally send the entity. */ PHP_METHOD(HttpResponse, send) { zval *sent; @@ -1043,13 +729,11 @@ PHP_METHOD(HttpResponse, send) if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &clean_ob)) { RETURN_FALSE; } - if (SG(headers_sent)) { - http_error(HE_WARNING, HTTP_E_RESPONSE, "Cannot send HttpResponse, headers have already been sent"); - RETURN_FALSE; - } + + HTTP_CHECK_HEADERS_SENT(RETURN_FALSE); - sent = GET_STATIC_PROP(sent); - if (zval_is_true(sent)) { + sent = *zend_std_get_static_property(THIS_CE, ZEND_STRS("sent")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); + if (Z_LVAL_P(sent)) { http_error(HE_WARNING, HTTP_E_RESPONSE, "Cannot send HttpResponse, response has already been sent"); RETURN_FALSE; } else { @@ -1057,48 +741,73 @@ PHP_METHOD(HttpResponse, send) } /* capture mode */ - if (zval_is_true(GET_STATIC_PROP(catch))) { - zval *the_data; + if (i_zend_is_true(*zend_std_get_static_property(THIS_CE, ZEND_STRS("catch")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))) { + zval *zetag, *the_data; MAKE_STD_ZVAL(the_data); +#ifdef PHP_OUTPUT_NEWAPI + php_output_get_contents(the_data TSRMLS_CC); +#else php_ob_get_buffer(the_data TSRMLS_CC); - SET_STATIC_PROP(data, the_data); - ZVAL_LONG(GET_STATIC_PROP(mode), SEND_DATA); +#endif + zend_update_static_property(THIS_CE, ZEND_STRS("data")-1, the_data TSRMLS_CC); + ZVAL_LONG(*zend_std_get_static_property(THIS_CE, ZEND_STRS("mode")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC), SEND_DATA); - if (!Z_STRLEN_P(convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag)))) { + zetag = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("eTag")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + if (!Z_STRLEN_P(zetag)) { char *etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA); if (etag) { - UPD_STATIC_PROP(string, eTag, etag); + zend_update_static_property_string(THIS_CE, ZEND_STRS("eTag")-1, etag TSRMLS_CC); efree(etag); } } zval_ptr_dtor(&the_data); + zval_ptr_dtor(&zetag); clean_ob = 1; } if (clean_ob) { /* interrupt on-the-fly etag generation */ - HTTP_G(etag).started = 0; + HTTP_G->etag.started = 0; /* discard previous output buffers */ +#ifdef PHP_OUTPUT_NEWAPI + php_output_discard_all(TSRMLS_C); +#else php_end_ob_buffers(0 TSRMLS_CC); +#endif } /* caching */ - if (zval_is_true(GET_STATIC_PROP(cache))) { + if (i_zend_is_true(*zend_std_get_static_property(THIS_CE, ZEND_STRS("cache")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))) { zval *cctl, *etag, *lmod; - - etag = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag)); - lmod = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified)); - cctl = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(cacheControl)); - - http_cache_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag), Z_STRVAL_P(cctl), Z_STRLEN_P(cctl)); - http_cache_last_modified(Z_LVAL_P(lmod), Z_LVAL_P(lmod) ? Z_LVAL_P(lmod) : time(NULL), Z_STRVAL_P(cctl), Z_STRLEN_P(cctl)); + + lmod = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("lastModified")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + etag = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("eTag")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + cctl = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("cacheControl")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + + if (Z_LVAL_P(lmod) || Z_STRLEN_P(etag)) { + if (Z_STRLEN_P(cctl)) { + http_send_cache_control(Z_STRVAL_P(cctl), Z_STRLEN_P(cctl)); + } else { + http_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL)); + } + if (Z_STRLEN_P(etag)) { + http_send_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag)); + } + if (Z_LVAL_P(lmod)) { + http_send_last_modified(Z_LVAL_P(lmod)); + } + } + + zval_ptr_dtor(&etag); + zval_ptr_dtor(&lmod); + zval_ptr_dtor(&cctl); } /* content type */ { - zval *ctype = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(contentType)); + zval *ctype = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("contentType")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); if (Z_STRLEN_P(ctype)) { http_send_content_type(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype)); } else { @@ -1111,76 +820,80 @@ PHP_METHOD(HttpResponse, send) http_send_content_type("application/x-octetstream", lenof("application/x-octetstream")); } } + zval_ptr_dtor(&ctype); } /* content disposition */ { - zval *cd = GET_STATIC_PROP(contentDisposition); + zval *cd = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("contentDisposition")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); if (Z_STRLEN_P(cd)) { http_send_header_ex("Content-Disposition", lenof("Content-Disposition"), Z_STRVAL_P(cd), Z_STRLEN_P(cd), 1, NULL); } + zval_ptr_dtor(&cd); } /* throttling */ { - HTTP_G(send).buffer_size = Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_STATIC_PROP(bufferSize))); - HTTP_G(send).throttle_delay = Z_DVAL_P(convert_to_type_ex(IS_DOUBLE, GET_STATIC_PROP(throttleDelay))); + zval *bsize = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("bufferSize")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + zval *delay = http_zsep(IS_DOUBLE, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("throttleDelay")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + HTTP_G->send.buffer_size = Z_LVAL_P(bsize); + HTTP_G->send.throttle_delay = Z_DVAL_P(delay); + zval_ptr_dtor(&bsize); + zval_ptr_dtor(&delay); } /* gzip */ - if (zval_is_true(GET_STATIC_PROP(gzip))) { - php_start_ob_buffer_named("ob_gzhandler", HTTP_G(send).buffer_size, 0 TSRMLS_CC); - } else { - php_start_ob_buffer(NULL, HTTP_G(send).buffer_size, 0 TSRMLS_CC); - } - + HTTP_G->send.deflate.response = i_zend_is_true(*zend_std_get_static_property(THIS_CE, ZEND_STRS("gzip")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC)); + /* send */ - switch (Z_LVAL_P(GET_STATIC_PROP(mode))) - { + switch (Z_LVAL_P(*zend_std_get_static_property(THIS_CE, ZEND_STRS("mode")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))) { case SEND_DATA: { - zval *zdata = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(data)); - RETURN_SUCCESS(http_send_data_ex(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata), 1)); + zval *zdata = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("data")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_SUCCESS(http_send_data(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata))); + zval_ptr_dtor(&zdata); + return; } case SEND_RSRC: { php_stream *the_real_stream; - zval *the_stream = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(stream)); + zval *the_stream = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("stream")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); the_stream->type = IS_RESOURCE; php_stream_from_zval(the_real_stream, &the_stream); - RETURN_SUCCESS(http_send_stream_ex(the_real_stream, 0, 1)); + RETVAL_SUCCESS(http_send_stream(the_real_stream)); + zval_ptr_dtor(&the_stream); + return; } default: { - RETURN_SUCCESS(http_send_file_ex(Z_STRVAL_P(convert_to_type_ex(IS_STRING, GET_STATIC_PROP(file))), 1)); + zval *file = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("file")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); + RETVAL_SUCCESS(http_send_file(Z_STRVAL_P(file))); + zval_ptr_dtor(&file); + return; } } } /* }}} */ /* {{{ proto static void HttpResponse::capture() - * - * Capture script output. - * - * Example: - * 
- * 
- *
+ Capture script output. */ PHP_METHOD(HttpResponse, capture) { NO_ARGS; + + HTTP_CHECK_HEADERS_SENT(RETURN_FALSE); - UPD_STATIC_PROP(long, catch, 1); - + zend_update_static_property_long(THIS_CE, ZEND_STRS("catch")-1, 1 TSRMLS_CC); +#ifdef PHP_OUTPUT_NEWAPI + php_output_discard_all(TSRMLS_C); + php_output_start_default(TSRMLS_C); +#else php_end_ob_buffers(0 TSRMLS_CC); - php_start_ob_buffer(NULL, 40960, 0 TSRMLS_CC); + php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC); +#endif /* register shutdown function */ {