X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_negotiate.h;h=586828fae5afacdf31aacff610a48ed4845d82f9;hp=d8814faba41794523d5158156bb5cf73efe6d96f;hb=f6600e3e5a683077874e6bbfda11900e6a7613f3;hpb=d3485e3b28336153dca690e872ffe1ddc60fedd2

diff --git a/php_http_negotiate.h b/php_http_negotiate.h
index d8814fa..586828f 100644
--- a/php_http_negotiate.h
+++ b/php_http_negotiate.h
@@ -6,74 +6,125 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_headers_api.h 300300 2010-06-09 07:29:35Z mike $ */
-
 #ifndef PHP_HTTP_NEGOTIATE_H
 #define PHP_HTTP_NEGOTIATE_H
 
-typedef char *(*php_http_negotiate_func_t)(const char *test, double *quality, HashTable *supported TSRMLS_DC);
-
-extern char *php_http_negotiate_language_func(const char *test, double *quality, HashTable *supported TSRMLS_DC);
-extern char *php_http_negotiate_default_func(const char *test, double *quality, HashTable *supported TSRMLS_DC);
-
-PHP_HTTP_API HashTable *php_http_negotiate(const char *value, HashTable *supported, php_http_negotiate_func_t neg TSRMLS_DC);
+PHP_HTTP_API HashTable *php_http_negotiate(const char *value_str, size_t value_len, HashTable *supported, const char *primary_sep_str, size_t primary_sep_len);
 
-static inline HashTable *php_http_negotiate_language(HashTable *supported TSRMLS_DC)
+static inline HashTable *php_http_negotiate_language(HashTable *supported, php_http_message_t *request)
 {
 	HashTable *result = NULL;
-	char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Language") TSRMLS_CC);
+	size_t length;
+	char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Language"), &length, request);
 
 	if (value) {
-		result = php_http_negotiate(value, supported, php_http_negotiate_language_func TSRMLS_CC);
+		result = php_http_negotiate(value, length, supported, "-", 1);
 	}
-	STR_FREE(value);
+	PTR_FREE(value);
 
 	return result;
 }
 
-static inline HashTable *php_http_negotiate_encoding(HashTable *supported TSRMLS_DC)
+static inline HashTable *php_http_negotiate_encoding(HashTable *supported, php_http_message_t *request)
 {
 	HashTable *result = NULL;
-	char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Encoding") TSRMLS_CC);
+	size_t length;
+	char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Encoding"), &length, request);
 
 	if (value) {
-		result = php_http_negotiate(value, supported, NULL TSRMLS_CC);
+		result = php_http_negotiate(value, length, supported, NULL, 0);
 	}
-	STR_FREE(value);
+	PTR_FREE(value);
 
 	return result;
 }
 
-static inline HashTable *php_http_negotiate_charset(HashTable *supported TSRMLS_DC)
+static inline HashTable *php_http_negotiate_charset(HashTable *supported, php_http_message_t *request)
 {
 	HashTable *result = NULL;
-	char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Charset") TSRMLS_CC);
+	size_t length;
+	char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Charset"), &length, request);
 
 	if (value) {
-		result = php_http_negotiate(value, supported, NULL TSRMLS_CC);
+		result = php_http_negotiate(value, length, supported, NULL, 0);
 	}
-	STR_FREE(value);
+	PTR_FREE(value);
 
 	return result;
 }
 
-static inline HashTable *php_http_negotiate_content_type(HashTable *supported TSRMLS_DC)
+static inline HashTable *php_http_negotiate_content_type(HashTable *supported, php_http_message_t *request)
 {
 	HashTable *result = NULL;
-	char *value = php_http_env_get_request_header(ZEND_STRL("Accept") TSRMLS_CC);
+	size_t length;
+	char *value = php_http_env_get_request_header(ZEND_STRL("Accept"), &length, request);
 
 	if (value) {
-		result = php_http_negotiate(value, supported, NULL TSRMLS_CC);
+		result = php_http_negotiate(value, length, supported, "/", 1);
 	}
-	STR_FREE(value);
+	PTR_FREE(value);
 
 	return result;
 }
 
+#define PHP_HTTP_DO_NEGOTIATE_DEFAULT(supported) \
+	{ \
+		zval *value; \
+		 \
+		zend_hash_internal_pointer_reset((supported)); \
+		if ((value = zend_hash_get_current_data((supported)))) { \
+			RETVAL_ZVAL(value, 1, 0); \
+		} else { \
+			RETVAL_NULL(); \
+		} \
+	}
+
+#define PHP_HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array) \
+	PHP_HTTP_DO_NEGOTIATE_DEFAULT(supported); \
+	if (rs_array) { \
+		zval *value; \
+		 \
+		ZEND_HASH_FOREACH_VAL(supported, value) \
+		{ \
+			zend_string *zs = zval_get_string(value); \
+			add_assoc_double_ex(rs_array, zs->val, zs->len, 1.0); \
+			zend_string_release(zs); \
+		} \
+		ZEND_HASH_FOREACH_END(); \
+	}
+
+#define PHP_HTTP_DO_NEGOTIATE_HANDLE_RESULT(result, supported, rs_array) \
+	{ \
+		zend_string *key; \
+		zend_ulong idx; \
+		 \
+		if (zend_hash_num_elements(result) && HASH_KEY_IS_STRING == zend_hash_get_current_key(result, &key, &idx)) { \
+			RETVAL_STR_COPY(key); \
+		} else { \
+			PHP_HTTP_DO_NEGOTIATE_DEFAULT(supported); \
+		} \
+		\
+		if (rs_array) { \
+			zend_hash_copy(Z_ARRVAL_P(rs_array), result, (copy_ctor_func_t) zval_add_ref); \
+		} \
+		\
+		zend_hash_destroy(result); \
+		FREE_HASHTABLE(result); \
+	}
+
+#define PHP_HTTP_DO_NEGOTIATE(type, supported, rs_array) \
+	{ \
+		HashTable *result; \
+		if ((result = php_http_negotiate_ ##type(supported, NULL TSRMLS_CC))) { \
+			PHP_HTTP_DO_NEGOTIATE_HANDLE_RESULT(result, supported, rs_array); \
+		} else { \
+			PHP_HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array); \
+		} \
+	}
 
 #endif