this seems to work more often than the present solutions

This commit is contained in:
Anthony Minessale 2012-01-05 15:48:01 -06:00
parent bc8cbee1fb
commit e7848b39b2
3 changed files with 3 additions and 24 deletions

View File

@ -49,7 +49,7 @@ SWITCH_DECLARE(switch_CURLcode) switch_curl_easy_setopt(CURL *handle, switch_CUR
SWITCH_DECLARE(const char *) switch_curl_easy_strerror(switch_CURLcode errornum );
SWITCH_DECLARE(void) switch_curl_init(void);
SWITCH_DECLARE(void) switch_curl_destroy(void);
SWITCH_DECLARE(CURLFORMcode) switch_curl_formadd(struct curl_httppost **formpost, struct curl_httppost **lastptr, ...);
#endif

View File

@ -1134,7 +1134,7 @@ static switch_status_t process_form_post_params(client_t *client, switch_CURL *c
if (fname && pname) {
*fname++ = '\0';
switch_curl_formadd(&formpost,
curl_formadd(&formpost,
&lastptr,
CURLFORM_COPYNAME, pname,
CURLFORM_FILENAME, fname,
@ -1143,7 +1143,7 @@ static switch_status_t process_form_post_params(client_t *client, switch_CURL *c
}
} else {
switch_curl_formadd(&formpost,
curl_formadd(&formpost,
&lastptr,
CURLFORM_COPYNAME, hp->name,
CURLFORM_COPYCONTENTS, hp->value,

View File

@ -73,24 +73,3 @@ SWITCH_DECLARE(void) switch_curl_destroy(void)
curl_global_cleanup();
}
/* kind of ugly but there is no better portable way to wrap this function =(::: */
#ifndef WIN32
#include "../../../../libs/curl/lib/formdata.c"
#endif
SWITCH_DECLARE(CURLFORMcode) switch_curl_formadd(struct curl_httppost **httppost,
struct curl_httppost **last_post,
...)
{
va_list arg;
CURLFORMcode result;
va_start(arg, last_post);
#ifndef WIN32
result = FormAdd(httppost, last_post, arg);
#else
result = curl_formadd(httppost, last_post, arg);
#endif
va_end(arg);
return result;
}