X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_response_object.c;h=0d6cfa7cd59d2c150e7ab86a2c238c947fe0029e;hp=ec67afccb141571fbb58489f61bad99538cbfe9c;hb=0acbfc76b5a3e4122a6d06d64bd834a810806656;hpb=f82117306ee996c61611508df95b958f7966a4c1

diff --git a/http_response_object.c b/http_response_object.c
index ec67afc..0d6cfa7 100644
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -35,9 +35,6 @@
 #include "php_http_cache_api.h"
 #include "php_http_headers_api.h"
 
-#ifdef HTTP_HAVE_MHASH
-#	include <mhash.h>
-#endif
 #ifdef HTTP_HAVE_MAGIC
 #	include <magic.h>
 #endif
@@ -243,26 +240,6 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D)
 	DCL_CONST(long, "REDIRECT_PERM", HTTP_REDIRECT_PERM);
 	DCL_CONST(long, "REDIRECT_POST", HTTP_REDIRECT_POST);
 	DCL_CONST(long, "REDIRECT_TEMP", HTTP_REDIRECT_TEMP);
-	
-	DCL_CONST(long, "ETAG_MD5", HTTP_ETAG_MD5);
-	DCL_CONST(long, "ETAG_SHA1", HTTP_ETAG_SHA1);
-	DCL_CONST(long, "ETAG_CRC32", HTTP_ETAG_CRC32);
-	
-#	ifdef HTTP_HAVE_MHASH
-	{
-		int l, i, c = mhash_count();
-		
-		for (i = 0; i <= c; ++i) {
-			char const_name[256] = {0};
-			const char *hash_name = mhash_get_hash_name_static(i);
-			
-			if (hash_name) {
-				l = snprintf(const_name, 255, "ETAG_MHASH_%s", hash_name);
-				zend_declare_class_constant_long(ce, const_name, l, i TSRMLS_CC);
-			}
-		}
-	}
-#	endif /* HTTP_HAVE_MHASH */
 #endif /* WONKY */
 }
 
@@ -293,7 +270,7 @@ PHP_METHOD(HttpResponse, setHeader)
 	zend_bool replace = 1;
 	char *name;
 	int name_len = 0;
-	zval *value = NULL;
+	zval *value = NULL, *orig = NULL;
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/!|b", &name, &name_len, &value, &replace)) {
 		RETURN_FALSE;
@@ -314,20 +291,31 @@ PHP_METHOD(HttpResponse, setHeader)
 	/* send multiple header if replace is false and value is an array */
 	if (!replace && Z_TYPE_P(value) == IS_ARRAY) {
 		zval **data;
+		HashPosition pos;
 		
-		FOREACH_VAL(value, data) {
+		FOREACH_VAL(pos, value, data) {
+			zval *orig = *data;
+			
 			convert_to_string_ex(data);
 			if (SUCCESS != http_send_header_ex(name, name_len, Z_STRVAL_PP(data), Z_STRLEN_PP(data), 0, NULL)) {
+				if (orig != *data) {
+					zval_ptr_dtor(data);
+				}
 				RETURN_FALSE;
 			}
+			if (orig != *data) {
+				zval_ptr_dtor(data);
+			}
 		}
 		RETURN_TRUE;
 	}
 	/* send standard header */
-	if (Z_TYPE_P(value) != IS_STRING) {
-		convert_to_string_ex(&value);
+	orig = value;
+	convert_to_string_ex(&value);
+	RETVAL_SUCCESS(http_send_header_ex(name, name_len, Z_STRVAL_P(value), Z_STRLEN_P(value), replace, NULL));
+	if (orig != value) {
+		zval_ptr_dtor(&value);
 	}
-	RETURN_SUCCESS(http_send_header_ex(name, name_len, Z_STRVAL_P(value), Z_STRLEN_P(value), replace, NULL));
 }
 /* }}} */
 
@@ -889,7 +877,7 @@ PHP_METHOD(HttpResponse, setData)
 	}
 	
 	UPD_STATIC_PROP(long, lastModified, http_last_modified(the_data, SEND_DATA));
-	if (etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA)) {
+	if ((etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA))) {
 		UPD_STATIC_PROP(string, eTag, etag);
 		efree(etag);
 	}
@@ -948,7 +936,7 @@ PHP_METHOD(HttpResponse, setStream)
 	zend_list_addref(Z_LVAL_P(the_stream));
 	
 	UPD_STATIC_PROP(long, lastModified, http_last_modified(the_real_stream, SEND_RSRC));
-	if (etag = http_etag(the_real_stream, 0, SEND_RSRC)) {
+	if ((etag = http_etag(the_real_stream, 0, SEND_RSRC))) {
 		UPD_STATIC_PROP(string, eTag, etag);
 		efree(etag);
 	}
@@ -1007,7 +995,7 @@ PHP_METHOD(HttpResponse, setFile)
 	}
 
 	UPD_STATIC_PROP(long, lastModified, http_last_modified(the_file, -1));
-	if (etag = http_etag(the_file, 0, -1)) {
+	if ((etag = http_etag(the_file, 0, -1))) {
 		UPD_STATIC_PROP(string, eTag, etag);
 		efree(etag);
 	}
@@ -1070,13 +1058,11 @@ PHP_METHOD(HttpResponse, send)
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &clean_ob)) {
 		RETURN_FALSE;
 	}
-	if (SG(headers_sent)) {
-		http_error(HE_WARNING, HTTP_E_RESPONSE, "Cannot send HttpResponse, headers have already been sent");
-		RETURN_FALSE;
-	}
+	
+	HTTP_CHECK_HEADERS_SENT(RETURN_FALSE);
 
 	sent = GET_STATIC_PROP(sent);
-	if (zval_is_true(sent)) {
+	if (Z_LVAL_P(sent)) {
 		http_error(HE_WARNING, HTTP_E_RESPONSE, "Cannot send HttpResponse, response has already been sent");
 		RETURN_FALSE;
 	} else {
@@ -1129,6 +1115,10 @@ PHP_METHOD(HttpResponse, send)
 		if (etag_p) zval_ptr_dtor(&etag_p);
 		if (lmod_p) zval_ptr_dtor(&lmod_p);
 		if (cctl_p) zval_ptr_dtor(&cctl_p);
+	
+		if (php_ob_handler_used("blackhole" TSRMLS_CC)) {
+			RETURN_TRUE;
+		}
 	}
 
 	/* content type */
@@ -1227,6 +1217,8 @@ PHP_METHOD(HttpResponse, send)
 PHP_METHOD(HttpResponse, capture)
 {
 	NO_ARGS;
+	
+	HTTP_CHECK_HEADERS_SENT(RETURN_FALSE);
 
 	UPD_STATIC_PROP(long, catch, 1);