revert curl changes

diff --git a/src/mod/applications/mod_cidlookup/Makefile b/src/mod/applications/mod_cidlookup/Makefile
index 24790d0d397dcef8f05b456b9428fa7d80065589..5ffe1d8476756d5bc197f1e6ef02e1fb68801aac 100644 (file)
--- a/src/mod/applications/mod_cidlookup/Makefile
+++ b/src/mod/applications/mod_cidlookup/Makefile
@@ -1,3 +1,4 @@
+WANT_CURL=yes
 BASE=../../../..
 include $(BASE)/build/modmake.rules
 

diff --git a/src/mod/applications/mod_curl/Makefile b/src/mod/applications/mod_curl/Makefile
index 6cae5a85952be6382d16a4ef46dbf42e375adbe0..b27663335548cd2061674cbf714cfb2fba71d04c 100644 (file)
--- a/src/mod/applications/mod_curl/Makefile
+++ b/src/mod/applications/mod_curl/Makefile
@@ -1,5 +1,6 @@
 json-c=json-c-0.9
 BASE=../../../..
+WANT_CURL=yes
 
 JSON_DIR=$(switch_srcdir)/libs/$(json-c)
 JSON_BUILDDIR=$(switch_builddir)/libs/$(json-c)

diff --git a/src/mod/applications/mod_memcache/Makefile b/src/mod/applications/mod_memcache/Makefile
index 0f469ff9e263c86d970636aaefec35a058b62b18..80c1d2b93683cb534b6f15b9d62230d01603e4da 100644 (file)
--- a/src/mod/applications/mod_memcache/Makefile
+++ b/src/mod/applications/mod_memcache/Makefile
@@ -1,6 +1,8 @@
 MEMCACHED=libmemcached-0.32
 BASE=../../../..
 
+WANT_CURL=yes
+
 MEMCACHED_DIR=$(switch_srcdir)/libs/$(MEMCACHED)
 MEMCACHED_BUILDDIR=$(switch_builddir)/libs/$(MEMCACHED)
 

diff --git a/src/mod/event_handlers/mod_json_cdr/Makefile b/src/mod/event_handlers/mod_json_cdr/Makefile
index 1819f0a4c37e5ec1489f9db4e52975b90bd8f465..d5043e017dda2cfef8a9a922ac7b6f7c265935ff 100644 (file)
--- a/src/mod/event_handlers/mod_json_cdr/Makefile
+++ b/src/mod/event_handlers/mod_json_cdr/Makefile
@@ -1,5 +1,6 @@
 json-c=json-c-0.9
 BASE=../../../..
+WANT_CURL=yes
 
 JSON_DIR=$(switch_srcdir)/libs/$(json-c)
 JSON_BUILDDIR=$(switch_builddir)/libs/$(json-c)

diff --git a/src/mod/formats/mod_shout/Makefile b/src/mod/formats/mod_shout/Makefile
index 50dc9d5b3ae723abda87f5207f8e01a9f660e187..7388bc0c67c6b37896e9b96e3049b67faf5e1b0d 100644 (file)
--- a/src/mod/formats/mod_shout/Makefile
+++ b/src/mod/formats/mod_shout/Makefile
@@ -3,6 +3,8 @@ SHOUT=libshout-2.2.2
 MPG123=mpg123-1.13.2
 BASE=../../../..
 
+WANT_CURL=yes
+
 LAME_DIR=$(switch_srcdir)/libs/$(LAME)
 SHOUT_DIR=$(switch_srcdir)/libs/$(SHOUT)
 MPG123_DIR=$(switch_srcdir)/libs/$(MPG123)

diff --git a/src/mod/formats/mod_shout/mod_shout.c b/src/mod/formats/mod_shout/mod_shout.c
index c506e18933992e85531ef02db8e196f5c0a8787d..377cfe520c7dfdb0406371a2ce776d809ec83457 100644 (file)
--- a/src/mod/formats/mod_shout/mod_shout.c
+++ b/src/mod/formats/mod_shout/mod_shout.c
@@ -1480,6 +1480,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_shout_load)
        supported_formats[0] = "shout";
        supported_formats[1] = "mp3";
 
+       curl_global_init(CURL_GLOBAL_ALL);
+
        /* connect my internal structure to the blank pointer passed to me */
        *module_interface = switch_loadable_module_create_module_interface(pool, modname);
        file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE);
