Attachment #116502 for bug #157654

View | Details | Raw Unified | Return to bug 157654
Collapse All | Expand All




static void handleSSLVerifyPeer(Connection *, value);
static void handleCAInfo(Connection *, value);
static void handleCAPath(Connection *, value);
static void handlePasswdFunction(Connection *, value);
static void handleFileTime(Connection *, value);
static void handleMaxRedirs(Connection *, value);
static void handleMaxConnects(Connection *, value);

     {handleSSLVerifyPeer, "CURLOPT_SSLVERIFYPEER", CURLOPT_SSL_VERIFYPEER},
     {handleCAInfo, "CURLOPT_CAINFO", CURLOPT_CAINFO},
     {handleCAPath, "CURLOPT_CAPATH", CURLOPT_CAPATH},
     {handlePasswdFunction, "CURLOPT_PASSWDFUNCTION", CURLOPT_PASSWDFUNCTION},
     {handleFileTime, "CURLOPT_FILETIME", CURLOPT_FILETIME},
     {handleMaxRedirs, "CURLOPT_MAXREDIRS", CURLOPT_MAXREDIRS},
     {handleMaxConnects, "CURLOPT_MAXCONNECTS", CURLOPT_MAXCONNECTS},

          raiseError(conn, result);
}

static void handlePasswdFunction(Connection *conn, value option)
{
     CURLcode result = CURLE_OK;

     if (Tag_val(option) == Closure_tag)
          conn->ocamlPasswdCallback = option;
     else
          failwith("Not a proper closure");

     result = curl_easy_setopt(conn->connection,
                               CURLOPT_PASSWDFUNCTION,
                               passwdFunction);
     if (result != CURLE_OK)
          raiseError(conn, result);

     result = curl_easy_setopt(conn->connection,
                               CURLOPT_PASSWDDATA,
                               conn);

     if (result != CURLE_OK)
          raiseError(conn, result);
}

static void handleFileTime(Connection *conn, value option)
{
     CURLcode result = CURLE_OK;

Return to bug 157654

Lines 231-237 Link Here

(-)ocurl-0.1.6/curl-helper.c.orig (-25 lines)
231	static void handleSSLVerifyPeer(Connection *, value);	231	static void handleSSLVerifyPeer(Connection *, value);
232	static void handleCAInfo(Connection *, value);	232	static void handleCAInfo(Connection *, value);
233	static void handleCAPath(Connection *, value);	233	static void handleCAPath(Connection *, value);
234	static void handlePasswdFunction(Connection *, value);
235	static void handleFileTime(Connection *, value);	234	static void handleFileTime(Connection *, value);
236	static void handleMaxRedirs(Connection *, value);	235	static void handleMaxRedirs(Connection *, value);
237	static void handleMaxConnects(Connection *, value);	236	static void handleMaxConnects(Connection *, value);
Lines 322-328 Link Here
322	{handleSSLVerifyPeer, "CURLOPT_SSLVERIFYPEER", CURLOPT_SSL_VERIFYPEER},	321	{handleSSLVerifyPeer, "CURLOPT_SSLVERIFYPEER", CURLOPT_SSL_VERIFYPEER},
323	{handleCAInfo, "CURLOPT_CAINFO", CURLOPT_CAINFO},	322	{handleCAInfo, "CURLOPT_CAINFO", CURLOPT_CAINFO},
324	{handleCAPath, "CURLOPT_CAPATH", CURLOPT_CAPATH},	323	{handleCAPath, "CURLOPT_CAPATH", CURLOPT_CAPATH},
325	{handlePasswdFunction, "CURLOPT_PASSWDFUNCTION", CURLOPT_PASSWDFUNCTION},
326	{handleFileTime, "CURLOPT_FILETIME", CURLOPT_FILETIME},	324	{handleFileTime, "CURLOPT_FILETIME", CURLOPT_FILETIME},
327	{handleMaxRedirs, "CURLOPT_MAXREDIRS", CURLOPT_MAXREDIRS},	325	{handleMaxRedirs, "CURLOPT_MAXREDIRS", CURLOPT_MAXREDIRS},
328	{handleMaxConnects, "CURLOPT_MAXCONNECTS", CURLOPT_MAXCONNECTS},	326	{handleMaxConnects, "CURLOPT_MAXCONNECTS", CURLOPT_MAXCONNECTS},
Lines 2427-2455 Link Here
2427	raiseError(conn, result);	2425	raiseError(conn, result);
2428	}	2426	}
2429		2427
2430	static void handlePasswdFunction(Connection *conn, value option)
2431	{
2432	CURLcode result = CURLE_OK;
2433
2434	if (Tag_val(option) == Closure_tag)
2435	conn->ocamlPasswdCallback = option;
2436	else
2437	failwith("Not a proper closure");
2438
2439	result = curl_easy_setopt(conn->connection,
2440	CURLOPT_PASSWDFUNCTION,
2441	passwdFunction);
2442	if (result != CURLE_OK)
2443	raiseError(conn, result);
2444
2445	result = curl_easy_setopt(conn->connection,
2446	CURLOPT_PASSWDDATA,
2447	conn);
2448
2449	if (result != CURLE_OK)
2450	raiseError(conn, result);
2451	}
2452
2453	static void handleFileTime(Connection *conn, value option)	2428	static void handleFileTime(Connection *conn, value option)
2454	{	2429	{
2455	CURLcode result = CURLE_OK;	2430	CURLcode result = CURLE_OK;