curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
}
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
goto shutdown ;
rc = curl_easy_perform(curl);
rc = 1;
shutdown:
+ FreeStrBuf(&Answer);
curl_easy_cleanup(curl);
return rc;
msg->cm_fields['U'] = SmashStrBuf(&QPEncoded);
FreeStrBuf(&Encoded);
}
+
+ if (ri->pubdate <= 0) {
+ ri->pubdate = time(NULL);
+ }
msg->cm_fields['T'] = malloc(64);
snprintf(msg->cm_fields['T'], 64, "%ld", ri->pubdate);
+
if (ri->channel_title != NULL) {
if (StrLength(ri->channel_title) > 0) {
msg->cm_fields['O'] = strdup(ChrPtr(ri->channel_title));
}
if (ri->link == NULL)
ri->link = NewStrBufPlain(HKEY(""));
+#ifdef EXPERIMENTAL_SHORTER_URLS
+/* its rather hard to implement this libevent compatible, so we don't ship it. */
ExpandShortUrls(ri->description);
+#endif
msglen += 1024 + StrLength(ri->link) + StrLength(ri->description) ;
Message = NewStrBufPlain(NULL, StrLength(ri->description));
curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
}
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
{
curl_easy_cleanup(curl);
return;
}
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
goto shutdown ;
res = curl_easy_perform(curl);
syslog(LOG_ALERT, "libcurl error %d: %s\n", res, errmsg);
}
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
goto shutdown ;
assoc_file_name(filename, sizeof filename, qrbuf, ctdl_netcfg_dir);
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
return;
/* Only do net processing for rooms that have netconfigs */
return;
}
- while (fgets(buf, sizeof buf, fp) != NULL && !CtdlThreadCheckStop()) {
+ while (fgets(buf, sizeof buf, fp) != NULL && !server_shutting_down) {
buf[strlen(buf)-1] = 0;
extract_token(instr, buf, 0, '|', sizeof instr);
syslog(LOG_DEBUG, "rssclient started\n");
CtdlForEachRoom(rssclient_scan_room, NULL);
- while (rnclist != NULL && !CtdlThreadCheckStop()) {
+ while (rnclist != NULL && !server_shutting_down) {
rss_do_fetching(rnclist);
rptr = rnclist;
rnclist = rnclist->next;