@@ -1505,6 +1507,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_shout_load)
 
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_shout_shutdown)
 {
+       curl_global_cleanup();
        mpg123_exit();
        return SWITCH_STATUS_SUCCESS;
 }

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
index 30ec8789d66df611dea57d3d9ace87748b3bab60..7341a2b1e19bfad4dedb92a8d0223f8b85ea4d5f 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
@@ -2551,6 +2551,7 @@ static JSBool js_fetchurl_file(JSContext * cx, JSObject * obj, uintN argc, jsval
                url = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
                filename = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
 
+               curl_global_init(CURL_GLOBAL_ALL);
                curl_handle = curl_easy_init();
                if (!strncasecmp(url, "https", 5)) {
                        curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
@@ -2599,6 +2600,7 @@ static JSBool js_fetchurl(JSContext * cx, JSObject * obj, uintN argc, jsval * ar
                        JS_ValueToInt32(cx, argv[1], &buffer_size);
                }
 
+               curl_global_init(CURL_GLOBAL_ALL);
                curl_handle = curl_easy_init();
                if (!strncasecmp(url, "https", 5)) {
                        curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0);
@@ -3801,6 +3803,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load)
        SWITCH_ADD_APP(app_interface, "javascript", "Launch JS ivr", "Run a javascript ivr on a channel", js_dp_function, "<script> [additional_vars [...]]",
                                   SAF_SUPPORT_NOMEDIA);
 
+       curl_global_init(CURL_GLOBAL_ALL);
+
        /* indicate that the module should continue to be loaded */
        return SWITCH_STATUS_NOUNLOAD;
 }
@@ -3810,6 +3814,8 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown)
        // this causes a crash
        //JS_DestroyRuntime(globals.rt);
 
+       curl_global_cleanup();
+
        switch_core_hash_destroy(&module_manager.mod_hash);
        switch_core_hash_destroy(&module_manager.load_hash);
        return SWITCH_STATUS_SUCCESS;

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c
index 09a1f0ee8c89a1a024721880e746e6dfc629706d..5fb7b7f0bef3814ed48e1da8c03b649b8d0356a8 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c
@@ -242,6 +242,7 @@ const sm_module_interface_t curl_module_interface = {
 
 SWITCH_MOD_DECLARE_NONSTD(switch_status_t) spidermonkey_init(const sm_module_interface_t ** module_interface)
 {
+       curl_global_init(CURL_GLOBAL_ALL);
        *module_interface = &curl_module_interface;
        return SWITCH_STATUS_SUCCESS;
 }

diff --git a/src/mod/xml_int/mod_xml_cdr/Makefile b/src/mod/xml_int/mod_xml_cdr/Makefile
index c2baec83cd6d513b72557d5454cf170d62040ed1..c762c5353da23522a51613313248c54cf90c93aa 100644 (file)
--- a/src/mod/xml_int/mod_xml_cdr/Makefile
+++ b/src/mod/xml_int/mod_xml_cdr/Makefile
@@ -1 +1,2 @@
+WANT_CURL=yes
 include ../../../../build/modmake.rules

diff --git a/src/mod/xml_int/mod_xml_curl/Makefile b/src/mod/xml_int/mod_xml_curl/Makefile
index c2baec83cd6d513b72557d5454cf170d62040ed1..c762c5353da23522a51613313248c54cf90c93aa 100644 (file)
--- a/src/mod/xml_int/mod_xml_curl/Makefile
+++ b/src/mod/xml_int/mod_xml_curl/Makefile
@@ -1 +1,2 @@
+WANT_CURL=yes
 include ../../../../build/modmake.rules

diff --git a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
index e509fdfd0ea05534ee58a8a887696b4ce7b65ff2..6aa899babb0407d837d10222aa8cff1f2d3e6e58 100644 (file)
--- a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
+++ b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
@@ -547,7 +547,9 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_curl_load)
        globals.hash_root = NULL;
        globals.hash_tail = NULL;
 
-       if (do_config() != SWITCH_STATUS_SUCCESS) {
+       if (do_config() == SWITCH_STATUS_SUCCESS) {
+               curl_global_init(CURL_GLOBAL_ALL);
+       } else {
                return SWITCH_STATUS_FALSE;
        }
 
@@ -571,6 +573,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_curl_shutdown)
        }
 
        switch_xml_unbind_search_function_ptr(xml_url_fetch);
+       curl_global_cleanup();
        return SWITCH_STATUS_SUCCESS;
 }
 

diff --git a/src/switch_core.c b/src/switch_core.c
index 3ea92a51136aaad24993f065e87e60b543a54ee6..ed8328d3e78ba2f82edecc31804c8512f5a67677 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -1446,8 +1446,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
        switch_uuid_get(&uuid);
        switch_uuid_format(runtime.uuid_str, &uuid);
 
-       switch_curl_init(runtime.memory_pool);
-
        return SWITCH_STATUS_SUCCESS;
 }
 
@@ -2118,7 +2116,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void)
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Clean up modules.\n");
 
        switch_loadable_module_shutdown();
-       switch_curl_destroy();
 
        if (switch_test_flag((&runtime), SCF_USE_SQL)) {
                switch_core_sqldb_stop();