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

diff --git a/php_http_env_response.c b/php_http_env_response.c
index 2ddcb71..acfdb48 100644
--- a/php_http_env_response.c
+++ b/php_http_env_response.c
@@ -77,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, 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);
 		}
-		return PHP_HTTP_CACHE_NO;
+		return ret;
 	}
 
 	if ((zetag = get_option(options, ZEND_STRL("etag") TSRMLS_CC))) {
@@ -101,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;
 	}
@@ -115,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)
@@ -131,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);
 		}
@@ -156,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);
 
@@ -170,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;
 
@@ -404,7 +407,7 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r)
 							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);
+							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);
 
 							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);
@@ -482,38 +485,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);
 		}
 	}
 
@@ -687,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;
@@ -730,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)
@@ -760,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;