X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_env_response.c;h=2ddcb7105fc1ed73776ae494bf5637698b695fe0;hb=1e674ad6a7e867b1b4d04db098b59981fe3f011d;hp=a374b425c74932ecd09642b034015ea6e2a53a39;hpb=4062420a5e5d301db4a3d820be881e7675a242e1;p=m6w6%2Fext-http diff --git a/php_http_env_response.c b/php_http_env_response.c index a374b42..2ddcb71 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 | + | Copyright (c) 2004-2011, Michael Wallner | +--------------------------------------------------------------------+ */ -/* $Id $ */ - -#include "php_http.h" - -#include
-#include -#include - +#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) { @@ -88,7 +81,7 @@ PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_etag(zva 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) @@ -138,7 +131,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)