X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=eb8f5e92bb09c519a5e023469fc5028849780b8c;hp=b606bc3813c440ff726ec336ea80a75a5d063cac;hb=dc76f745ce61ab266f873e80a39604fa91875c3d;hpb=a19a05825d04d634834f7898ec1a5247fdd6095c

diff --git a/http.c b/http.c
index b606bc3..eb8f5e9 100644
--- a/http.c
+++ b/http.c
@@ -1,89 +1,74 @@
 /*
-   +----------------------------------------------------------------------+
-   | 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$ */
 
-#define _WINSOCKAPI_
-#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
-
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
 
-#include "php.h"
-#include "php_ini.h"
-#include "snprintf.h"
-#include "ext/standard/info.h"
-#include "ext/session/php_session.h"
-#include "ext/standard/php_string.h"
-#include "ext/standard/php_smart_str.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_api.h"
-#include "php_http_curl_api.h"
-
-#ifdef ZEND_ENGINE_2
-#	include "ext/standard/php_http.h"
-#endif
-
+#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"
+#endif
 
-#	ifdef PHP_WIN32
-#		include <winsock2.h>
-#		include <sys/types.h>
+#ifdef ZEND_ENGINE_2
+#	include "php_http_filter_api.h"
+#	include "php_http_util_object.h"
+#	include "php_http_message_object.h"
+#	ifndef WONKY
+#		include "php_http_response_object.h"
 #	endif
-
-#	include <curl/curl.h>
-
-/* {{{ ARG_INFO */
-#	ifdef ZEND_BEGIN_ARG_INFO
-ZEND_BEGIN_ARG_INFO(http_request_info_ref_3, 0)
-	ZEND_ARG_PASS_INFO(0)
-	ZEND_ARG_PASS_INFO(0)
-	ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
-
-ZEND_BEGIN_ARG_INFO(http_request_info_ref_4, 0)
-	ZEND_ARG_PASS_INFO(0)
-	ZEND_ARG_PASS_INFO(0)
-	ZEND_ARG_PASS_INFO(0)
-	ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
-#	else
-static unsigned char http_request_info_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE};
-static unsigned char http_request_info_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE};
+#	ifdef HTTP_HAVE_CURL
+#		include "php_http_request_object.h"
+#		include "php_http_requestpool_object.h"
 #	endif
-/* }}} ARG_INFO */
+#	include "php_http_exception_object.h"
+#endif
 
-#endif /* HTTP_HAVE_CURL */
 
-ZEND_DECLARE_MODULE_GLOBALS(http)
+ZEND_DECLARE_MODULE_GLOBALS(http);
+HTTP_DECLARE_ARG_PASS_INFO();
 
 #ifdef COMPILE_DL_HTTP
 ZEND_GET_MODULE(http)
 #endif
 
 /* {{{ http_functions[] */
