X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env_response.c;h=0d220d0c281a1e6c193de631f96ccf38967724dd;hp=a374b425c74932ecd09642b034015ea6e2a53a39;hb=4407379af8d886b627c88572e9da69c38cdbda58;hpb=4062420a5e5d301db4a3d820be881e7675a242e1

diff --git a/php_http_env_response.c b/php_http_env_response.c
index a374b42..0d220d0 100644
--- a/php_http_env_response.c
+++ b/php_http_env_response.c
@@ -6,18 +6,11 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id $ */
-
-#include "php_http.h"
-
-#include <main/SAPI.h>
-#include <ext/date/php_date.h>
-#include <ext/standard/php_string.h>
-
+#include "php_http_api.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)
 {
@@ -84,11 +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 TSRMLS_CC))
+	if (	!(header = php_http_env_get_request_header(header_str, header_len, NULL TSRMLS_CC))
 	||		!(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)
@@ -108,8 +101,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;
 	}
@@ -122,7 +114,9 @@ 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) {
+		ret = php_http_match(header, etag, PHP_HTTP_MATCH_WORD);
+	}
 
 	if (free_etag) {
 		efree(etag);
@@ -138,7 +132,7 @@ 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 TSRMLS_CC))
+	if (	!(header = php_http_env_get_request_header(header_str, header_len, NULL TSRMLS_CC))
 	||		!(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)