- more descriptive constant names

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 8d65cd155ea50d3a7f0803eb5f8acedbd08a502c..700fa9e33bc6923624bb573d811fe356fcd3300d 100644 (file)
--- a/http.c
+++ b/http.c
@@ -71,7 +71,7 @@ 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)
@@ -112,7 +112,8 @@ function_entry http_functions[] = {
        PHP_FE(http_build_query, NULL)
 #endif
        PHP_FE(ob_etaghandler, NULL)
-       {NULL, NULL, NULL}
+       
+       EMPTY_FUNCTION_ENTRY
 };
 /* }}} */
 
@@ -150,8 +151,8 @@ static inline void http_globals_init(zend_http_globals *G)
 #ifdef HTTP_HAVE_CURL
        zend_llist_init(&G->request.copies.strings, sizeof(char *), http_request_data_free_string, 0);
        zend_llist_init(&G->request.copies.slists, sizeof(struct curl_slist *), http_request_data_free_slist, 0);
-       zend_llist_init(&G->request.copies.contexts, sizeof(http_curl_callback_ctx *), http_request_data_free_context, 0);
-       zend_llist_init(&G->request.copies.convs, sizeof(http_curl_conv *), http_request_data_free_conv, 0);
+       zend_llist_init(&G->request.copies.contexts, sizeof(http_request_callback_ctx *), http_request_data_free_context, 0);
+       zend_llist_init(&G->request.copies.convs, sizeof(http_request_conv *), http_request_data_free_conv, 0);
 #endif
 }
 
@@ -223,7 +224,7 @@ PHP_INI_DISP(http_etag_mode_displayer)
                        if (!hash_name) {
                                ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5"));
                        } else {
-                               ZEND_WRITE("HTTP_ETAG_MHASH|MHASH_", lenof("HTTP_ETAG_MHASH|MHASH_"));
+                               ZEND_WRITE("HTTP_ETAG_MHASH_", lenof("HTTP_ETAG_MHASH_"));
                                ZEND_WRITE(hash_name, strlen(hash_name));
                        }
                }
@@ -249,6 +250,11 @@ PHP_INI_BEGIN()
 PHP_INI_END()
 /* }}} */
 
+/* {{{ SSL */
+#ifdef HTTP_NEED_SSL
+
+#endif
+/* }}} */
 
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(http)
@@ -259,12 +265,14 @@ PHP_MINIT_FUNCTION(http)
 
        REGISTER_INI_ENTRIES();
        
-       HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5);
-       HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1);
-       HTTP_LONG_CONSTANT("HTTP_ETAG_MHASH", HTTP_ETAG_MHASH);
-
+       if (SUCCESS != http_cache_global_init()) {
+               return FAILURE;
+       }
+       if (SUCCESS != http_request_method_global_init()) {
+               return FAILURE;
+       }
 #ifdef HTTP_HAVE_CURL
-       if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
+       if (SUCCESS != http_request_global_init()) {
                return FAILURE;
        }
 #endif /* HTTP_HAVE_CURL */
@@ -291,7 +299,7 @@ PHP_MSHUTDOWN_FUNCTION(http)
 {
        UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
-       curl_global_cleanup();
+       http_request_global_cleanup();
 #endif
        return SUCCESS;
 }
@@ -314,6 +322,14 @@ PHP_RINIT_FUNCTION(http)
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+       int i, c = zend_hash_num_elements(&HTTP_G(request).methods.custom);
+       
+       for (i = 0; i < c; ++i) {
+               zend_printf("RSHUTDOWN: unregistering %d (%d)\n", i, 
+               http_request_method_unregister(HTTP_MAX_REQUEST_METHOD + i));
+       }
+#endif
        http_globals_free(HTTP_GLOBALS);
        return SUCCESS;
 }