-function_entry http_functions[] = {
+zend_function_entry http_functions[] = {
+	PHP_FE(http_test, NULL)
 	PHP_FE(http_date, NULL)
-	PHP_FE(http_absolute_uri, NULL)
-	PHP_FE(http_negotiate_language, NULL)
-	PHP_FE(http_negotiate_charset, NULL)
+	PHP_FE(http_build_uri, NULL)
+	PHP_FALIAS(http_absolute_uri, http_build_uri, NULL)
+	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_redirect, NULL)
+	PHP_FE(http_throttle, NULL)
 	PHP_FE(http_send_status, NULL)
 	PHP_FE(http_send_last_modified, NULL)
 	PHP_FE(http_send_content_type, NULL)
@@ -96,262 +81,60 @@ function_entry http_functions[] = {
 	PHP_FE(http_send_file, NULL)
 	PHP_FE(http_send_stream, NULL)
 	PHP_FE(http_chunked_decode, NULL)
-	PHP_FE(http_split_response, 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)
 #ifdef HTTP_HAVE_CURL
-	PHP_FE(http_get, http_request_info_ref_3)
-	PHP_FE(http_head, http_request_info_ref_3)
-	PHP_FE(http_post_data, http_request_info_ref_4)
-	PHP_FE(http_post_array, http_request_info_ref_4)
+	PHP_FE(http_get, http_arg_pass_ref_3)
+	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_file, http_arg_pass_ref_4)
+	PHP_FE(http_put_stream, http_arg_pass_ref_4)
 #endif
-	PHP_FE(http_auth_basic, NULL)
-	PHP_FE(http_auth_basic_cb, NULL)
+	PHP_FE(http_request_method_register, NULL)
+	PHP_FE(http_request_method_unregister, NULL)
+	PHP_FE(http_request_method_exists, NULL)
+	PHP_FE(http_request_method_name, NULL)
 #ifndef ZEND_ENGINE_2
 	PHP_FE(http_build_query, NULL)
 #endif
-	PHP_FE(ob_httpetaghandler, NULL)
-	{NULL, NULL, NULL}
-};
-/* }}} */
-
-
-#ifdef ZEND_ENGINE_2
-
-/* {{{ HTTPi */
-
-zend_class_entry *httpi_ce;
-
-#define HTTPi_ME(me, al, ai) ZEND_FENTRY(me, ZEND_FN(al), ai, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-
-zend_function_entry httpi_class_methods[] = {
-	HTTPi_ME(date, http_date, NULL)
-	HTTPi_ME(absoluteURI, http_absolute_uri, NULL)
-	HTTPi_ME(negotiateLanguage, http_negotiate_language, NULL)
-	HTTPi_ME(negotiateCharset, http_negotiate_charset, NULL)
-	HTTPi_ME(redirect, http_redirect, NULL)
-	HTTPi_ME(sendStatus, http_send_status, NULL)
-	HTTPi_ME(sendLastModified, http_send_last_modified, NULL)
-	HTTPi_ME(sendContentType, http_send_content_type, NULL)
-	HTTPi_ME(sendContentDisposition, http_send_content_disposition, NULL)
-	HTTPi_ME(matchModified, http_match_modified, NULL)
-	HTTPi_ME(matchEtag, http_match_etag, NULL)
-	HTTPi_ME(cacheLastModified, http_cache_last_modified, NULL)
-	HTTPi_ME(cacheEtag, http_cache_etag, NULL)
-	HTTPi_ME(chunkedDecode, http_chunked_decode, NULL)
-	HTTPi_ME(splitResponse, http_split_response, NULL)
-	HTTPi_ME(parseHeaders, http_parse_headers, NULL)
-	HTTPi_ME(getRequestHeaders, http_get_request_headers, NULL)
-#ifdef HTTP_HAVE_CURL
-	HTTPi_ME(get, http_get, http_request_info_ref_3)
-	HTTPi_ME(head, http_head, http_request_info_ref_3)
-	HTTPi_ME(postData, http_post_data, http_request_info_ref_4)
-	HTTPi_ME(postArray, http_post_array, http_request_info_ref_4)
+	PHP_FE(ob_etaghandler, NULL)
+#ifdef HTTP_HAVE_ZLIB
+	PHP_FE(http_gzencode, NULL)
+	PHP_FE(http_gzdecode, NULL)
+	PHP_FE(http_deflate, NULL)
+	PHP_FE(http_inflate, NULL)
 #endif
-	HTTPi_ME(authBasic, http_auth_basic, NULL)
-	HTTPi_ME(authBasicCallback, http_auth_basic_cb, NULL)
-	{NULL, NULL, NULL}
-};
-/* }}} HTTPi */
-
-/* {{{ HTTPi_Response */
-
-zend_class_entry *httpi_response_ce;
-static zend_object_handlers httpi_response_object_handlers;
-
-#define httpi_response_declare_default_properties(ce) _httpi_response_declare_default_properties(ce TSRMLS_CC)
-static inline void _httpi_response_declare_default_properties(zend_class_entry *ce TSRMLS_DC)
-{
-	DCL_PROP(PROTECTED, string, contentType, "application/x-octetstream");
-	DCL_PROP(PROTECTED, string, eTag, "");
-	DCL_PROP(PROTECTED, string, dispoFile, "");
-	DCL_PROP(PROTECTED, string, cacheControl, "public");
-	DCL_PROP(PROTECTED, string, data, "");
-	DCL_PROP(PROTECTED, string, file, "");
-	DCL_PROP(PROTECTED, long, stream, 0);
-	DCL_PROP(PROTECTED, long, lastModified, 0);
-	DCL_PROP(PROTECTED, long, dispoInline, 0);
-	DCL_PROP(PROTECTED, long, cache, 0);
-	DCL_PROP(PROTECTED, long, gzip, 0);
-
-	DCL_PROP(PRIVATE, long, raw_cache_header, 0);
-	DCL_PROP(PRIVATE, long, send_mode, -1);
-}
-
-#define httpi_response_destroy_object _httpi_response_destroy_object
-void _httpi_response_destroy_object(void *object, zend_object_handle handle TSRMLS_DC)
-{
-	httpi_response_object *o = object;
-	if (OBJ_PROP(o)) {
-		zend_hash_destroy(OBJ_PROP(o));
-		FREE_HASHTABLE(OBJ_PROP(o));
-	}
-	efree(o);
-}
-
-#define httpi_response_new_object _httpi_response_new_object
-zend_object_value _httpi_response_new_object(zend_class_entry *ce TSRMLS_DC)
-{
-	zend_object_value ov;
-	httpi_response_object *o;
-
-	o = ecalloc(1, sizeof(httpi_response_object));
-	o->zo.ce = ce;
-
-	ALLOC_HASHTABLE(OBJ_PROP(o));
-	zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
-	zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
-
-	ov.handle = zend_objects_store_put(o, httpi_response_destroy_object, NULL, NULL TSRMLS_CC);
-	ov.handlers = &httpi_response_object_handlers;
-
-	return ov;
-}
-
-zend_function_entry httpi_response_class_methods[] = {
-	PHP_ME(HTTPi_Response, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-/*	PHP_ME(HTTPi_Response, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
-*/
-	PHP_ME(HTTPi_Response, setETag, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Response, getETag, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Response, setContentDisposition, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Response, getContentDisposition, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Response, setContentType, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Response, getContentType, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Response, setCache, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Response, getCache, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Response, setCacheControl, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Response, getCacheControl, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Response, setGzip, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Response, getGzip, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Response, setData, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Response, getData, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Response, setFile, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Response, getFile, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Response, setStream, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Response, getStream, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Response, send, NULL, ZEND_ACC_PUBLIC)
-
-	{NULL, NULL, NULL}
+	PHP_FE(http_support, NULL)
+	
+	EMPTY_FUNCTION_ENTRY
 };
 /* }}} */
 
-/* {{{ HTTPi_Request */
-#ifdef HTTP_HAVE_CURL
-
-zend_class_entry *httpi_request_ce;
-static zend_object_handlers httpi_request_object_handlers;
-
-#define httpi_request_declare_default_properties(ce) _httpi_request_declare_default_properties(ce TSRMLS_CC)
-static inline void _httpi_request_declare_default_properties(zend_class_entry *ce TSRMLS_DC)
-{
-	DCL_PROP_N(PROTECTED, options);
-	DCL_PROP_N(PROTECTED, responseInfo);
-	DCL_PROP_N(PROTECTED, responseData);
-	DCL_PROP_N(PROTECTED, postData);
-	DCL_PROP_N(PROTECTED, postFiles);
-
-	DCL_PROP(PROTECTED, long, method, HTTP_GET);
-
-	DCL_PROP(PROTECTED, string, url, "");
-	DCL_PROP(PROTECTED, string, contentType, "");
-	DCL_PROP(PROTECTED, string, queryData, "");
-	DCL_PROP(PROTECTED, string, postData, "");
-}
-
-#define httpi_request_free_object _httpi_request_free_object
-void _httpi_request_free_object(zend_object /* void */ *object TSRMLS_DC)
-{
-	httpi_request_object *o = (httpi_request_object *) object;
-
-	if (OBJ_PROP(o)) {
-		zend_hash_destroy(OBJ_PROP(o));
-		FREE_HASHTABLE(OBJ_PROP(o));
-	}
-	if (o->ch) {
-		curl_easy_cleanup(o->ch);
-		o->ch = NULL;
-	}
-	efree(o);
-}
-
-#define httpi_request_new_object _httpi_request_new_object
-zend_object_value _httpi_request_new_object(zend_class_entry *ce TSRMLS_DC)
-{
-	zend_object_value ov;
-	httpi_request_object *o;
-
-	o = ecalloc(1, sizeof(httpi_request_object));
-	o->zo.ce = ce;
-	o->ch = curl_easy_init();
-
-	ALLOC_HASHTABLE(OBJ_PROP(o));
-	zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
-	zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
-
-	ov.handle = zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, httpi_request_free_object, NULL TSRMLS_CC);
-	ov.handlers = &httpi_request_object_handlers;
-
-	return ov;
-}
-
-zend_function_entry httpi_request_class_methods[] = {
-	PHP_ME(HTTPi_Request, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_ME(HTTPi_Request, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
-
-	PHP_ME(HTTPi_Request, setOptions, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, getOptions, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Request, setMethod, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, getMethod, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Request, setURL, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, getURL, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Request, setContentType, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, getContentType, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Request, setQueryData, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, getQueryData, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, addQueryData, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, unsetQueryData, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Request, setPostData, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, getPostData, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, addPostData, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, unsetPostData, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Request, addPostFile, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, getPostFiles, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, unsetPostFiles, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Request, send, NULL, ZEND_ACC_PUBLIC)
-
-	PHP_ME(HTTPi_Request, getResponseData, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, getResponseHeaders, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, getResponseBody, NULL, ZEND_ACC_PUBLIC)
-	PHP_ME(HTTPi_Request, getResponseInfo, NULL, ZEND_ACC_PUBLIC)
-
-	{NULL, NULL, NULL}
+/* {{{ http_module_dep */
+#if ZEND_EXTENSION_API_NO >= 220050617
+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}
 };
-
-#endif /* HTTP_HAVE_CURL */
+#endif
 /* }}} */
 
-#endif /* ZEND_ENGINE_2 */
-
 /* {{{ http_module_entry */
 zend_module_entry http_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
+#if ZEND_EXTENSION_API_NO >= 220050617
+	STANDARD_MODULE_HEADER_EX, NULL,
+	http_module_dep,
+#else
 	STANDARD_MODULE_HEADER,
 #endif
 	"http",
@@ -361,79 +144,106 @@ zend_module_entry http_module_entry = {
 	PHP_RINIT(http),
 	PHP_RSHUTDOWN(http),
 	PHP_MINFO(http),
-#if ZEND_MODULE_API_NO >= 20010901
 	PHP_EXT_HTTP_VERSION,
-#endif
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
 
-/* {{{ php_http_init_globals(zend_http_globals *) */
-static void php_http_init_globals(zend_http_globals *http_globals)
+int http_module_number;
+
+/* {{{ http_globals */
+static void http_globals_init_once(zend_http_globals *G)
 {
-	http_globals->etag_started = 0;
-	http_globals->ctype = NULL;
-	http_globals->etag  = NULL;
-	http_globals->lmod  = 0;
-#ifdef HTTP_HAVE_CURL
-	http_globals->curlbuf.data = NULL;
-	http_globals->curlbuf.used = 0;
-	http_globals->curlbuf.free = 0;
-	http_globals->curlbuf.size = 0;
-#endif
-	http_globals->allowed_methods = NULL;
+	memset(G, 0, sizeof(zend_http_globals));
+}
+
+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);
+}
+
+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);
 }
 /* }}} */
 
