-const char loaders_rcs[] = "$Id: loaders.c,v 1.54 2006/09/07 10:22:20 fabiankeil Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.56 2006/09/07 10:40:30 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
*
* Revisions :
* $Log: loaders.c,v $
+ * Revision 1.56 2006/09/07 10:40:30 fabiankeil
+ * Turns out trusted referrers above our arbitrary
+ * limit are downgraded too ordinary trusted URLs.
+ * Adjusted error message.
+ *
+ * Revision 1.55 2006/09/07 10:25:39 fabiankeil
+ * Fix typo.
+ *
* Revision 1.54 2006/09/07 10:22:20 fabiankeil
* If too many trusted referrers are used,
* print only one error message instead of logging
#include "errlog.h"
#include "actions.h"
#include "urlmatch.h"
+#include "encode.h"
const char loaders_h_rcs[] = LOADERS_H_VERSION;
if(trusted_referrers >= MAX_TRUSTED_REFERRERS)
{
/*
- * FIXME: csp->config->trust_list is only needed
- * to print the trusted referrers in Privoxy's blocking
- * message. Not printing all of them is certainly better
- * than writing them into memory that doesn't belong to us,
- * but when Privoxy 3.0.4 is out, we should look for a real
- * solution.
+ * FIXME: ... after Privoxy 3.0.4 is out.
*/
- log_error(LOG_LEVEL_ERROR, "Too many trusted referrers for Privoxy's webinterface to handle.\n"
- " Current limit is %d, you are using %d. Additional trusted referrers are recognized, "
- "but will not show up in the blocking message.\n"
+ log_error(LOG_LEVEL_ERROR, "Too many trusted referrers. Current limit is %d, you are using %d.\n"
+ " Additional trusted referrers are treated like ordinary trusted URLs.\n"
" (You can increase this limit by changing MAX_TRUSTED_REFERRERS in project.h and recompiling).",
MAX_TRUSTED_REFERRERS, trusted_referrers);
}
new_bl->name = chomp(buf + 7);
+ /*
+ * If a filter description is available,
+ * encode it to HTML and save it.
+ */
if (NULL != (new_bl->description = strpbrk(new_bl->name, " \t")))
{
*new_bl->description++ = '\0';
- new_bl->description = strdup(chomp(new_bl->description));
+ new_bl->description = html_encode(chomp(new_bl->description));
+ if (NULL == new_bl->description)
+ {
+ new_bl->description = strdup("Out of memory while encoding this filter's description to HTML");
+ }
}
else
{
}
else
{
- log_error(LOG_LEVEL_ERROR, "Ignoring job %s outside filter block in %s, line %d", buf, csp->config->re_filterfile, linenum);
+ log_error(LOG_LEVEL_ERROR, "Ignoring job %s outside filter block in %s, line %d",
+ buf, csp->config->re_filterfile[fileid], linenum);
}
}