X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_headers.c;h=68e2f6affb8a0d7c35d3161540062e434c401070;hp=77981b6af949d14ecbbb0ed1ad37c818d248d7eb;hb=0b83632b2b0a03eeca090f993259ccd95ab646fb;hpb=0327131cf87a5be32585fea1291178b60a359cbf

diff --git a/php_http_headers.c b/php_http_headers.c
index 77981b6..68e2f6a 100644
--- a/php_http_headers.c
+++ b/php_http_headers.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2013, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -41,68 +41,89 @@ PHP_HTTP_API STATUS php_http_headers_parse(const char *header, size_t length, Ha
 	return SUCCESS;
 }
 
-#define PHP_HTTP_BEGIN_ARGS(method, req_args) 	PHP_HTTP_BEGIN_ARGS_EX(HttpHeader, method, 0, req_args)
-#define PHP_HTTP_EMPTY_ARGS(method)				PHP_HTTP_EMPTY_ARGS_EX(HttpHeader, method, 0)
-#define PHP_HTTP_HEADER_ME(method, v)			PHP_ME(HttpHeader, method, PHP_HTTP_ARGS(HttpHeader, method), v)
-
-PHP_HTTP_BEGIN_ARGS(__construct, 0)
-	PHP_HTTP_ARG_VAL(name, 0)
-	PHP_HTTP_ARG_VAL(value, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_EMPTY_ARGS(serialize);
-PHP_HTTP_BEGIN_ARGS(unserialize, 1)
-	PHP_HTTP_ARG_VAL(serialized, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(match, 1)
-	PHP_HTTP_ARG_VAL(value, 0)
-	PHP_HTTP_ARG_VAL(flags, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(negotiate, 1)
-	PHP_HTTP_ARG_VAL(supported, 0)
-	PHP_HTTP_ARG_VAL(result, 1)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(parse, 1)
-	PHP_HTTP_ARG_VAL(string, 0)
-	PHP_HTTP_ARG_VAL(flags, 0)
-PHP_HTTP_END_ARGS;
-
-PHP_HTTP_BEGIN_ARGS(getParams, 0)
-	PHP_HTTP_ARG_VAL(param_sep, 0)
-	PHP_HTTP_ARG_VAL(arg_sep, 0)
-	PHP_HTTP_ARG_VAL(val_sep, 0)
-	PHP_HTTP_ARG_VAL(flags, 0)
-PHP_HTTP_END_ARGS;
-
-static zend_class_entry *php_http_header_class_entry;
-
-zend_class_entry *php_http_header_get_class_entry(void)
+PHP_HTTP_API void php_http_headers_to_callback(HashTable *headers, zend_bool crlf, php_http_pass_format_callback_t cb, void *cb_arg TSRMLS_DC)
 {
-	return php_http_header_class_entry;
+	HashPosition pos1, pos2;
+	php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+	zval **header, **single_header;
+
+	FOREACH_HASH_KEYVAL(pos1, headers, key, header) {
+		if (key.type == HASH_KEY_IS_STRING) {
+			if (key.len == sizeof("Set-Cookie") && !strcasecmp(key.str, "Set-Cookie") && Z_TYPE_PP(header) == IS_ARRAY) {
+				FOREACH_VAL(pos2, *header, single_header) {
+					if (Z_TYPE_PP(single_header) == IS_ARRAY) {
+						php_http_cookie_list_t *cookie = php_http_cookie_list_from_struct(NULL, *single_header TSRMLS_CC);
+
+						if (cookie) {
+							char *buf;
+							size_t len;
+
+							php_http_cookie_list_to_string(cookie, &buf, &len);
+							cb(cb_arg, crlf ? "Set-Cookie: %s" PHP_HTTP_CRLF : "Set-Cookie: %s", buf);
+							php_http_cookie_list_free(&cookie);
+							efree(buf);
+						}
+					} else {
+						zval *strval = php_http_header_value_to_string(*single_header TSRMLS_CC);
+
+						cb(cb_arg, crlf ? "Set-Cookie: %s" PHP_HTTP_CRLF : "Set-Cookie: %s", Z_STRVAL_P(strval));
+						zval_ptr_dtor(&strval);
+					}
+				}
+			} else {
+				zval *strval = php_http_header_value_to_string(*header TSRMLS_CC);
+
+				cb(cb_arg, crlf ? "%s: %s" PHP_HTTP_CRLF : "%s: %s", key.str, Z_STRVAL_P(strval));
+				zval_ptr_dtor(&strval);
+			}
+		}
+	}
 }
 
-static zend_function_entry php_http_header_method_entry[] = {
-	PHP_HTTP_HEADER_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_HTTP_HEADER_ME(serialize, ZEND_ACC_PUBLIC)
-	ZEND_MALIAS(HttpHeader, __toString, serialize, PHP_HTTP_ARGS(HttpHeader, serialize), ZEND_ACC_PUBLIC)
-	ZEND_MALIAS(HttpHeader, toString, serialize, PHP_HTTP_ARGS(HttpHeader, serialize), ZEND_ACC_PUBLIC)
-	PHP_HTTP_HEADER_ME(unserialize, ZEND_ACC_PUBLIC)
-	PHP_HTTP_HEADER_ME(match, ZEND_ACC_PUBLIC)
-	PHP_HTTP_HEADER_ME(negotiate, ZEND_ACC_PUBLIC)
-	PHP_HTTP_HEADER_ME(getParams, ZEND_ACC_PUBLIC)
-	PHP_HTTP_HEADER_ME(parse, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-	EMPTY_FUNCTION_ENTRY
-};
+PHP_HTTP_API void php_http_headers_to_string(php_http_buffer_t *str, HashTable *headers TSRMLS_DC)
+{
+	php_http_headers_to_callback(headers, 1, (php_http_pass_format_callback_t) php_http_buffer_appendf, str TSRMLS_CC);
+}
 
+PHP_HTTP_API zval *php_http_header_value_to_string(zval *header TSRMLS_DC)
+{
+	zval *ret;
+
+	if (Z_TYPE_P(header) == IS_BOOL) {
+		MAKE_STD_ZVAL(ret);
+		ZVAL_STRING(ret, Z_BVAL_P(header) ? "true" : "false", 1);
+	} else if (Z_TYPE_P(header) == IS_ARRAY) {
+		zval **val;
+		HashPosition pos;
+		php_http_buffer_t str;
+
+		php_http_buffer_init(&str);
+		MAKE_STD_ZVAL(ret);
+		FOREACH_VAL(pos,header, val) {
+			zval *strval = php_http_header_value_to_string(*val TSRMLS_CC);
+
+			php_http_buffer_appendf(&str, str.used ? ", %s":"%s", Z_STRVAL_P(strval));
+			zval_ptr_dtor(&strval);
+		}
+		php_http_buffer_fix(&str);
+		ZVAL_STRINGL(ret, str.data, str.used, 0);
+	} else  {
+		ret = php_http_zsep(1, IS_STRING, header);
+	}
+
+	return ret;
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader___construct, 0, 0, 0)
+	ZEND_ARG_INFO(0, name)
+	ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO();
 PHP_METHOD(HttpHeader, __construct)
 {
 	char *name_str = NULL, *value_str = NULL;
 	int name_len = 0, value_len = 0;
 
-	with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
+	with_error_handling(EH_THROW, php_http_exception_class_entry) {
 		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!", &name_str, &name_len, &value_str, &value_len)) {
 			if (name_str && name_len) {
 				char *pretty_str = estrndup(name_str, name_len);
@@ -116,6 +137,8 @@ PHP_METHOD(HttpHeader, __construct)
 	} end_error_handling();
 }
 
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader_serialize, 0, 0, 0)
+ZEND_END_ARG_INFO();
 PHP_METHOD(HttpHeader, serialize)
 {
 	php_http_buffer_t buf;
@@ -137,6 +160,9 @@ PHP_METHOD(HttpHeader, serialize)
 	RETURN_PHP_HTTP_BUFFER_VAL(&buf);
 }
 
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader_unserialize, 0, 0, 1)
+	ZEND_ARG_INFO(0, serialized)
+ZEND_END_ARG_INFO();
 PHP_METHOD(HttpHeader, unserialize)
 {
 	char *serialized_str;
@@ -175,6 +201,10 @@ PHP_METHOD(HttpHeader, unserialize)
 
 }
 
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader_match, 0, 0, 1)
+	ZEND_ARG_INFO(0, value)
+	ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO();
 PHP_METHOD(HttpHeader, match)
 {
 	char *val_str;
@@ -191,6 +221,10 @@ PHP_METHOD(HttpHeader, match)
 	zval_ptr_dtor(&zvalue);
 }
 
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader_negotiate, 0, 0, 1)
+	ZEND_ARG_INFO(0, supported)
+	ZEND_ARG_INFO(1, result)
+ZEND_END_ARG_INFO();
 PHP_METHOD(HttpHeader, negotiate)
 {
 	HashTable *supported, *rs;
@@ -226,6 +260,12 @@ PHP_METHOD(HttpHeader, negotiate)
 	}
 }
 
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader_getParams, 0, 0, 0)
+	ZEND_ARG_INFO(0, param_sep)
+	ZEND_ARG_INFO(0, arg_sep)
+	ZEND_ARG_INFO(0, val_sep)
+	ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO();
 PHP_METHOD(HttpHeader, getParams)
 {
 	zval zctor, *zparams_obj, **zargs = NULL;
@@ -234,7 +274,7 @@ PHP_METHOD(HttpHeader, getParams)
 	ZVAL_STRINGL(&zctor, "__construct", lenof("__construct"), 0);
 	
 	MAKE_STD_ZVAL(zparams_obj);
-	object_init_ex(zparams_obj, php_http_params_get_class_entry());
+	object_init_ex(zparams_obj, php_http_params_class_entry);
 	
 	zargs = (zval **) ecalloc(ZEND_NUM_ARGS()+1, sizeof(zval *));
 	zargs[0] = zend_read_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL("value"), 0 TSRMLS_CC);
