X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_env_response.c;h=e6ae66d2a30bdbbd5916cdaba7c328daee5f83e4;hb=1421b2b78469a66ebe3cd2958a608de9a036bca9;hp=bc30b3c0d1adf50b3e90c4e000f197dd0871dea0;hpb=29a54250b58e444974ae19840194e214cab80bd5;p=m6w6%2Fext-http

diff --git a/php_http_env_response.c b/php_http_env_response.c
index bc30b3c..e6ae66d 100644
--- a/php_http_env_response.c
+++ b/php_http_env_response.c
@@ -12,10 +12,6 @@
 
 #include "php_http_api.h"
 
-#include <ext/date/php_date.h>
-#include <ext/standard/php_string.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)
 {
 	if (Z_TYPE_P(options) == IS_OBJECT) {
@@ -81,12 +77,11 @@ 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;
+	int ret = 0, free_etag = 0;
 	char *header, *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)
 	) {
@@ -105,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;
 	}
@@ -119,12 +113,14 @@ 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);
+	}
 
 	if (free_etag) {
 		efree(etag);
 	}
-	efree(header);
+	STR_FREE(header);
 
 	return ret ? PHP_HTTP_CACHE_HIT : PHP_HTTP_CACHE_MISS;
 }
@@ -408,7 +404,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);
@@ -494,7 +490,7 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r)
 				if (PHP_HTTP_CACHE_HIT != php_http_env_is_response_cached_by_last_modified(options, ZEND_STRL("If-Modified-Since") TSRMLS_CC)) {
 					break;
 				}
-				/*  fallthrough */
+				/*  no break */
 
 			case PHP_HTTP_CACHE_HIT:
 				ret = php_http_env_set_response_code(304 TSRMLS_CC);
@@ -503,8 +499,15 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r)
 		}
 
 		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 *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);