X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_message.c;h=04e87060445a5d19b5af91d39242d91c8d030450;hb=d3cd2c4fb0abc0400276e46a8452e7d9297129ce;hp=e85c7d3c8037fd12bec7c169960b41cfb7f1ec3b;hpb=51f1ec2e8c28a0d304a8f5bde9182c524e8367bc;p=m6w6%2Fext-http

diff --git a/php_http_message.c b/php_http_message.c
index e85c7d3..04e8706 100644
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -277,27 +277,12 @@ PHP_HTTP_API void php_http_message_set_info(php_http_message_t *message, php_htt
 	}
 }
 
-static inline void message_headers(php_http_message_t *msg, php_http_buffer_t *str)
+PHP_HTTP_API void php_http_message_update_headers(php_http_message_t *msg)
 {
-	php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
-	HashPosition pos1;
-	zval **header, *h;
+	zval *h;
 	size_t size;
 	TSRMLS_FETCH_FROM_CTX(msg->ts);
 
-	switch (msg->type) {
-		case PHP_HTTP_REQUEST:
-			php_http_buffer_appendf(str, PHP_HTTP_INFO_REQUEST_FMT_ARGS(&msg->http, PHP_HTTP_CRLF));
-			break;
-
-		case PHP_HTTP_RESPONSE:
-			php_http_buffer_appendf(str, PHP_HTTP_INFO_RESPONSE_FMT_ARGS(&msg->http, PHP_HTTP_CRLF));
-			break;
-
-		default:
-			break;
-	}
-
 	if ((size = php_http_message_body_size(&msg->body))) {
 		MAKE_STD_ZVAL(h);
 		ZVAL_LONG(h, size);
@@ -321,6 +306,28 @@ static inline void message_headers(php_http_message_t *msg, php_http_buffer_t *s
 			}
 		}
 	}
+}
+static inline void message_headers(php_http_message_t *msg, php_http_buffer_t *str)
+{
+	php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+	HashPosition pos1;
+	zval **header;
+	TSRMLS_FETCH_FROM_CTX(msg->ts);
+
+	switch (msg->type) {
+		case PHP_HTTP_REQUEST:
+			php_http_buffer_appendf(str, PHP_HTTP_INFO_REQUEST_FMT_ARGS(&msg->http, PHP_HTTP_CRLF));
+			break;
+
+		case PHP_HTTP_RESPONSE:
+			php_http_buffer_appendf(str, PHP_HTTP_INFO_RESPONSE_FMT_ARGS(&msg->http, PHP_HTTP_CRLF));
+			break;
+
+		default:
+			break;
+	}
+
+	php_http_message_update_headers(msg);
 
 	FOREACH_HASH_KEYVAL(pos1, &msg->hdrs, key, header) {
 		if (key.type == HASH_KEY_IS_STRING) {
@@ -455,6 +462,24 @@ PHP_HTTP_API php_http_message_t *php_http_message_reverse(php_http_message_t *ms
 	return msg;
 }
 
+PHP_HTTP_API php_http_message_t *php_http_message_zip(php_http_message_t *one, php_http_message_t *two)
+{
+	php_http_message_t *dst = php_http_message_copy(one, NULL), *src = php_http_message_copy(two, NULL), *tmp_dst, *tmp_src, *ret = dst;
+
+	while(dst && src) {
+		tmp_dst = dst->parent;
+		tmp_src = src->parent;
+		dst->parent = src;
+		if (tmp_dst) {
+			src->parent = tmp_dst;
+		}
+		src = tmp_src;
+		dst = tmp_dst;
+	}
+
+	return ret;
+}
+
 PHP_HTTP_API php_http_message_t *php_http_message_copy_ex(php_http_message_t *from, php_http_message_t *to, zend_bool parents)
 {
 	php_http_message_t *temp, *copy = NULL;