From 8f7afe109a167fdd8b2f59f768b41030b075d29f Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 27 May 2008 14:40:31 +0000 Subject: [PATCH] Set CURLOPT_USERAGENT and CURLOPT_INTERFACE in the RSS reader --- citadel/modules/openid/serv_openid_rp.c | 4 ++-- citadel/modules/rssclient/serv_rssclient.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c index bb0734b4c..eaccbc6dd 100644 --- a/citadel/modules/openid/serv_openid_rp.c +++ b/citadel/modules/openid/serv_openid_rp.c @@ -409,10 +409,10 @@ void cmd_oidf(char *argbuf) { valbuf[fh.total_bytes_received] = 0; if (bmstrcasestr(valbuf, "is_valid:true")) { - CtdlLogPrintf(CTDL_DEBUG, "VALIDATION SUCCEEDED!! WOWOWOWWW!!\n", valbuf); + CtdlLogPrintf(CTDL_DEBUG, "AUTHENTICATION SUCCEEDED\n", valbuf); } else { - CtdlLogPrintf(CTDL_DEBUG, "VALIDATION FAILED. DIACF.\n", valbuf); + CtdlLogPrintf(CTDL_DEBUG, "AUTHENTICATION FAILED\n", valbuf); } /* FIXME do something with the results */ diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c index c356e9d54..851b9cbb4 100644 --- a/citadel/modules/rssclient/serv_rssclient.c +++ b/citadel/modules/rssclient/serv_rssclient.c @@ -376,6 +376,10 @@ void rss_do_fetching(char *url, char *rooms) { curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, rss_libcurl_callback); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errmsg); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL); + if (!IsEmptyStr(config.c_ip_addr)) { + curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr); + } memset(&ri, 0, sizeof(struct rss_item)); ri.roomlist = rooms; -- 2.39.2