@@ -251,6 +291,10 @@ PHP_METHOD(HttpHeader, getParams)
 	}
 }
 
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpHeader_parse, 0, 0, 1)
+	ZEND_ARG_INFO(0, string)
+	ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO();
 PHP_METHOD(HttpHeader, parse)
 {
 	char *header_str;
@@ -301,9 +345,27 @@ PHP_METHOD(HttpHeader, parse)
 	}
 }
 
+static zend_function_entry php_http_header_methods[] = {
+	PHP_ME(HttpHeader, __construct,   ai_HttpHeader___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(HttpHeader, serialize,     ai_HttpHeader_serialize, ZEND_ACC_PUBLIC)
+	ZEND_MALIAS(HttpHeader, __toString, serialize, ai_HttpHeader_serialize, ZEND_ACC_PUBLIC)
+	ZEND_MALIAS(HttpHeader, toString, serialize, ai_HttpHeader_serialize, ZEND_ACC_PUBLIC)
+	PHP_ME(HttpHeader, unserialize,   ai_HttpHeader_unserialize, ZEND_ACC_PUBLIC)
+	PHP_ME(HttpHeader, match,         ai_HttpHeader_match, ZEND_ACC_PUBLIC)
+	PHP_ME(HttpHeader, negotiate,     ai_HttpHeader_negotiate, ZEND_ACC_PUBLIC)
+	PHP_ME(HttpHeader, getParams,     ai_HttpHeader_getParams, ZEND_ACC_PUBLIC)
+	PHP_ME(HttpHeader, parse,         ai_HttpHeader_parse, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+	EMPTY_FUNCTION_ENTRY
+};
+
+zend_class_entry *php_http_header_class_entry;
+
 PHP_MINIT_FUNCTION(http_header)
 {
-	PHP_HTTP_REGISTER_CLASS(http, Header, http_header, php_http_object_get_class_entry(), 0);
+	zend_class_entry ce = {0};
+
+	INIT_NS_CLASS_ENTRY(ce, "http", "Header", php_http_header_methods);
+	php_http_header_class_entry = zend_register_internal_class_ex(&ce, php_http_object_class_entry, NULL TSRMLS_CC);
 	zend_class_implements(php_http_header_class_entry TSRMLS_CC, 1, zend_ce_serializable);
 	zend_declare_class_constant_long(php_http_header_class_entry, ZEND_STRL("MATCH_LOOSE"), PHP_HTTP_MATCH_LOOSE TSRMLS_CC);
 	zend_declare_class_constant_long(php_http_header_class_entry, ZEND_STRL("MATCH_CASE"), PHP_HTTP_MATCH_CASE TSRMLS_CC);