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 = 0, free_etag = 0;
+ php_http_cache_status_t ret = PHP_HTTP_CACHE_NO;
+ int free_etag = 0;
char *header = NULL, *etag;
zval *zetag, *zbody = NULL;
if (zbody) {
zval_ptr_dtor(&zbody);
}
- return PHP_HTTP_CACHE_NO;
+ return ret;
}
if ((zetag = get_option(options, ZEND_STRL("etag") TSRMLS_CC))) {
}
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);
+ ret = php_http_match(header, etag, PHP_HTTP_MATCH_WORD) ? PHP_HTTP_CACHE_HIT : PHP_HTTP_CACHE_MISS;
}
if (free_etag) {
}
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)
time_t ums, lm = 0;
zval *zbody = NULL, *zlm;
- if ( !(header = php_http_env_get_request_header(header_str, header_len, NULL 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)
) {
- STR_FREE(header);
if (zbody) {
zval_ptr_dtor(&zbody);
}
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);
}
}
-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;
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, 1 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("=") TSRMLS_CC)) {
+ ret = php_http_env_set_response_header_format(0, 1 TSRMLS_CC, "Content-Disposition: %s", PHP_HTTP_BUFFER_VAL(&buf));
}
+
+ php_http_buffer_dtor(&buf);
zval_ptr_dtor(&zoption_copy);
}
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;
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)
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)
}
+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_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;
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);
}
}
{
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);
-
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);