X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http.c;h=2f2011fad9ed22d32e0d86bcc234e20356e020d2;hb=26140a4b272ea47026dfefdc36d5c8376aece9d6;hp=76d4dff7e7ba86e7e354bd203083ae3ea554b5f3;hpb=1382fe5a3ed5209ab05745ca95495885e85ff2a0;p=m6w6%2Fext-http

diff --git a/http.c b/http.c
index 76d4dff..2f2011f 100644
--- a/http.c
+++ b/http.c
@@ -24,6 +24,7 @@
 
 #include "php_http_api.h"
 #include "php_http_send_api.h"
+#include "php_http_cookie_api.h"
 #include "php_http_cache_api.h"
 #include "php_http_send_api.h"
 #include "php_http_message_api.h"
@@ -101,6 +102,7 @@ zend_function_entry http_functions[] = {
 	PHP_FE(http_head, http_arg_pass_ref_3)
 	PHP_FE(http_post_data, http_arg_pass_ref_4)
 	PHP_FE(http_post_fields, http_arg_pass_ref_5)
+	PHP_FE(http_put_data, http_arg_pass_ref_4)
 	PHP_FE(http_put_file, http_arg_pass_ref_4)
 	PHP_FE(http_put_stream, http_arg_pass_ref_4)
 #endif
@@ -123,7 +125,7 @@ zend_function_entry http_functions[] = {
 
 /* {{{ http_module_dep */
 #if ZEND_EXTENSION_API_NO >= 220050617
-static zend_module_dep http_module_dep[] = {
+static zend_module_dep http_module_deps[] = {
 #	ifdef HAVE_SPL
 	ZEND_MOD_REQUIRED("spl")
 #	endif
@@ -133,6 +135,9 @@ static zend_module_dep http_module_dep[] = {
 #	ifdef HAVE_PHP_SESSION
 	ZEND_MOD_REQUIRED("session")
 #	endif
+#ifdef HAVE_ICONV
+	ZEND_MOD_REQUIRED("iconv")
+#endif
 	{NULL, NULL, NULL, 0}
 };
 #endif
@@ -142,7 +147,7 @@ static zend_module_dep http_module_dep[] = {
 zend_module_entry http_module_entry = {
 #if ZEND_EXTENSION_API_NO >= 220050617
 	STANDARD_MODULE_HEADER_EX, NULL,
-	http_module_dep,
+	http_module_deps,
 #else
 	STANDARD_MODULE_HEADER,
 #endif
@@ -239,6 +244,7 @@ PHP_MINIT_FUNCTION(http)
 	REGISTER_INI_ENTRIES();
 	
 	if (	(SUCCESS != PHP_MINIT_CALL(http_support))	||
+			(SUCCESS != PHP_MINIT_CALL(http_cookie))	||
 			(SUCCESS != PHP_MINIT_CALL(http_send))		||
 			(SUCCESS != PHP_MINIT_CALL(http_url))		||
 #ifdef HTTP_HAVE_CURL