X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message.c;h=f7696da5f520915f135ce051b368068c2b41b101;hp=cc04edcf3850285742935ce626e74b76fdb816ef;hb=a5c998ba6ef2aaa080ee724ddfac5bfd9ef995c9;hpb=d739650057f4ca2fc67f1ae2bfd1d24c3f2f9e7b

diff --git a/php_http_message.c b/php_http_message.c
index cc04edc..f7696da 100644
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -98,6 +98,19 @@ php_http_message_t *php_http_message_init_env(php_http_message_t *message, php_h
 					zval_dtor(&tval);
 				}
 			}
+#else
+			if (OG(ob_nesting_level)) {
+				if (php_get_output_start_filename(TSRMLS_C)) {
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch response body, output has already been sent at %s:%d", php_get_output_start_filename(TSRMLS_C), php_get_output_start_lineno(TSRMLS_C));
+					goto error;
+				} else if (SUCCESS != php_ob_get_buffer(&tval TSRMLS_CC)) {
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch response body");
+					goto error;
+				} else {
+					php_http_message_body_append(message->body, Z_STRVAL(tval), Z_STRLEN(tval));
+					zval_dtor(&tval);
+				}
+			}
 #endif
 			break;
 			
@@ -928,6 +941,7 @@ static HashTable *php_http_message_object_get_props(zval *object TSRMLS_DC)
 	HashTable *props = zend_get_std_object_handlers()->get_properties(object TSRMLS_CC);
 	zval array, *parent, *body;
 	char *version;
+	int verlen;
 
 	PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
 	
@@ -951,8 +965,9 @@ static HashTable *php_http_message_object_get_props(zval *object TSRMLS_DC)
 		} \
 	} while(0)
 
-	ASSOC_PROP(long, "type", msg->type);
-	ASSOC_STRINGL_EX("httpVersion", version, spprintf(&version, 0, "%u.%u", msg->http.version.major, msg->http.version.minor), 0);
+	ASSOC_PROP(long, "type", obj->message->type);
+	verlen = spprintf(&version, 0, "%u.%u", obj->message->http.version.major, obj->message->http.version.minor);
+	ASSOC_STRINGL_EX("httpVersion", version, verlen, 0);
 
 	switch (msg->type) {
 		case PHP_HTTP_REQUEST: