X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_negotiate.h;h=f7405b54e5111a4f66f4fffe743bd3f436384da7;hp=23c03ae853ee14df1622d2f7c4b8c44ed4aca32d;hb=046973e332c1475f9bf7717af9d33a75283deb37;hpb=a9ee536962cc2b3a8a9dfa05b087d580a91daae1

diff --git a/php_http_negotiate.h b/php_http_negotiate.h
index 23c03ae..f7405b5 100644
--- a/php_http_negotiate.h
+++ b/php_http_negotiate.h
@@ -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-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -15,58 +15,58 @@
 
 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 TSRMLS_DC);
 
-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 TSRMLS_DC)
 {
 	HashTable *result = NULL;
 	size_t length;
-	char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Language"), &length TSRMLS_CC);
+	char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Language"), &length, request TSRMLS_CC);
 
 	if (value) {
 		result = php_http_negotiate(value, length, supported, "-", 1 TSRMLS_CC);
 	}
-	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 TSRMLS_DC)
 {
 	HashTable *result = NULL;
 	size_t length;
-	char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Encoding"), &length TSRMLS_CC);
+	char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Encoding"), &length, request TSRMLS_CC);
 
 	if (value) {
 		result = php_http_negotiate(value, length, supported, NULL, 0 TSRMLS_CC);
 	}
-	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 TSRMLS_DC)
 {
 	HashTable *result = NULL;
 	size_t length;
-	char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Charset"), &length TSRMLS_CC);
+	char *value = php_http_env_get_request_header(ZEND_STRL("Accept-Charset"), &length, request TSRMLS_CC);
 
 	if (value) {
 		result = php_http_negotiate(value, length, supported, NULL, 0 TSRMLS_CC);
 	}
-	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 TSRMLS_DC)
 {
 	HashTable *result = NULL;
 	size_t length;
-	char *value = php_http_env_get_request_header(ZEND_STRL("Accept"), &length TSRMLS_CC);
+	char *value = php_http_env_get_request_header(ZEND_STRL("Accept"), &length, request TSRMLS_CC);
 
 	if (value) {
 		result = php_http_negotiate(value, length, supported, "/", 1 TSRMLS_CC);
 	}
-	STR_FREE(value);
+	PTR_FREE(value);
 
 	return result;
 }
@@ -119,7 +119,7 @@ static inline HashTable *php_http_negotiate_content_type(HashTable *supported TS
 #define PHP_HTTP_DO_NEGOTIATE(type, supported, rs_array) \
 	{ \
 		HashTable *result; \
-		if ((result = php_http_negotiate_ ##type(supported TSRMLS_CC))) { \
+		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); \