X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=d0617b639919f36243a6ba856092973483a57807;hp=1c4a6a4e5cf19a746139019dfb5056a55803be83;hb=bf87f6e654235acb023ca052a5e71faeb2635a3f;hpb=0acbfc76b5a3e4122a6d06d64bd834a810806656

diff --git a/http.c b/http.c
index 1c4a6a4..d0617b6 100644
--- a/http.c
+++ b/http.c
@@ -12,24 +12,25 @@
 
 /* $Id$ */
 
-
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
 
-#include "zend_extensions.h"
+#define HTTP_WANT_CURL
+#define HTTP_WANT_ZLIB
+#define HTTP_WANT_MAGIC
+#include "php_http.h"
 
 #include "SAPI.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
+#include "zend_extensions.h"
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_send_api.h"
 #include "php_http_cache_api.h"
 #include "php_http_headers_api.h"
+#include "php_http_message_api.h"
 #include "php_http_request_method_api.h"
 #ifdef HTTP_HAVE_CURL
 #	include "php_http_request_api.h"
@@ -49,20 +50,6 @@
 #	include "php_http_exception_object.h"
 #endif
 
-#include "missing.h"
-#include "phpstr/phpstr.h"
-
-#ifdef HTTP_HAVE_CURL
-#	ifdef PHP_WIN32
-#		include <winsock2.h>
-#	endif
-#	include <curl/curl.h>
-#endif
-#ifdef HTTP_HAVE_ZLIB
-#	include <zlib.h>
-#endif
-
-#include <ctype.h>
 
 ZEND_DECLARE_MODULE_GLOBALS(http);
 HTTP_DECLARE_ARG_PASS_INFO();
@@ -75,8 +62,7 @@ ZEND_GET_MODULE(http)
 zend_function_entry http_functions[] = {
 	PHP_FE(http_test, NULL)
 	PHP_FE(http_date, NULL)
-	PHP_FE(http_build_uri, NULL)
-	PHP_FALIAS(http_absolute_uri, http_build_uri, NULL)
+	PHP_FE(http_build_url, http_arg_pass_ref_3)
 	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)
@@ -96,6 +82,7 @@ zend_function_entry http_functions[] = {
 	PHP_FE(http_chunked_decode, NULL)
 	PHP_FE(http_parse_message, NULL)
 	PHP_FE(http_parse_headers, NULL)
+	PHP_FE(http_parse_cookie, NULL)
 	PHP_FE(http_get_request_headers, NULL)
 	PHP_FE(http_get_request_body, NULL)
 	PHP_FE(http_match_request_header, NULL)
@@ -120,8 +107,6 @@ zend_function_entry http_functions[] = {
 	PHP_FE(http_gzdecode, NULL)
 	PHP_FE(http_deflate, NULL)
 	PHP_FE(http_inflate, NULL)
-	PHP_FE(http_compress, NULL)
-	PHP_FE(http_uncompress, NULL)
 #endif
 	PHP_FE(http_support, NULL)
 	
@@ -134,6 +119,9 @@ zend_function_entry http_functions[] = {
 static zend_module_dep http_module_dep[] = {
 #	ifdef HAVE_SPL
 	ZEND_MOD_REQUIRED("spl")
+#	endif
+#	ifdef HTTP_HAVE_EXT_HASH
+	ZEND_MOD_REQUIRED("hash")
 #	endif
 	{NULL, NULL, NULL, 0}
 };
@@ -155,7 +143,7 @@ zend_module_entry http_module_entry = {
 	PHP_RINIT(http),
 	PHP_RSHUTDOWN(http),
 	PHP_MINFO(http),
-	HTTP_PEXT_VERSION,
+	PHP_EXT_HTTP_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
@@ -172,12 +160,6 @@ static inline void http_globals_init(zend_http_globals *G)
 {
 	G->send.buffer_size = HTTP_SENDBUF_SIZE;
 	zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0);
-#ifdef HTTP_HAVE_CURL
-	zend_llist_init(&G->request.copies.strings, sizeof(char *), http_request_data_free_string, 0);
-	zend_llist_init(&G->request.copies.slists, sizeof(struct curl_slist *), http_request_data_free_slist, 0);
-	zend_llist_init(&G->request.copies.contexts, sizeof(http_request_callback_ctx *), http_request_data_free_context, 0);
-	zend_llist_init(&G->request.copies.convs, sizeof(http_request_conv *), http_request_data_free_conv, 0);
-#endif
 }
 
 static inline void http_globals_free(zend_http_globals *G)
@@ -185,12 +167,6 @@ static inline void http_globals_free(zend_http_globals *G)
 	STR_SET(G->send.content_type, NULL);
 	STR_SET(G->send.unquoted_etag, NULL);
 	zend_hash_destroy(&G->request.methods.custom);
-#ifdef HTTP_HAVE_CURL
-	zend_llist_clean(&G->request.copies.strings);
-	zend_llist_clean(&G->request.copies.slists);
-	zend_llist_clean(&G->request.copies.contexts);
-	zend_llist_clean(&G->request.copies.convs);
-#endif
 }
 /* }}} */
 
@@ -315,7 +291,7 @@ PHP_MINFO_FUNCTION(http)
 	php_info_print_table_start();
 	{
 		php_info_print_table_row(2, "Extended HTTP support", "enabled");
-		php_info_print_table_row(2, "Extension Version", HTTP_PEXT_VERSION);
+		php_info_print_table_row(2, "Extension Version", PHP_EXT_HTTP_VERSION);
 #ifdef HTTP_HAVE_CURL
 		php_info_print_table_row(2, "cURL HTTP Requests", curl_version());
 #else