Yadis discovery no longer uses fetch_http() because we will need to add custom header...

[citadel.git] / citadel / modules / openid / serv_openid_rp.c

diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index 39af689e475a8396cd1114d71e9cee2ae59bf881..bdb945df6ecec9ecdde952d7af67eaf30993ea60 100644 (file)
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -589,7 +589,7 @@ int fetch_http(StrBuf *url, StrBuf **target_buf)
 {
        StrBuf *ReplyBuf;
        CURL *curl;
-       CURLcode res;
+       CURLcode result;
        char *effective_url = NULL;
        char errmsg[1024] = "";
 
@@ -598,18 +598,15 @@ int fetch_http(StrBuf *url, StrBuf **target_buf)
        if (ReplyBuf == 0) return(-1);
 
        curl = ctdl_openid_curl_easy_init(errmsg);
-       if (!curl) {
-               syslog(LOG_ALERT, "Unable to initialize libcurl.");
-               return(-1);
-       }
+       if (!curl) return(-1);
 
        curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(url));
        curl_easy_setopt(curl, CURLOPT_WRITEDATA, ReplyBuf);
        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlFillStrBuf_callback);
 
-       res = curl_easy_perform(curl);
-       if (res) {
-               syslog(LOG_DEBUG, "libcurl error %d: %s", res, errmsg);
+       result = curl_easy_perform(curl);
+       if (result) {
+               syslog(LOG_DEBUG, "libcurl error %d: %s", result, errmsg);
        }
        curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url);
        StrBufPlain(url, effective_url, -1);
@@ -670,7 +667,6 @@ void xrds_xml_end(void *data, const char *supplied_el) {
 void xrds_xml_chardata(void *data, const XML_Char *s, int len) {
        struct xrds *xrds = (struct xrds *) data;
        
-       syslog(LOG_DEBUG, "%2d xrds_xml_chardata()", xrds->nesting_level);
        /* StrBufAppendBufPlain (xrds->CData, s, len, 0); */
 }
 
@@ -710,16 +706,33 @@ int perform_yadis_discovery(StrBuf *YadisURL) {
        int docbytes = (-1);
        StrBuf *ReplyBuf = NULL;
        int r;
+       CURL *curl;
+       CURLcode result;
+       /*char *effective_url = NULL;*/
+       char errmsg[1024] = "";
 
        if (YadisURL == NULL) return(0);
        if (StrLength(YadisURL) == 0) return(0);
 
+       ReplyBuf = NewStrBuf ();
+       if (ReplyBuf == 0) return(0);
 
+       curl = ctdl_openid_curl_easy_init(errmsg);
+       if (!curl) return(0);
 
+       curl_easy_setopt(curl, CURLOPT_URL, ChrPtr(YadisURL));
+       curl_easy_setopt(curl, CURLOPT_WRITEDATA, ReplyBuf);
+       curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, CurlFillStrBuf_callback);
 
+       result = curl_easy_perform(curl);
+       if (result) {
+               syslog(LOG_DEBUG, "libcurl error %d: %s", result, errmsg);
+       }
+       /*curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url);
+       StrBufPlain(YadisURL, effective_url, -1);*/
+       curl_easy_cleanup(curl);
 
-
-       docbytes = fetch_http(YadisURL, &ReplyBuf);
+       docbytes = StrLength(ReplyBuf);
        if (docbytes < 0) {
                return(0);
        }