BNPH-6149: allow to use system curl again, fix some types on auth_scheme values to all be long, don't use curl private function in our wrapper. This may cause missing symbol curl_easy_setopt with visibility turned on, if it does that, please let me know

This commit is contained in:
Brian West committed 2014-03-12 13:47:24 -05:00
1 parent 12bc3828ee
commit 666231f91b
10 files changed
+16 -30

No files matched your search

+3 -3
View File
@@ -86,7 +86,7 @@ typedef struct client_profile_s {
uint32_t enable_ssl_verifyhost;
char *cookie_file;
switch_hash_t *vars_map;
int auth_scheme;
long auth_scheme;
int timeout;
profile_perms_t perms;
char *ua;
@@ -1749,7 +1749,7 @@ static switch_status_t do_config(void)
char *cookie_file = NULL;
char *ua = "mod_httapi/1.0";
hash_node_t *hash_node;
int auth_scheme = CURLAUTH_BASIC;
long auth_scheme = CURLAUTH_BASIC;
need_vars_map = 0;
vars_map = NULL;
@@ -1791,7 +1791,7 @@ static switch_status_t do_config(void)
} else if (!strcasecmp(val, "GSS-NEGOTIATE")) {
auth_scheme |= CURLAUTH_GSSNEGOTIATE;
} else if (!strcasecmp(val, "any")) {
auth_scheme = CURLAUTH_ANY;
auth_scheme = (long)CURLAUTH_ANY;
}
} else if (!strcasecmp(var, "disable-100-continue") && !switch_true(val)) {
disable100continue = 0;