X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env_response.c;h=13a35c6af7054803de8760f6cc688ee2745ab954;hp=4d6ef037471fb9bb02faf0a32f2773e052a631e1;hb=refs%2Fheads%2Fv2.1.x;hpb=eaa046dc3e6496e523a17c3b786ef27067b9795c

diff --git a/php_http_env_response.c b/php_http_env_response.c
index 4d6ef03..13a35c6 100644
--- a/php_http_env_response.c
+++ b/php_http_env_response.c
@@ -329,6 +329,17 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r, php_ht
 		return ret;
 	}
 
+	if ((zoption = get_option(options, ZEND_STRL("headers") TSRMLS_CC))) {
+		if (Z_TYPE_P(zoption) == IS_ARRAY) {
+			php_http_header_to_callback(Z_ARRVAL_P(zoption), 0, (php_http_pass_format_callback_t) r->ops->set_header, r TSRMLS_CC);
+		}
+		zval_ptr_dtor(&zoption);
+	}
+
+	if (ret != SUCCESS) {
+		return ret;
+	}
+
 	if ((zoption = get_option(options, ZEND_STRL("responseCode") TSRMLS_CC))) {
 		zval *zoption_copy = php_http_ztyp(IS_LONG, zoption);
 
@@ -359,17 +370,6 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r, php_ht
 		return ret;
 	}
 
-	if ((zoption = get_option(options, ZEND_STRL("headers") TSRMLS_CC))) {
-		if (Z_TYPE_P(zoption) == IS_ARRAY) {
-			php_http_header_to_callback(Z_ARRVAL_P(zoption), 0, (php_http_pass_format_callback_t) r->ops->set_header, r TSRMLS_CC);
-		}
-		zval_ptr_dtor(&zoption);
-	}
-
-	if (ret != SUCCESS) {
-		return ret;
-	}
-
 	if ((zoption = get_option(options, ZEND_STRL("contentType") TSRMLS_CC))) {
 		zval *zoption_copy = php_http_ztyp(IS_STRING, zoption);
 
@@ -1096,7 +1096,11 @@ static PHP_METHOD(HttpEnvResponse, __invoke)
 
 		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
 		RETURN_TRUE;
+#else
+		RETURN_EMPTY_STRING();
+#endif
 	}
 }