* svn propset svn_keywords 'Id' on some files that didn't have it

[citadel.git] / citadel / modules / rssclient / serv_rssclient.c

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 7e844f52e607c63168dd50c6960ec9644bb38c07..7902ab7434fbbb07c2f3809db883319ac0ccdc21 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -1,5 +1,5 @@
 /*
- * $Id: serv_rssclient.c 5652 2007-10-29 20:14:48Z ajc $
+ * $Id$
  *
  * Bring external RSS feeds into rooms.
  *
@@ -144,6 +144,7 @@ void rss_save_item(struct rss_item *ri) {
                if (ri->author_or_creator != NULL) {
                        msg->cm_fields['A'] = html_to_ascii(ri->author_or_creator,
                                strlen(ri->author_or_creator), 512, 0);
+                       striplt(msg->cm_fields['A']);
                }
                else {
                        msg->cm_fields['A'] = strdup("rss");
@@ -152,6 +153,7 @@ void rss_save_item(struct rss_item *ri) {
                msg->cm_fields['N'] = strdup(NODENAME);
                if (ri->title != NULL) {
                        msg->cm_fields['U'] = html_to_ascii(ri->title, strlen(ri->title), 512, 0);
+                       striplt(msg->cm_fields['U']);
                }
                msg->cm_fields['T'] = malloc(64);
                snprintf(msg->cm_fields['T'], 64, "%ld", ri->pubdate);
@@ -307,7 +309,7 @@ void rss_xml_end(void *data, const char *supplied_el) {
        }
 
        if ( ((!strcasecmp(el, "author")) || (!strcasecmp(el, "creator"))) && (ri->chardata != NULL) ) {
-               if (ri->author_or_creator != NULL) free(ri->title);
+               if (ri->author_or_creator != NULL) free(ri->author_or_creator);
                striplt(ri->chardata);
                ri->author_or_creator = strdup(ri->chardata);
        }
@@ -398,6 +400,7 @@ void rss_do_fetching(char *url, char *rooms) {
        curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errmsg);
        curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
        curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL);
+       curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180);           /* die after 180 seconds */
        if (!IsEmptyStr(config.c_ip_addr)) {
                curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
        }
@@ -586,5 +589,5 @@ CTDL_MODULE_INIT(rssclient)
                CtdlThreadSchedule ("RSS Client", CTDLTHREAD_BIGSTACK, rssclient_scan, NULL, 0);
        }
        /* return our Subversion id for the Log */
-        return "$Id: serv_rssclient.c 5652 2007-10-29 20:14:48Z ajc $";
+        return "$Id$";
 }