fix bug #60839 php_http_serf.h missing; prepare dev4 release

[m6w6/ext-http] / php_http_env_response.c

diff --git a/php_http_env_response.c b/php_http_env_response.c
index a374b425c74932ecd09642b034015ea6e2a53a39..2ddcb7105fc1ed73776ae494bf5637698b695fe0 100644 (file)
--- 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)
 {
@@ -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)