X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env_response.c;h=20a31eb90fea41b0ad73aa22c9e8011867dc1c95;hp=892318657b9ea7a0dcf95b47abb931c1b6b1e8d3;hb=256a3e275575fe336810530e4e5fe869b00540ee;hpb=11da833baa3804fd3e70f818582700eedc368f1c

diff --git a/php_http_env_response.c b/php_http_env_response.c
index 8923186..20a31eb 100644
--- a/php_http_env_response.c
+++ b/php_http_env_response.c
@@ -228,8 +228,8 @@ php_http_cache_status_t php_http_env_is_response_cached_by_last_modified(zval *o
 
 static zend_bool php_http_env_response_is_cacheable(php_http_env_response_t *r, php_http_message_t *request)
 {
-	TSRMLS_FETCH_FROM_CTX(r->ts);
 	long status = r->ops->get_status(r);
+	TSRMLS_FETCH_FROM_CTX(r->ts);
 
 	if (status && status / 100 != 2) {
 		return 0;
@@ -1213,8 +1213,9 @@ static PHP_METHOD(HttpEnvResponse, __invoke)
 
 		PHP_HTTP_ENV_RESPONSE_OBJECT_INIT(obj);
 
-		php_http_message_object_init_body_object(obj);
-
+		if (!obj->body) {
+			php_http_message_object_init_body_object(obj);
+		}
 		php_http_message_body_append(obj->message->body, ob_str, ob_len);
 #if PHP_VERSION_ID >= 50400
 		if (ob_flags & PHP_OUTPUT_HANDLER_CLEAN) {