X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.c;h=d430e1f13538fce89cfb75a8005e18a0c5e6d6ad;hp=2101f0b70c278f1fdd9ad61125193739433c0f97;hb=e438aa9ce944f8c8f175554d9aa66d152a47f780;hpb=eaa046dc3e6496e523a17c3b786ef27067b9795c

diff --git a/php_http.c b/php_http.c
index 2101f0b..d430e1f 100644
--- a/php_http.c
+++ b/php_http.c
@@ -44,7 +44,6 @@ zend_function_entry http_functions[] = {
 
 PHP_MINIT_FUNCTION(http);
 PHP_MSHUTDOWN_FUNCTION(http);
-PHP_RINIT_FUNCTION(http);
 PHP_RSHUTDOWN_FUNCTION(http);
 PHP_MINFO_FUNCTION(http);
 
@@ -57,9 +56,6 @@ static zend_module_dep http_module_deps[] = {
 #endif
 #ifdef PHP_HTTP_HAVE_ICONV
 	ZEND_MOD_REQUIRED("iconv")
-#endif
-#ifdef PHP_HTTP_HAVE_JSON
-	ZEND_MOD_REQUIRED("json")
 #endif
 	{NULL, NULL, NULL, 0}
 };
@@ -72,7 +68,7 @@ zend_module_entry http_module_entry = {
 	http_functions,
 	PHP_MINIT(http),
 	PHP_MSHUTDOWN(http),
-	PHP_RINIT(http),
+	NULL,
 	PHP_RSHUTDOWN(http),
 	PHP_MINFO(http),
 	PHP_PECL_HTTP_VERSION,
@@ -117,14 +113,6 @@ static inline void php_http_globals_free(zend_php_http_globals *G TSRMLS_DC)
 }
 #endif
 
-#if ZTS && PHP_DEBUG && !HAVE_GCOV
-zend_php_http_globals *php_http_globals(void)
-{
-	TSRMLS_FETCH();
-	return PHP_HTTP_G;
-}
-#endif
-
 PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("http.etag.mode", "crc32b", PHP_INI_ALL, OnUpdateString, env.etag_mode, zend_php_http_globals, php_http_globals)
 PHP_INI_END()
@@ -136,12 +124,15 @@ PHP_MINIT_FUNCTION(http)
 	REGISTER_INI_ENTRIES();
 	
 	if (0
+	|| SUCCESS != PHP_MINIT_CALL(http_object)
 	|| SUCCESS != PHP_MINIT_CALL(http_exception)
 	|| SUCCESS != PHP_MINIT_CALL(http_cookie)
 	|| SUCCESS != PHP_MINIT_CALL(http_encoding)
 	|| SUCCESS != PHP_MINIT_CALL(http_filter)
 	|| SUCCESS != PHP_MINIT_CALL(http_header)
+	|| SUCCESS != PHP_MINIT_CALL(http_header_parser)
 	|| SUCCESS != PHP_MINIT_CALL(http_message)
+	|| SUCCESS != PHP_MINIT_CALL(http_message_parser)
 	|| SUCCESS != PHP_MINIT_CALL(http_message_body)
 	|| SUCCESS != PHP_MINIT_CALL(http_querystring)
 	|| SUCCESS != PHP_MINIT_CALL(http_client)
@@ -183,26 +174,9 @@ PHP_MSHUTDOWN_FUNCTION(http)
 	return SUCCESS;
 }
 
-PHP_RINIT_FUNCTION(http)
-{
-	if (0
-	|| SUCCESS != PHP_RINIT_CALL(http_env)
-#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
-	|| SUCCESS != PHP_RINIT_CALL(http_client_curl)
-#endif
-	) {
-		return FAILURE;
-	}
-	
-	return SUCCESS;
-}
-
 PHP_RSHUTDOWN_FUNCTION(http)
 {
 	if (0
-#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
-	|| SUCCESS != PHP_RSHUTDOWN_CALL(http_client_curl)
-#endif
 	|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
 	) {
 		return FAILURE;