mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-10-31 23:51:10 +00:00
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:
1 parent
12bc3828ee
commit
666231f91b
10 files changed
+16
-30
No files matched your search
@@ -66,7 +66,7 @@ static struct {
|
||||
int prefix_a;
|
||||
int disable100continue;
|
||||
int rotate;
|
||||
int auth_scheme;
|
||||
long auth_scheme;
|
||||
int timeout;
|
||||
switch_memory_pool_t *pool;
|
||||
switch_event_node_t *node;
|
||||
@@ -576,7 +576,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load)
|
||||
} else if (!strcasecmp(val, "GSS-NEGOTIATE")) {
|
||||
globals.auth_scheme |= CURLAUTH_GSSNEGOTIATE;
|
||||
} else if (!strcasecmp(val, "any")) {
|
||||
globals.auth_scheme = CURLAUTH_ANY;
|
||||
globals.auth_scheme = (long)CURLAUTH_ANY;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ struct xml_binding {
|
||||
char *cookie_file;
|
||||
switch_hash_t *vars_map;
|
||||
int use_dynamic_url;
|
||||
int auth_scheme;
|
||||
long auth_scheme;
|
||||
int timeout;
|
||||
};
|
||||
|
||||
@@ -368,7 +368,7 @@ static switch_status_t do_config(void)
|
||||
uint32_t enable_ssl_verifyhost = 0;
|
||||
char *cookie_file = NULL;
|
||||
hash_node_t *hash_node;
|
||||
int auth_scheme = CURLAUTH_BASIC;
|
||||
long auth_scheme = CURLAUTH_BASIC;
|
||||
need_vars_map = 0;
|
||||
vars_map = NULL;
|
||||
|
||||
@@ -399,7 +399,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;
|
||||
|
||||
Reference in new issue
Block a user