X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message.c;h=88def26b8eccccc27bb914fa211059555a144464;hp=8c1f40ccbd077da096d6037d02a298a78014ceae;hb=371a7daee8ef02195769ebf846e0f5ca93093672;hpb=fc86bad83e836bbf363e82ed47cf3943795c45b3

diff --git a/php_http_message.c b/php_http_message.c
index 8c1f40c..88def26 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;
 			
@@ -149,7 +162,13 @@ php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char *
 zval *php_http_message_header(php_http_message_t *msg, const char *key_str, size_t key_len, int join)
 {
 	zval *ret = NULL, **header;
-	char *key = php_http_pretty_key(estrndup(key_str, key_len), key_len, 1, 1);
+	char *key;
+	ALLOCA_FLAG(free_key);
+
+	key = do_alloca(key_len + 1, free_key);
+	memcpy(key, key_str, key_len);
+	key[key_len] = '\0';
+	php_http_pretty_key(key, key_len, 1, 1);
 
 	if (SUCCESS == zend_symtable_find(&msg->hdrs, key, key_len + 1, (void *) &header)) {
 		if (join && Z_TYPE_PP(header) == IS_ARRAY) {
@@ -162,7 +181,7 @@ zval *php_http_message_header(php_http_message_t *msg, const char *key_str, size
 		}
 	}
 
-	efree(key);
+	free_alloca(key, free_key);
 
 	return ret;
 }
@@ -772,7 +791,9 @@ STATUS php_http_message_object_set_body(php_http_message_object_t *msg_obj, zval
 	}
 
 	body_obj = zend_object_store_get_object(zbody TSRMLS_CC);
-
+	if (!body_obj->body) {
+		body_obj->body = php_http_message_body_init(NULL, NULL TSRMLS_CC);
+	}
 	if (msg_obj->body) {
 		zend_objects_store_del_ref_by_handle(msg_obj->body->zv.handle TSRMLS_CC);
 	}