From acf3090adf520f56745b4a80b6b6f87d38147dc6 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 13 May 2011 13:17:54 -0500
Subject: [PATCH] FS-2936 plan B for curl stuff
---
Makefile.am | 16 +--
configure.in | 10 --
src/include/private/switch_core_pvt.h | 1 +
src/include/switch.h | 1 -
src/include/switch_core.h | 2 +
src/include/switch_curl.h | 101 ++++++++++++---
src/mod/formats/mod_shout/mod_shout.c | 6 +-
.../mod_spidermonkey/mod_spidermonkey.c | 8 +-
.../mod_spidermonkey/mod_spidermonkey_curl.c | 4 +-
src/mod/xml_int/mod_xml_curl/mod_xml_curl.c | 7 +-
src/switch_core.c | 14 +++
src/switch_curl.c | 117 ------------------
w32/Library/FreeSwitchCore.2008.vcproj | 24 ++--
w32/Library/FreeSwitchCore.2010.vcxproj | 24 ++--
.../FreeSwitchCore.2010.vcxproj.filters | 6 -
15 files changed, 134 insertions(+), 207 deletions(-)
delete mode 100644 src/switch_curl.c
diff --git a/Makefile.am b/Makefile.am
index fcb2297131..95c53dd128 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,11 +103,6 @@ CORE_CFLAGS += -I$(switch_srcdir)/libs/speex/include -Ilibs/speex/include
CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include
CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -Ilibs/srtp/crypto/include
CORE_CFLAGS += -I$(switch_srcdir)/libs/spandsp/src -I$(switch_srcdir)/libs/tiff-3.8.2/libtiff
-CORE_CFLAGS += $(LIBCURL_CPPFLAGS) $(openssl_CFLAGS)
-
-if ENABLE_CORE_CURL
-CORE_CFLAGS += -DCORE_USE_CURL
-endif
CORE_LIBS = libs/apr-util/libaprutil-1.la libs/apr/libapr-1.la
CORE_LIBS += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la libs/speex/libspeex/libspeexdsp.la
@@ -118,7 +113,7 @@ endif
MOD_LINK = $(switch_srcdir)/libfreeswitch.la
CLEANFILES = src/include/switch_version.h src/include/switch_swigable_cpp.h
-BUILT_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h $(LIBCURL_DEPS)
+BUILT_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h
if HAVE_ODBC
CORE_CFLAGS += -DSWITCH_HAVE_ODBC $(ODBC_INC_FLAGS)
@@ -135,7 +130,7 @@ endif
lib_LTLIBRARIES = libfreeswitch.la
libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS)
libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_DEPLIBS)
-libfreeswitch_la_LIBADD = $(CORE_LIBS) $(LIBCURL)
+libfreeswitch_la_LIBADD = $(CORE_LIBS)
libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES)
if HAVE_ODBC
@@ -185,8 +180,7 @@ library_include_HEADERS = \
libs/libteletone/src/libteletone_generate.h \
libs/libteletone/src/libteletone.h \
src/include/switch_limit.h \
- src/include/switch_odbc.h \
- src/include/switch_curl.h
+ src/include/switch_odbc.h
nodist_libfreeswitch_la_SOURCES = \
src/include/switch_frame.h \
@@ -246,7 +240,6 @@ libfreeswitch_la_SOURCES = \
src/switch_pcm.c \
src/switch_profile.c \
src/switch_json.c \
- src/switch_curl.c \
libs/stfu/stfu.c \
libs/libteletone/src/libteletone_detect.c \
libs/libteletone/src/libteletone_generate.c \
@@ -442,9 +435,6 @@ libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update
@cd libs/srtp && $(MAKE)
@$(TOUCH_TARGET)
-libs/curl/lib/libcurl.la:
- @cd $libs/curl && $(MAKE)
- @$(TOUCH_TARGET)
##
## helper targets
diff --git a/configure.in b/configure.in
index c9952d855f..389e4985b6 100644
--- a/configure.in
+++ b/configure.in
@@ -352,11 +352,6 @@ AC_ARG_ENABLE(srtp,
AM_CONDITIONAL([ENABLE_SRTP],[test "${enable_srtp}" = "yes"])
-AC_ARG_ENABLE(core-curl,
-[AC_HELP_STRING([--disable-core-curl],[build without core-curl support])],[enable_core_curl="$enableval"],[enable_core_curl="yes"])
-
-AM_CONDITIONAL([ENABLE_CORE_CURL],[test "${enable_core_curl}" = "yes"])
-
AC_ARG_ENABLE(zrtp,
[AS_HELP_STRING([--enable-zrtp], [Compile with zrtp Support])],,[enable_zrtp="no"])
if test "x$enable_zrtp" = "xyes" ; then
@@ -795,11 +790,6 @@ if test "$ac_cv_use_system_curl" != "yes" ; then
LIBCURL_DEPS='${switch_builddir}/libs/curl/lib/libcurl.la'
LIBCURL='${switch_builddir}/libs/curl/lib/libcurl.la'
LIBCURL_CPPFLAGS='-I${switch_srcdir}/libs/curl/include'
-else
- AC_CHECK_LIB(curl, curl_global_init, have_curl=yes, have_curl=no)
- if test "x$have_curl" = "xyes" ; then
- APR_ADDTO(SWITCH_AM_LDFLAGS, -lcurl)
- fi
fi
AC_SUBST(LIBCURL_DEPS)
diff --git a/src/include/private/switch_core_pvt.h b/src/include/private/switch_core_pvt.h
index 8102d038e3..c8e9b210b9 100644
--- a/src/include/private/switch_core_pvt.h
+++ b/src/include/private/switch_core_pvt.h
@@ -253,6 +253,7 @@ struct switch_runtime {
int multiple_registrations;
uint32_t max_db_handles;
uint32_t db_handle_timeout;
+ int curl_count;
};
extern struct switch_runtime runtime;
diff --git a/src/include/switch.h b/src/include/switch.h
index 2f5cf72f30..de099f1b94 100644
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -137,7 +137,6 @@
#include "switch_odbc.h"
#include "switch_json.h"
#include "switch_limit.h"
-#include "switch_curl.h"
#include <libteletone.h>
diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index 88e8152f2a..b544f3fec9 100644
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -434,6 +434,8 @@ SWITCH_DECLARE(void) switch_core_session_rwunlock(_In_ switch_core_session_t *se
*/
SWITCH_DECLARE(int) switch_core_add_state_handler(_In_ const switch_state_handler_table_t *state_handler);
+SWITCH_DECLARE(int) switch_core_curl_count(int *val);
+
/*!
\brief Remove a global state handler
\param state_handler the state handler to remove
diff --git a/src/include/switch_curl.h b/src/include/switch_curl.h
index d3661226e0..d6149276c6 100644
--- a/src/include/switch_curl.h
+++ b/src/include/switch_curl.h
@@ -1,6 +1,6 @@
-/*
+/*
* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2011, Anthony Minessale II <anthm@freeswitch.org>
+ * Copyright (C) 2005-2010, Anthony Minessale II <anthm@freeswitch.org>
*
* Version: MPL 1.1
*
@@ -22,30 +22,100 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
*
*
- * switch_curl.h -- Core cURL
+ * switch_curl.h
*
*/
-/*! \file switch_core.h
- \brief Core Library
- This module is the main core library and is the intended location of all fundamental operations.
-*/
-#ifndef SWITCH_CURL_H
-#define SWITCH_CURL_H
+#include <curl/curl.h>
-SWITCH_BEGIN_EXTERN_C
+#if defined(HAVE_OPENSSL)
+#include <openssl/crypto.h>
-SWITCH_DECLARE(void) switch_curl_init(switch_memory_pool_t *pool);
-SWITCH_DECLARE(void) switch_curl_destroy(void);
+static switch_mutex_t **ssl_mutexes;
+static switch_memory_pool_t *ssl_pool = NULL;
-SWITCH_END_EXTERN_C
+static inline void switch_curl_ssl_lock_callback(int mode, int type, char *file, int line)
+{
+ if (mode & CRYPTO_LOCK) {
+ switch_mutex_lock(ssl_mutexes[type]);
+ }
+ else {
+ switch_mutex_unlock(ssl_mutexes[type]);
+ }
+}
+
+static inline unsigned long switch_curl_ssl_thread_id(void)
+{
+ return (unsigned long) switch_thread_self();
+}
+
+static inline void switch_curl_init_ssl_locks(void)
+{
+ int i, num = CRYPTO_num_locks();
+
+ ssl_mutexes = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(switch_mutex_t*));
+ switch_assert(ssl_mutexes != NULL);
+
+ switch_core_new_memory_pool(&ssl_pool);
+
+ for (i = 0; i < num; i++) {
+ switch_mutex_init(&(ssl_mutexes[i]), SWITCH_MUTEX_NESTED, ssl_pool);
+ switch_assert(ssl_mutexes[i] != NULL);
+ }
+
+ CRYPTO_set_id_callback(switch_curl_ssl_thread_id);
+ CRYPTO_set_locking_callback((void (*)(int, int, const char*, int))switch_curl_ssl_lock_callback);
+}
+
+static inline void switch_curl_destroy_ssl_locks()
+{
+ int i;
+
+ CRYPTO_set_locking_callback(NULL);
+ for (i = 0; i < CRYPTO_num_locks(); i++) {
+ switch_mutex_destroy(ssl_mutexes[i]);
+ }
+
+ OPENSSL_free(ssl_mutexes);
+}
#endif
+
+static inline void switch_curl_init(void)
+{
+ int curl_count = switch_core_curl_count(NULL);
+
+ if (curl_count == 0) {
+ curl_global_init(CURL_GLOBAL_ALL);
+#if defined(HAVE_OPENSSL)
+ switch_curl_init_ssl_locks();
+#endif
+ }
+
+ curl_count++;
+ switch_core_curl_count(&curl_count);
+}
+
+static inline void switch_curl_destroy()
+{
+ int curl_count = switch_core_curl_count(NULL);
+
+ curl_count--;
+
+ if (curl_count == 0) {
+
+#if defined(HAVE_OPENSSL)
+ switch_curl_destroy_ssl_locks();
+#endif
+ curl_global_cleanup();
+ }
+ switch_core_curl_count(&curl_count);
+}
+
+
/* For Emacs:
* Local Variables:
* mode:c
@@ -56,3 +126,4 @@ SWITCH_END_EXTERN_C
* For VIM:
* vim:set softtabstop=4 shiftwidth=4 tabstop=4:
*/
+
diff --git a/src/mod/formats/mod_shout/mod_shout.c b/src/mod/formats/mod_shout/mod_shout.c
index 377cfe520c..a4134db943 100644
--- a/src/mod/formats/mod_shout/mod_shout.c
+++ b/src/mod/formats/mod_shout/mod_shout.c
@@ -36,7 +36,7 @@
#include <switch.h>
#include <shout/shout.h>
#include <lame.h>
-#include <curl/curl.h>
+#include <switch_curl.h>
#define OUTSCALE 8192 * 2
#define MP3_SCACHE 16384 * 2
@@ -1480,7 +1480,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_shout_load)
supported_formats[0] = "shout";
supported_formats[1] = "mp3";
- curl_global_init(CURL_GLOBAL_ALL);
+ switch_curl_init();
/* connect my internal structure to the blank pointer passed to me */
*module_interface = switch_loadable_module_create_module_interface(pool, modname);
@@ -1507,7 +1507,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_shout_load)
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_shout_shutdown)
{
- curl_global_cleanup();
+ switch_curl_destroy();
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 7341a2b1e1..a09cfdf02a 100644
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
@@ -35,7 +35,7 @@
#include "mod_spidermonkey.h"
#ifdef HAVE_CURL
-#include <curl/curl.h>
+#include <switch_curl.h>
#endif
static int foo = 0;
static jsval check_hangup_hook(struct js_session *jss, jsval * rp);
@@ -2551,7 +2551,6 @@ 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);
@@ -2600,7 +2599,6 @@ 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);
@@ -3803,7 +3801,7 @@ 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);
+ switch_curl_init();
/* indicate that the module should continue to be loaded */
return SWITCH_STATUS_NOUNLOAD;
@@ -3814,7 +3812,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown)
// this causes a crash
//JS_DestroyRuntime(globals.rt);
- curl_global_cleanup();
+ switch_curl_destroy();
switch_core_hash_destroy(&module_manager.mod_hash);
switch_core_hash_destroy(&module_manager.load_hash);
diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c
index 5fb7b7f0be..c2e64ee0aa 100644
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey_curl.c
@@ -30,7 +30,7 @@
*
*/
#include "mod_spidermonkey.h"
-#include <curl/curl.h>
+#include <switch_curl.h>
static const char modname[] = "CURL";
@@ -242,7 +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);
+ switch_curl_init();
*module_interface = &curl_module_interface;
return SWITCH_STATUS_SUCCESS;
}
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 6aa899babb..b718c51fe0 100644
--- a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
+++ b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
@@ -31,7 +31,8 @@
*
*/
#include <switch.h>
-#include <curl/curl.h>
+#include <switch_curl.h>
+
SWITCH_MODULE_LOAD_FUNCTION(mod_xml_curl_load);
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_curl_shutdown);
@@ -548,7 +549,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_curl_load)
globals.hash_tail = NULL;
if (do_config() == SWITCH_STATUS_SUCCESS) {
- curl_global_init(CURL_GLOBAL_ALL);
+ switch_curl_init();
} else {
return SWITCH_STATUS_FALSE;
}
@@ -573,7 +574,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_xml_curl_shutdown)
}
switch_xml_unbind_search_function_ptr(xml_url_fetch);
- curl_global_cleanup();
+ switch_curl_destroy();
return SWITCH_STATUS_SUCCESS;
}
diff --git a/src/switch_core.c b/src/switch_core.c
index ed8328d3e7..0b4d8dc732 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -197,6 +197,20 @@ SWITCH_DECLARE(FILE *) switch_core_data_channel(switch_text_channel_t channel)
return handle;
}
+
+SWITCH_DECLARE(int) switch_core_curl_count(int *val)
+{
+ if (!val) {
+ switch_mutex_lock(runtime.global_mutex);
+ return runtime.curl_count;
+ }
+
+ runtime.curl_count = *val;
+ switch_mutex_unlock(runtime.global_mutex);
+ return 0;
+
+}
+
SWITCH_DECLARE(void) switch_core_remove_state_handler(const switch_state_handler_table_t *state_handler)
{
int index, tmp_index = 0;
diff --git a/src/switch_curl.c b/src/switch_curl.c
deleted file mode 100644
index 02557b06ea..0000000000
--- a/src/switch_curl.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2010, Anthony Minessale II <anthm@freeswitch.org>
- *
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- *
- * The Initial Developer of the Original Code is
- * Anthony Minessale II <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- *
- * switch_curl.c
- *
- */
-
-#include <switch.h>
-
-#if defined(CORE_USE_CURL) && defined(HAVE_OPENSSL)
-#include <openssl/crypto.h>
-#include <curl/curl.h>
-
-static switch_mutex_t **ssl_mutexes;
-
-static void switch_curl_ssl_lock_callback(int mode, int type, char *file, int line)
-{
- if (mode & CRYPTO_LOCK) {
- switch_mutex_lock(ssl_mutexes[type]);
- }
- else {
- switch_mutex_unlock(ssl_mutexes[type]);
- }
-}
-
-static unsigned long switch_curl_ssl_thread_id(void)
-{
- return (unsigned long) switch_thread_self();
-}
-
-static void switch_curl_init_ssl_locks(switch_memory_pool_t *pool)
-{
- int i, num = CRYPTO_num_locks();
-
- ssl_mutexes = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(switch_mutex_t*));
- switch_assert(ssl_mutexes != NULL);
-
- for (i = 0; i < num; i++) {
- switch_mutex_init(&(ssl_mutexes[i]), SWITCH_MUTEX_NESTED, pool);
- switch_assert(ssl_mutexes[i] != NULL);
- }
-
- CRYPTO_set_id_callback(switch_curl_ssl_thread_id);
- CRYPTO_set_locking_callback((void (*)(int, int, const char*, int))switch_curl_ssl_lock_callback);
-}
-
-static void switch_curl_destroy_ssl_locks()
-{
- int i;
-
- CRYPTO_set_locking_callback(NULL);
- for (i = 0; i < CRYPTO_num_locks(); i++) {
- switch_mutex_destroy(ssl_mutexes[i]);
- }
-
- OPENSSL_free(ssl_mutexes);
-}
-
-
-SWITCH_DECLARE(void) switch_curl_init(switch_memory_pool_t *pool)
-{
- curl_global_init(CURL_GLOBAL_ALL);
- switch_curl_init_ssl_locks(pool);
-}
-
-SWITCH_DECLARE(void) switch_curl_destroy()
-{
- switch_curl_destroy_ssl_locks();
- curl_global_cleanup();
-}
-
-#else
-SWITCH_DECLARE(void) switch_curl_init(switch_memory_pool_t *pool)
-{
- return;
-}
-
-SWITCH_DECLARE(void) switch_curl_destroy()
-{
- return;
-}
-#endif
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
-
diff --git a/w32/Library/FreeSwitchCore.2008.vcproj b/w32/Library/FreeSwitchCore.2008.vcproj
index 557be16f1e..6ba5b95959 100644
--- a/w32/Library/FreeSwitchCore.2008.vcproj
+++ b/w32/Library/FreeSwitchCore.2008.vcproj
@@ -47,8 +47,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;"..\..\libs\tiff-3.8.2\libtiff";"..\..\libs\openssl-1.0.0a\include";..\..\libs\curl\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;CORE_USE_CURL;CURL_STATICLIB"
+ AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -141,8 +141,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;"..\..\libs\tiff-3.8.2\libtiff";"..\..\libs\openssl-1.0.0a\include";..\..\libs\curl\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;CORE_USE_CURL;CURL_STATICLIB"
+ AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -234,8 +234,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;"..\..\libs\tiff-3.8.2\libtiff";"..\..\libs\openssl-1.0.0a\include";..\..\libs\curl\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;CORE_USE_CURL;CURL_STATICLIB"
+ AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="switch.h"
@@ -324,8 +324,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;"..\..\libs\tiff-3.8.2\libtiff";"..\..\libs\openssl-1.0.0a\include";..\..\libs\curl\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;CORE_USE_CURL;CURL_STATICLIB"
+ AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="switch.h"
@@ -690,10 +690,6 @@
/>
</FileConfiguration>
</File>
- <File
- RelativePath="..\..\src\switch_curl.c"
- >
- </File>
<File
RelativePath="..\..\src\switch_dso.c"
>
@@ -1448,10 +1444,6 @@
RelativePath="..\..\src\include\switch_cpp.h"
>
</File>
- <File
- RelativePath="..\..\src\include\switch_curl.h"
- >
- </File>
<File
RelativePath="..\..\src\include\switch_dso.h"
>
diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj b/w32/Library/FreeSwitchCore.2010.vcxproj
index 61928da35c..c74ad944b1 100644
--- a/w32/Library/FreeSwitchCore.2010.vcxproj
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj
@@ -88,8 +88,8 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;"..\..\libs\openssl-1.0.0a\include";..\..\libs\curl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;CORE_USE_CURL;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -146,8 +146,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;"..\..\libs\openssl-1.0.0a\include";..\..\libs\curl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;CORE_USE_CURL;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -198,8 +198,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;"..\..\libs\openssl-1.0.0a\include";..\..\libs\curl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;CORE_USE_CURL;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>switch.h</PrecompiledHeaderFile>
@@ -247,8 +247,8 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;"..\..\libs\openssl-1.0.0a\include";..\..\libs\curl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;CORE_USE_CURL;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-3.8.2\libtiff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>switch.h</PrecompiledHeaderFile>
@@ -374,7 +374,6 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="..\..\src\switch_curl.c" />
<ClCompile Include="..\..\src\switch_dso.c" />
<ClCompile Include="..\..\src\switch_event.c" />
<ClCompile Include="..\..\src\switch_ivr.c" />
@@ -706,7 +705,6 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
<ClInclude Include="..\..\src\include\switch_core_db.h" />
<ClInclude Include="..\..\src\include\switch_core_event_hook.h" />
<ClInclude Include="..\..\src\include\switch_cpp.h" />
- <ClInclude Include="..\..\src\include\switch_curl.h" />
<ClInclude Include="..\..\src\include\switch_dso.h" />
<ClInclude Include="..\..\src\include\switch_event.h" />
<ClInclude Include="..\..\src\include\switch_frame.h" />
@@ -790,12 +788,6 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
- <ProjectReference Include="..\..\libs\win32\curl\curllib.2010.vcxproj">
- <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>
- </ProjectReference>
- <ProjectReference Include="..\..\libs\win32\openssl\libeay32.2010.vcxproj">
- <Project>{d331904d-a00a-4694-a5a3-fcff64ab5dbe}</Project>
- </ProjectReference>
<ProjectReference Include="..\..\libs\win32\pcre\libpcre.2010.vcxproj">
<Project>{8d04b550-d240-4a44-8a18-35da3f7038d9}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj.filters b/w32/Library/FreeSwitchCore.2010.vcxproj.filters
index e8a5751499..25fc9a136d 100644
--- a/w32/Library/FreeSwitchCore.2010.vcxproj.filters
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj.filters
@@ -199,9 +199,6 @@
<ClCompile Include="..\..\libs\miniupnpc\upnpreplyparse.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\src\switch_curl.c">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\libs\miniupnpc\declspec.h">
@@ -321,9 +318,6 @@
<ClInclude Include="..\..\src\include\switch_ivr.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\include\switch_curl.h">
- <Filter>Header Files</Filter>
- </ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\src\include\switch_version.h.template" />