- 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;
+ }