X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_env_response.c;h=2ddcb7105fc1ed73776ae494bf5637698b695fe0;hb=59ffe749e2571c7e4bf0cce12997f95f350bd58c;hp=2f147554dc1d988e3d2b13deaaff2745dca024f7;hpb=a07b79b1871054ca17e48b69445b4dc201f24662;p=m6w6%2Fext-http

diff --git a/php_http_env_response.c b/php_http_env_response.c
index 2f14755..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 <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)
 {
@@ -70,7 +63,7 @@ static zval *get_option(zval *options, const char *name_str, size_t name_len TSR
 		val = zend_read_property(Z_OBJCE_P(options), options, name, name_len, 0 TSRMLS_CC);
 		efree(name);
 	} else {
-		if (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), name_str, name_len + 1, (void *) &valptr)) {
+		if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(options), name_str, name_len + 1, (void *) &valptr)) {
 			val = *valptr;
 		} else {
 			val = NULL;
@@ -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)
@@ -392,6 +385,7 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r)
 				switch (Z_LVAL_P(zdisposition_copy)) {
 					case PHP_HTTP_CONTENT_DISPOSITION_NONE:
 						ret = php_http_env_set_response_header_value(0, ZEND_STRL("Content-Disposition"), NULL, 1 TSRMLS_CC);
+						break;
 					case PHP_HTTP_CONTENT_DISPOSITION_INLINE:
 						tmp = "inline";
 						break;
@@ -496,6 +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 */
 
 			case PHP_HTTP_CACHE_HIT:
 				ret = php_http_env_set_response_code(304 TSRMLS_CC);
@@ -664,6 +659,8 @@ PHP_HTTP_API STATUS php_http_env_response_send(php_http_env_response_t *r)
 						}
 						break;
 					}
+
+					break;
 			}
 		}
 	} else if (zbody) {
@@ -893,7 +890,7 @@ PHP_METHOD(HttpEnvResponse, send)
 
 PHP_MINIT_FUNCTION(http_env_response)
 {
-	PHP_HTTP_REGISTER_CLASS(http\\env, Response, http_env_response, php_http_message_class_entry, 0);
+	PHP_HTTP_REGISTER_CLASS(http\\Env, Response, http_env_response, php_http_message_class_entry, 0);
 
 	zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_DISPOSITION_NONE"), PHP_HTTP_CONTENT_DISPOSITION_NONE TSRMLS_CC);
 	zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_DISPOSITION_INLINE"), PHP_HTTP_CONTENT_DISPOSITION_INLINE TSRMLS_CC);