automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@46680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-10-31 16:02:51 +00:00
parent 9a6cfc6866
commit 830d07c933
+2 -1
View File
@@ -94,7 +94,6 @@ static int curl_internal(struct MemoryStruct *chunk, char *url, char *post)
{
CURL *curl;
curl_global_init(CURL_GLOBAL_ALL);
curl = curl_easy_init();
if (!curl) {
@@ -224,6 +223,7 @@ int unload_module(void)
res |= ast_unregister_application(app);
STANDARD_HANGUP_LOCALUSERS;
curl_global_cleanup();
return res;
}
@@ -232,6 +232,7 @@ int load_module(void)
{
int res;
curl_global_init(CURL_GLOBAL_ALL);
res = ast_custom_function_register(&acf_curl);
res |= ast_register_application(app, curl_exec, synopsis, descrip);