X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_api.h;h=4688c71623517bbb7c43aea7054defdcf12b2262;hp=52149f01adb9545a1665ea7646073d3427ff2cfc;hb=b3afcfc70bf06c062115f4994cc04fc8c6e4aa67;hpb=79b54baf2c7fa5b37a4ed96a21d29c3574c1270b

diff --git a/php_http_message_api.h b/php_http_message_api.h
index 52149f0..4688c71 100644
--- a/php_http_message_api.h
+++ b/php_http_message_api.h
@@ -17,15 +17,15 @@
 
 #include "php_http_info_api.h"
 
-typedef enum {
+typedef enum _http_message_type_t {
 	HTTP_MSG_NONE		= 0,
 	HTTP_MSG_REQUEST	= IS_HTTP_REQUEST,
 	HTTP_MSG_RESPONSE	= IS_HTTP_RESPONSE,
 } http_message_type;
 
-typedef struct _http_message http_message;
+typedef struct _http_message_t http_message;
 
-struct _http_message {
+struct _http_message_t {
 	phpstr body;
 	HashTable hdrs;
 	http_message_type type;
@@ -51,13 +51,29 @@ PHP_HTTP_API void _http_message_set_type(http_message *m, http_message_type t);
 #define http_message_set_info(m, i) _http_message_set_info((m), (i))
 PHP_HTTP_API void _http_message_set_info(http_message *message, http_info *info);
 
-#define http_message_header(m, h) _http_message_header_ex((m), (h), sizeof(h))
+#define http_message_header(m, h) _http_message_header_ex((m), (h), sizeof(h), 1)
 #define http_message_header_ex _http_message_header_ex
-static inline zval *_http_message_header_ex(http_message *msg, char *key_str, size_t key_len)
+static inline zval *_http_message_header_ex(http_message *msg, char *key_str, size_t key_len, int join)
 {
 	zval **header;
-	if (SUCCESS == zend_hash_find(&msg->hdrs, key_str, key_len, (void **) &header)) {
-		return *header;
+	if (SUCCESS == zend_hash_find(&msg->hdrs, key_str, key_len, (void *) &header)) {
+		if (join && Z_TYPE_PP(header) == IS_ARRAY) {
+			zval *header_str, **val;
+			HashPosition pos;
+			phpstr str;
+			
+			phpstr_init(&str);
+			MAKE_STD_ZVAL(header_str);
+			FOREACH_VAL(pos, *header, val) {
+				phpstr_appendf(&str, PHPSTR_LEN(&str) ? ", %s":"%s", Z_STRVAL_PP(val));
+			}
+			phpstr_fix(&str);
+			ZVAL_STRINGL(header_str, PHPSTR_VAL(&str), PHPSTR_LEN(&str), 0);
+			return header_str;
+		} else {
+			ZVAL_ADDREF(*header);
+			return *header;
+		}
 	}
 	return NULL;
 }