X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env_response.c;h=43a7ea1c86f909f81e7ded17492679cff454bea3;hp=2f75eca9e71f95833ff6807e3e79fb3282962353;hb=6519517dbcc5d55117b3fa94572fe93123ddfe56;hpb=4ebb73feef38aea0560abf7c3a9435dda4d77820

diff --git a/php_http_env_response.c b/php_http_env_response.c
index 2f75eca..43a7ea1 100644
--- a/php_http_env_response.c
+++ b/php_http_env_response.c
@@ -363,7 +363,7 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r, php_ht
 
 	if ((zoption = get_option(options, ZEND_STRL("headers") TSRMLS_CC))) {
 		if (Z_TYPE_P(zoption) == IS_ARRAY) {
-			php_http_headers_to_callback(Z_ARRVAL_P(zoption), 0, r->ops->set_header, r TSRMLS_CC);
+			php_http_headers_to_callback(Z_ARRVAL_P(zoption), 0, (php_http_pass_format_callback_t) r->ops->set_header, r TSRMLS_CC);
 		}
 		zval_ptr_dtor(&zoption);
 	}
@@ -1134,17 +1134,24 @@ static zend_function_entry php_http_env_response_method_entry[] = {
 	EMPTY_FUNCTION_ENTRY
 };
 
+#define PHP_HTTP_ENV_RESPONSE_OBJECT_INIT(obj) \
+	do { \
+		if (!obj->message) { \
+			obj->message = php_http_message_init_env(NULL, PHP_HTTP_RESPONSE TSRMLS_CC); \
+		} \
+	} while (0)
 
 PHP_METHOD(HttpEnvResponse, __construct)
 {
 	with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
-		if (SUCCESS == zend_parse_parameters_none()) {
-			php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+		php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
+		if (SUCCESS == zend_parse_parameters_none()) {
 			with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
 				obj->message = php_http_message_init_env(obj->message, PHP_HTTP_RESPONSE TSRMLS_CC);
 			} end_error_handling();
 		}
+		PHP_HTTP_ENV_RESPONSE_OBJECT_INIT(obj);
 	} end_error_handling();
 
 }
@@ -1158,8 +1165,10 @@ PHP_METHOD(HttpEnvResponse, __invoke)
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &ob_str, &ob_len, &ob_flags)) {
 		php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-		if (obj->body.handle || SUCCESS == php_http_new(&obj->body, php_http_message_body_get_class_entry(), (php_http_new_t) php_http_message_body_object_new_ex, NULL, (void *) php_http_message_body_copy(&obj->message->body, NULL, 0), NULL TSRMLS_CC)) {
-			php_http_message_body_append(&obj->message->body, ob_str, ob_len);
+		PHP_HTTP_ENV_RESPONSE_OBJECT_INIT(obj);
+
+		if (obj->body.handle || SUCCESS == php_http_new(&obj->body, php_http_message_body_get_class_entry(), (php_http_new_t) php_http_message_body_object_new_ex, NULL, (void *) php_http_message_body_init(&obj->message->body, NULL TSRMLS_CC), NULL TSRMLS_CC)) {
+			php_http_message_body_append(obj->message->body, ob_str, ob_len);
 			RETURN_TRUE;
 		}
 		RETURN_FALSE;