branch off v1 as R_1_7

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index b0b04d8f82e047085f1915fdb309745b8501f2e5..76629d32265fe5733d33a73037c6d1923d98992a 100644 (file)
--- a/http.c
+++ b/http.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -66,6 +66,7 @@ zend_function_entry http_functions[] = {
        PHP_FE(http_negotiate_language, http_arg_pass_ref_2)
        PHP_FE(http_negotiate_charset, http_arg_pass_ref_2)
        PHP_FE(http_negotiate_content_type, http_arg_pass_ref_2)
+       PHP_FE(http_negotiate, http_arg_pass_ref_3)
        PHP_FE(http_redirect, NULL)
        PHP_FE(http_throttle, NULL)
        PHP_FE(http_send_status, NULL)
@@ -343,6 +344,7 @@ PHP_MSHUTDOWN_FUNCTION(http)
                || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)
 #      endif
 #endif
+               || SUCCESS != PHP_MSHUTDOWN_CALL(http_message_object)
                || SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle) /* last */
        ) {
                return FAILURE;