-/* {{{ static inline STATUS http_check_allowed_methods(char *, int) */
+/* {{{ static inline void http_check_allowed_methods(char *, int) */
 #define http_check_allowed_methods(m, l) _http_check_allowed_methods((m), (l) TSRMLS_CC)
 static inline void _http_check_allowed_methods(char *methods, int length TSRMLS_DC)
 {
-	if (length && SG(request_info).request_method && (!strstr(methods, SG(request_info).request_method))) {
-		char *allow_header = emalloc(length + sizeof("Allow: "));
-		sprintf(allow_header, "Allow: %s", methods);
-		http_send_header(allow_header);
-		efree(allow_header);
-		http_send_status(405);
-		zend_bailout();
+	if (length && SG(request_info).request_method) {
+		if (SUCCESS != http_check_method_ex(SG(request_info).request_method, methods)) {
+			char *header = emalloc(length + sizeof("Allow: "));
+			sprintf(header, "Allow: %s", methods);
+			http_exit(405, header);
+		}
 	}
 }
 /* }}} */
 
 /* {{{ PHP_INI */
-PHP_INI_MH(update_allowed_methods)
+PHP_INI_MH(http_update_allowed_methods)
 {
 	http_check_allowed_methods(new_value, new_value_length);
 	return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 }
 
+#ifndef ZEND_ENGINE_2
+#	define OnUpdateLong OnUpdateInt
+#endif
+
 PHP_INI_BEGIN()
-	STD_PHP_INI_ENTRY("http.allowed_methods", "OPTIONS,GET,HEAD,POST,PUT,DELETE,TRACE,CONNECT", PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals)
+	HTTP_PHP_INI_ENTRY("http.allowed_methods", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
+	HTTP_PHP_INI_ENTRY("http.cache_log", "", PHP_INI_ALL, OnUpdateString, log.cache)
+	HTTP_PHP_INI_ENTRY("http.redirect_log", "", PHP_INI_ALL, OnUpdateString, log.redirect)
+	HTTP_PHP_INI_ENTRY("http.allowed_methods_log", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods)
+	HTTP_PHP_INI_ENTRY("http.composite_log", "", PHP_INI_ALL, OnUpdateString, log.composite)
+	HTTP_PHP_INI_ENTRY("http.etag_mode", "MD5", PHP_INI_ALL, OnUpdateString, etag.mode)
+#ifdef ZEND_ENGINE_2
+	HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
+#endif
+	HTTP_PHP_INI_ENTRY("http.force_exit", "1", PHP_INI_ALL, OnUpdateBool, force_exit)
 PHP_INI_END()
 /* }}} */
 
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(http)
 {
-	ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL);
-	REGISTER_INI_ENTRIES();
+	http_module_number = module_number;
 
-#if defined(HTTP_HAVE_CURL) && (LIBCURL_VERSION_NUM >= 0x070a05)
-	REGISTER_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM, CONST_CS | CONST_PERSISTENT);
-#endif
+	ZEND_INIT_MODULE_GLOBALS(http, http_globals_init_once, NULL)
+
+	REGISTER_INI_ENTRIES();
+	
+	if (	(SUCCESS != PHP_MINIT_CALL(http_support))	||
+			(SUCCESS != PHP_MINIT_CALL(http_headers))	||
+#ifdef HTTP_HAVE_CURL
+			(SUCCESS != PHP_MINIT_CALL(http_request))	||
+#endif /* HTTP_HAVE_CURL */
+			(SUCCESS != PHP_MINIT_CALL(http_request_method))) {
+		return FAILURE;
+	}
 
 #ifdef ZEND_ENGINE_2
-	HTTP_REGISTER_CLASS(HTTPi, httpi, NULL, ZEND_ACC_FINAL_CLASS);
-	HTTP_REGISTER_CLASS_EX(HTTPi_Response, httpi_response, NULL, 0);
+	if (	(SUCCESS != PHP_MINIT_CALL(http_filter))			||
+			(SUCCESS != PHP_MINIT_CALL(http_util_object))		||
+			(SUCCESS != PHP_MINIT_CALL(http_message_object))	||
+#	ifndef WONKY
+			(SUCCESS != PHP_MINIT_CALL(http_response_object))	||
+#	endif /* WONKY */
 #	ifdef HTTP_HAVE_CURL
-	HTTP_REGISTER_CLASS_EX(HTTPi_Request, httpi_request, NULL, 0);
-	REGISTER_LONG_CONSTANT("HTTP_GET", HTTP_GET, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("HTTP_HEAD", HTTP_HEAD, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("HTTP_POST", HTTP_POST, CONST_CS | CONST_PERSISTENT);
+			(SUCCESS != PHP_MINIT_CALL(http_request_object))	||
+			(SUCCESS != PHP_MINIT_CALL(http_requestpool_object))||
 #	endif /* HTTP_HAVE_CURL */
+			(SUCCESS != PHP_MINIT_CALL(http_exception_object))) {
+		return FAILURE;
+	}
 #endif /* ZEND_ENGINE_2 */
+
 	return SUCCESS;
 }
 /* }}} */
@@ -442,6 +252,9 @@ PHP_MINIT_FUNCTION(http)
 PHP_MSHUTDOWN_FUNCTION(http)
 {
 	UNREGISTER_INI_ENTRIES();
+#ifdef HTTP_HAVE_CURL
+	return PHP_MSHUTDOWN_CALL(http_request);
+#endif
 	return SUCCESS;
 }
 /* }}} */
@@ -449,8 +262,12 @@ PHP_MSHUTDOWN_FUNCTION(http)
 /* {{{ PHP_RINIT_FUNCTION */
 PHP_RINIT_FUNCTION(http)
 {
-	char *allowed_methods = INI_STR("http.allowed_methods");
-	http_check_allowed_methods(allowed_methods, strlen(allowed_methods));
+	if (HTTP_G(request).methods.allowed) {
+		http_check_allowed_methods(HTTP_G(request).methods.allowed, 
+			strlen(HTTP_G(request).methods.allowed));
+	}
+
+	http_globals_init(HTTP_GLOBALS);
 	return SUCCESS;
 }
 /* }}} */
@@ -458,27 +275,14 @@ PHP_RINIT_FUNCTION(http)
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
-	HTTP_G(etag_started) = 0;
-	HTTP_G(lmod) = 0;
-
-	if (HTTP_G(etag)) {
-		efree(HTTP_G(etag));
-		HTTP_G(etag) = NULL;
-	}
-
-	if (HTTP_G(ctype)) {
-		efree(HTTP_G(ctype));
-		HTTP_G(ctype) = NULL;
-	}
-#ifdef HTTP_HAVE_CURL
-	if (HTTP_G(curlbuf).data) {
-		efree(HTTP_G(curlbuf).data);
-		HTTP_G(curlbuf).data = NULL;
-		HTTP_G(curlbuf).used = 0;
-		HTTP_G(curlbuf).free = 0;
-	}
+	STATUS status = SUCCESS;
+	
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+	status = PHP_RSHUTDOWN_CALL(http_request_method);
 #endif
-	return SUCCESS;
+	
+	http_globals_free(HTTP_GLOBALS);
+	return status;
 }
 /* }}} */
 
@@ -486,15 +290,78 @@ PHP_RSHUTDOWN_FUNCTION(http)
 PHP_MINFO_FUNCTION(http)
 {
 	php_info_print_table_start();
-	php_info_print_table_header(2, "Extended HTTP support", "enabled");
-	php_info_print_table_row(2, "Version:", PHP_EXT_HTTP_VERSION);
-	php_info_print_table_row(2, "cURL convenience functions:",
+	{
+		php_info_print_table_row(2, "Extended HTTP support", "enabled");
+		php_info_print_table_row(2, "Extension Version", PHP_EXT_HTTP_VERSION);
 #ifdef HTTP_HAVE_CURL
-			"enabled"
+		php_info_print_table_row(2, "cURL HTTP Requests", curl_version());
+#else
+		php_info_print_table_row(2, "cURL HTTP Requests", "disabled");
+#endif
+#ifdef HTTP_HAVE_ZLIB
+		{
+			char my_zlib_version[64] = {0};
+			
+			strlcat(my_zlib_version, "zlib/", 63);
+			strlcat(my_zlib_version, zlibVersion(), 63);
+			php_info_print_table_row(2, "zlib GZIP Encodings", my_zlib_version);
+		}
 #else
-			"disabled"
+		php_info_print_table_row(2, "zlib GZIP Encodings", "disabled");
 #endif
-	);
+#if defined(HTTP_HAVE_MAGIC) && !defined(WONKY)
+		php_info_print_table_row(2, "magic MIME Guessing", "libmagic/unknown");
+#else
+		php_info_print_table_row(2, "magic MIME Guessing", "disabled");
+#endif
+		php_info_print_table_row(2, "Registered Classes",
+#ifndef ZEND_ENGINE_2
+			"none"
+#else
+			"HttpUtil, "
+			"HttpMessage, "
+#	ifdef HTTP_HAVE_CURL
+			"HttpRequest, "
+			"HttpRequestPool, "
+#	endif
+#	ifndef WONKY
+			"HttpResponse"
+#	endif
+#endif
+		);
+	}
+	php_info_print_table_end();
+	
+	php_info_print_table_start();
+	php_info_print_table_colspan_header(2, "Request Methods");
+	{
+		unsigned i;
+		HashPosition pos;
+		zval **custom_method;
+		phpstr *known_request_methods = phpstr_new();
+		phpstr *custom_request_methods = phpstr_new();
+
+		for (i = HTTP_NO_REQUEST_METHOD+1; i < HTTP_MAX_REQUEST_METHOD; ++i) {
+			phpstr_appendl(known_request_methods, http_request_method_name(i));
+			phpstr_appends(known_request_methods, ", ");
+		}
+		FOREACH_HASH_VAL(pos, &HTTP_G(request).methods.custom, custom_method) {
+			phpstr_append(custom_request_methods, Z_STRVAL_PP(custom_method), Z_STRLEN_PP(custom_method));
+			phpstr_appends(custom_request_methods, ", ");
+		}
+
+		phpstr_append(known_request_methods, PHPSTR_VAL(custom_request_methods), PHPSTR_LEN(custom_request_methods));
+		phpstr_fix(known_request_methods);
+		phpstr_fix(custom_request_methods);
+
+		php_info_print_table_row(2, "Known", PHPSTR_VAL(known_request_methods));
+		php_info_print_table_row(2, "Custom",
+			PHPSTR_LEN(custom_request_methods) ? PHPSTR_VAL(custom_request_methods) : "none registered");
+		php_info_print_table_row(2, "Allowed", strlen(HTTP_G(request).methods.allowed) ? HTTP_G(request).methods.allowed : "(ANY)");
+		
+		phpstr_free(&known_request_methods);
+		phpstr_free(&custom_request_methods);
+	}
 	php_info_print_table_end();
 
 	DISPLAY_INI_ENTRIES();