- use PHP macros, so that it is obvious when to call what

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index c7bdcb316705b1c24e7273ae09682f6c28a5358f..615958c01f88d327e73e72a9e98e536c5eb3d65b 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -56,7 +56,7 @@ static inline zend_bool http_ssl_init(void);
 static inline void http_ssl_cleanup(void);
 #endif
 
 static inline void http_ssl_cleanup(void);
 #endif
 

-STATUS _http_request_global_init(INIT_FUNC_ARGS)
+PHP_MINIT_FUNCTION(http_request)

 {
        if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
                return FAILURE;
 {
        if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
                return FAILURE;


@@ -76,12 +76,13 @@ STATUS _http_request_global_init(INIT_FUNC_ARGS)
        return SUCCESS;
 }
 
        return SUCCESS;
 }
 

-void _http_request_global_cleanup(TSRMLS_D)
+PHP_MSHUTDOWN_FUNCTION(http_request)

 {
        curl_global_cleanup();
 #ifdef HTTP_NEED_SSL
        http_ssl_cleanup();
 #endif
 {
        curl_global_cleanup();
 #ifdef HTTP_NEED_SSL
        http_ssl_cleanup();
 #endif

+       return SUCCESS;

 }
 
 #ifndef HAVE_CURL_EASY_STRERROR
 }
 
 #ifndef HAVE_CURL_EASY_STRERROR