X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_util_object.c;h=b2fa5c54aa39bebab7d2c7b1c96d65033e281acb;hb=649aada485583ccac67928e0700cb5f1b963f4e8;hp=42a094c914cc6a530ebb956fa5ea0377ad9e6f0f;hpb=2b1bdfab2a6402e4daec69f6b7c395b0662e18d7;p=m6w6%2Fext-http

diff --git a/http_util_object.c b/http_util_object.c
index 42a094c..b2fa5c5 100644
--- a/http_util_object.c
+++ b/http_util_object.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -19,12 +16,11 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
+
+#include "php_http.h"
 
 #ifdef ZEND_ENGINE_2
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_util_object.h"
 
 #define HTTP_BEGIN_ARGS(method, req_args) 		HTTP_BEGIN_ARGS_EX(HttpUtil, method, 0, req_args)
@@ -53,6 +49,11 @@ HTTP_BEGIN_ARGS(negotiateCharset, 1)
 	HTTP_ARG_VAL(result, 1)
 HTTP_END_ARGS;
 
+HTTP_BEGIN_ARGS(negotiateContentType, 1)
+	HTTP_ARG_VAL(supported, 0)
+	HTTP_ARG_VAL(result, 1)
+HTTP_END_ARGS;
+
 HTTP_BEGIN_ARGS(matchModified, 1)
 	HTTP_ARG_VAL(last_modified, 0)
 	HTTP_ARG_VAL(for_range, 0)
@@ -118,6 +119,7 @@ zend_function_entry http_util_object_fe[] = {
 	HTTP_UTIL_ALIAS(buildUri, http_build_uri)
 	HTTP_UTIL_ALIAS(negotiateLanguage, http_negotiate_language)
 	HTTP_UTIL_ALIAS(negotiateCharset, http_negotiate_charset)
+	HTTP_UTIL_ALIAS(negotiateContentType, http_negotiate_content_type)
 	HTTP_UTIL_ALIAS(matchModified, http_match_modified)
 	HTTP_UTIL_ALIAS(matchEtag, http_match_etag)
 	HTTP_UTIL_ALIAS(matchRequestHeader, http_match_request_header)