X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.c;h=bd7baff1078fffbad0a4cb5bd1b3e7be73b6c497;hp=5ee038d392cd938870f4d61fc3fc0a3c20c53161;hb=b10189da6953e651aa86b0191d2a2ae964c38b51;hpb=dedd682f1f67f8af921c87653c58863f355ead43

diff --git a/php_http.c b/php_http.c
index 5ee038d..bd7baff 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,
@@ -141,6 +137,7 @@ PHP_MINIT_FUNCTION(http)
 	|| 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)
@@ -184,26 +181,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;