X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_env_response.c;h=acfdb48cf5c7fef225ac637c65530d1b4a6be3ad;hb=61067d19cf03ad876954c2644ff9e37942b2ad67;hp=4dee9bd80625a953dcef522471fc64ca6c5a098c;hpb=e0dfcd720b949fe1883e9a5b185d0d255a222707;p=m6w6%2Fext-http

diff --git a/php_http_env_response.c b/php_http_env_response.c
index 4dee9bd..acfdb48 100644
--- a/php_http_env_response.c
+++ b/php_http_env_response.c
@@ -77,7 +77,8 @@ 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 = 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;
 
@@ -88,7 +89,7 @@ PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_etag(zva
 		if (zbody) {
 			zval_ptr_dtor(&zbody);
 		}
-		return PHP_HTTP_CACHE_NO;
+		return ret;
 	}
 
 	if ((zetag = get_option(options, ZEND_STRL("etag") TSRMLS_CC))) {
@@ -113,7 +114,7 @@ PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_etag(zva
 	}
 
 	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) {
@@ -121,7 +122,7 @@ PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_etag(zva
 	}
 	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)
@@ -130,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, 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);
 		}
@@ -155,10 +154,15 @@ 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);
 
@@ -169,7 +173,7 @@ PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_last_mod
 	}
 }
 
-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;
 
@@ -700,6 +704,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;
@@ -743,6 +752,7 @@ PHP_HTTP_EMPTY_ARGS(send);
 
 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)
@@ -773,6 +783,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_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;