| 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-2007, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
#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;
#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);
#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;
}