X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_api.h;h=868a86bc79a82471d1e360d283132864c71a0a47;hp=e3ab8397a53ca8c6d425e6157c75112cd0ce50d5;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2

diff --git a/php_http_message_api.h b/php_http_message_api.h
index e3ab839..868a86b 100644
--- a/php_http_message_api.h
+++ b/php_http_message_api.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -44,6 +44,8 @@ struct _http_message_t {
 #define http_message_init_ex(m, t) _http_message_init_ex((m), (t) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
 #define http_message_init_rel(m, t) _http_message_init_ex((m), (t) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC)
 PHP_HTTP_API http_message *_http_message_init_ex(http_message *m, http_message_type t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+#define http_message_init_env(m, t) _http_message_init_env((m), (t) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+PHP_HTTP_API http_message *_http_message_init_env(http_message *m, http_message_type t TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
 
 #define http_message_set_type(m, t) _http_message_set_type((m), (t))
 PHP_HTTP_API void _http_message_set_type(http_message *m, http_message_type t);
@@ -51,13 +53,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 (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;
 }