X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http.c;h=c37638812a4ba9b7ef3fc8b273ced34a90e5b78a;hb=0869caece2853a07711676bad8f032fa89ed82e9;hp=2ff20f105321e0ba4271480d3695570ecaf60e88;hpb=bdd6edb59194cda9e5fcb393c48ab4230fceb32a;p=m6w6%2Fext-http

diff --git a/src/php_http.c b/src/php_http.c
index 2ff20f1..c376388 100644
--- a/src/php_http.c
+++ b/src/php_http.c
@@ -12,8 +12,8 @@
 
 #include "php_http_api.h"
 
-#include <php_ini.h>
-#include <ext/standard/info.h>
+#include "php_ini.h"
+#include "ext/standard/info.h"
 
 #include <zlib.h>
 
@@ -106,23 +106,15 @@ static void php_http_globals_init_once(zend_php_http_globals *G)
 }
 
 #if 0
-static inline void php_http_globals_init(zend_php_http_globals *G TSRMLS_DC)
+static inline void php_http_globals_init(zend_php_http_globals *G)
 {
 }
 
-static inline void php_http_globals_free(zend_php_http_globals *G TSRMLS_DC)
+static inline void php_http_globals_free(zend_php_http_globals *G)
 {
 }
 #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()
@@ -134,6 +126,7 @@ 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)
@@ -150,6 +143,7 @@ PHP_MINIT_FUNCTION(http)
 #if PHP_HTTP_HAVE_CURL
 	|| SUCCESS != PHP_MINIT_CALL(http_curl)
 	|| SUCCESS != PHP_MINIT_CALL(http_client_curl)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_curl_user)
 #endif
 	|| SUCCESS != PHP_MINIT_CALL(http_url)
 	|| SUCCESS != PHP_MINIT_CALL(http_env)