comparison src/scrobbler/hatena.c @ 401:192004e2a1b7 trunk

[svn] - add connection timeout option to curl_easy_perform(). hopefully, audacious can quit smoothly even though last.fm server goes down.
author yaz
date Fri, 29 Dec 2006 04:53:41 -0800
parents b4f1ad07fcd9
children a3ca00f30af5
comparison
equal deleted inserted replaced
400:de2413cc592e 401:192004e2a1b7
385 curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, 385 curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
386 hatena_sc_store_res); 386 hatena_sc_store_res);
387 memset(hatena_sc_curl_errbuf, 0, sizeof(hatena_sc_curl_errbuf)); 387 memset(hatena_sc_curl_errbuf, 0, sizeof(hatena_sc_curl_errbuf));
388 curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, hatena_sc_curl_errbuf); 388 curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, hatena_sc_curl_errbuf);
389 curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); 389 curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
390 curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
391 curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, SC_CURL_TIMEOUT);
390 status = curl_easy_perform(curl); 392 status = curl_easy_perform(curl);
391 curl_easy_cleanup(curl); 393 curl_easy_cleanup(curl);
392 394
393 hatena_sc_hs_timeout = time(NULL) + SCROBBLER_HS_WAIT; 395 hatena_sc_hs_timeout = time(NULL) + SCROBBLER_HS_WAIT;
394 396
594 g_string_append(submission, entry); 596 g_string_append(submission, entry);
595 597
596 curl_easy_setopt(curl, CURLOPT_POSTFIELDS, (char *)submission->str); 598 curl_easy_setopt(curl, CURLOPT_POSTFIELDS, (char *)submission->str);
597 memset(hatena_sc_curl_errbuf, 0, sizeof(hatena_sc_curl_errbuf)); 599 memset(hatena_sc_curl_errbuf, 0, sizeof(hatena_sc_curl_errbuf));
598 curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, hatena_sc_curl_errbuf); 600 curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, hatena_sc_curl_errbuf);
601 curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
602 curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, SC_CURL_TIMEOUT);
599 603
600 /* 604 /*
601 curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); 605 curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
602 curl_easy_setopt(curl, CURLOPT_TIMEOUT, SCROBBLER_SB_WAIT); 606 curl_easy_setopt(curl, CURLOPT_TIMEOUT, SCROBBLER_SB_WAIT);
603 */ 607 */