X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_message.c;h=feef2655f565357a9dbb74543da43cdb135755df;hp=078ae4cea4f90fa28a478fc837f920f0546ad06c;hb=bebb37d8185572d3766b7517ae8357bcc89227f8;hpb=faf7a7899fa8ffb24f8105a921f359d6b97ec34e

diff --git a/src/php_http_message.c b/src/php_http_message.c
index 078ae4c..feef265 100644
--- a/src/php_http_message.c
+++ b/src/php_http_message.c
@@ -330,24 +330,14 @@ void php_http_message_update_headers(php_http_message_t *msg)
 static void message_headers(php_http_message_t *msg, php_http_buffer_t *str)
 {
 	char *tmp = NULL;
+	size_t len = 0;
 
-	switch (msg->type) {
-		case PHP_HTTP_REQUEST:
-			php_http_buffer_appendf(str, PHP_HTTP_INFO_REQUEST_FMT_ARGS(&msg->http, tmp, PHP_HTTP_CRLF));
-			PTR_FREE(tmp);
-			break;
-
-		case PHP_HTTP_RESPONSE:
-			php_http_buffer_appendf(str, PHP_HTTP_INFO_RESPONSE_FMT_ARGS(&msg->http, tmp, PHP_HTTP_CRLF));
-			PTR_FREE(tmp);
-			break;
-
-		default:
-			break;
-	}
-
+	php_http_info_to_string((php_http_info_t *) msg, &tmp, &len, PHP_HTTP_CRLF TSRMLS_CC);
 	php_http_message_update_headers(msg);
+
+	php_http_buffer_append(str, tmp, len);
 	php_http_header_to_string(str, &msg->hdrs);
+	PTR_FREE(tmp);
 }
 
 void php_http_message_to_callback(php_http_message_t *msg, php_http_pass_callback_t cb, void *cb_arg)
@@ -415,7 +405,7 @@ php_http_message_t *php_http_message_reverse(php_http_message_t *msg)
 	if (c > 1) {
 		php_http_message_t *tmp = msg, **arr;
 
-		arr = ecalloc(c, sizeof(**arr));
+		arr = ecalloc(c, sizeof(*arr));
 		for (i = 0; i < c; ++i) {
 			arr[i] = tmp;
 			tmp = tmp->parent;
@@ -693,7 +683,7 @@ void php_http_message_object_reverse(zval *zmsg, zval *return_value)
 		php_http_message_object_t **objects;
 		int last;
 
-		objects = ecalloc(i, sizeof(**objects));
+		objects = ecalloc(i, sizeof(*objects));
 
 		/* we are the first message */
 		objects[0] = obj;
@@ -1375,25 +1365,12 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpMessage, getInfo)
 {
 	if (SUCCESS == zend_parse_parameters_none()) {
-		char *str, *tmp = NULL;
-		size_t len;
+		char *str = NULL;
+		size_t len = 0;
 		php_http_message_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
 
 		PHP_HTTP_MESSAGE_OBJECT_INIT(obj);
-
-		switch (obj->message->type) {
-			case PHP_HTTP_REQUEST:
-				len = spprintf(&str, 0, PHP_HTTP_INFO_REQUEST_FMT_ARGS(&obj->message->http, tmp, ""));
-				PTR_FREE(tmp);
-				break;
-			case PHP_HTTP_RESPONSE:
-				len = spprintf(&str, 0, PHP_HTTP_INFO_RESPONSE_FMT_ARGS(&obj->message->http, tmp, ""));
-				PTR_FREE(tmp);
-				break;
-			default:
-				RETURN_NULL();
-				break;
-		}
+		php_http_info_to_string((php_http_info_t *) obj->message, &str, &len, "");
 
 		RETVAL_STR(php_http_cs2zs(str, len));
 	}