- reimplement major parts of the request api

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 1c4a6a4e5cf19a746139019dfb5056a55803be83..97587f809dfc42ea7c642e1467ea09648b09672e 100644 (file)
--- 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();
@@ -134,6 +121,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 +145,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 +162,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 +169,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 +293,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